Changeset 1273:2b2ffa625775 in lemon-0.x for src/work/athos/lp/lp_test.cc

Timestamp:

03/30/05 12:38:22 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1703

Message:

• Better (but still incomplete) doc
• lp_test runs correctly

File:

• src/work/athos/lp/lp_test.cc (modified) (4 diffs)

src/work/athos/lp/lp_test.cc

@@ -117 +117 @@
   
   lp.addRow(LP::INF,e,23);
-  lp.addRow(LP::INF,3.0*(p1+p2)-p3,23);
   lp.addRow(LP::INF,3.0*(x[1]+x[2]/2)-x[3],23);
-  lp.addRow(LP::INF,3.0*(p1+p2*2-5*p3+12-p4/3)+2*p4-4,23);
   lp.addRow(LP::INF,3.0*(x[1]+x[2]*2-5*x[3]+12-x[4]/3)+2*x[4]-4,23);
 
   lp.addRow(x[1]+x[3]<=x[5]-3);
   lp.addRow(-7<=x[1]+x[3]-12<=3);
-  //lp.addRow(x[1]<=x[5]);
+  lp.addRow(x[1]<=x[5]);
 
 }
@@ -144 +142 @@
   typename G::EdgeMap<LpGlpk::Col> x(g);
   lp.addColSet(x);
-   //for(EdgeIt e(g);e!=INVALID;++e) x[e]=lp.addCol();
   
   for(EdgeIt e(g);e!=INVALID;++e) {
@@ -155 +152 @@
     for(InEdgeIt  e(g,n);e!=INVALID;++e) ex+=x[e];
     for(OutEdgeIt e(g,n);e!=INVALID;++e) ex-=x[e];
-    lp.addRow(0,ex,0);
+    lp.addRow(ex==0);
   }
   {
@@ -178 +175 @@
 
   ListGraph g;
+  ListGraph::Node s=g.addNode();
+  ListGraph::Node t=g.addNode();
+
   ListGraph::EdgeMap<double> cap(g);
   
-  maxFlow(g,cap,ListGraph::NodeIt(g),ListGraph::NodeIt(g));
+  maxFlow(g,cap,s,t);
 
 }