Changeset 769:eb61fbc64c16 in lemon-0.x for src/work/marci/leda/bipartite_matching_leda_gen.cc

Timestamp:

08/23/04 13:26:09 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

.

File:

• src/work/marci/leda/bipartite_matching_leda_gen.cc (modified) (2 diffs)

src/work/marci/leda/bipartite_matching_leda_gen.cc

@@ -15 +15 @@
 //#include <dimacs.h>
 #include <hugo/time_measure.h>
-#include <hugo/for_each_macros.h>
+#include <for_each_macros.h>
 #include <hugo/graph_wrapper.h>
 #include <bipartite_graph_wrapper.h>
 #include <hugo/maps.h>
-#include <max_flow.h>
+#include <hugo/max_flow.h>
+#include <augmenting_flow.h>
 
 /**
@@ -126 +127 @@
   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
   typedef SageGraph MutableGraph;
-  while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { }
+  AugmentingFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
+    max_flow_test_1(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow/*, true*/);
+  while (max_flow_test_1.augmentOnBlockingFlow<MutableGraph>()) { }
   std::cout << "HUGO max matching algorithm based on blocking flow augmentation." 
             << std::endl << "Matching size: " 
-            << max_flow_test.flowValue() << std::endl;
+            << max_flow_test_1.flowValue() << std::endl;
   std::cout << "elapsed time: " << ts << std::endl;