Changeset 2526:b7727edd44f2 in lemon-0.x for demo

Timestamp:

11/28/07 18:51:02 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Redesign Circulation interface according to new flow interface
New greedy approach initialization

File:

• demo/circulation_demo.cc (modified) (3 diffs)

demo/circulation_demo.cc

@@ -53 +53 @@
     EdgeMap lo(g);
     EdgeMap up(g);
-    EdgeMap x(g);
     NodeMap delta(g);
     NodeMap nid(g);
@@ -70 +69 @@
       run();
 
-    Circulation<Graph,int> gen(g,lo,up,delta,x);
-    int ret=gen.run();
-    if(ret==-1)
+    Circulation<Graph> gen(g,lo,up,delta);
+    bool ret=gen.run();
+    if(ret)
       {
         std::cout << "\nA feasible flow has been found.\n";
-        if(!gen.checkX(x)) std::cerr << "Oops!!!\n";
+        if(!gen.checkFlow()) std::cerr << "Oops!!!\n";
         GraphWriter<Graph>("circulation-output.lgf", g).
           writeEdgeMap("lo_cap", lo).
           writeEdgeMap("up_cap", up).
-          writeEdgeMap("flow", x).
+          writeEdgeMap("flow", gen.flowMap()).
           writeNodeMap("delta", delta).
           writeEdgeMap("label", eid).
@@ -90 +89 @@
       std::cout << "\nThere is no such a flow\n";
       Graph::NodeMap<int> bar(g);
-      gen.barrier(bar,ret);
-      if(!gen.checkBarrier(bar)) std::cerr << "Dual Oops!!!\n";
+      gen.barrierMap(bar);
+      if(!gen.checkBarrier()) std::cerr << "Dual Oops!!!\n";
 
       GraphWriter<Graph>("circulation-output.lgf", g).