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

Timestamp:

08/23/04 13:26:09 (21 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.cc (modified) (3 diffs)

src/work/marci/leda/bipartite_matching_leda.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>
 
 /**
@@ -96 +96 @@
   BGW::EdgeMap<int> dbyxcj(bgw);
 
-  typedef stGraphWrapper<BGW> stGW;
+  typedef stBipartiteGraphWrapper<BGW> stGW;
   stGW stgw(bgw);
   ConstMap<stGW::Edge, int> const1map(1);
@@ -110 +110 @@
   typedef SageGraph MutableGraph;
 //  while (max_flow_test.augmentOnBlockingFlow1<MutableGraph>()) {
-  while (max_flow_test.augmentOnBlockingFlow2()) {
-   std::cout << max_flow_test.flowValue() << std::endl;
-  }
+//   while (max_flow_test.augmentOnBlockingFlow2()) {
+//    std::cout << max_flow_test.flowValue() << std::endl;
+//   }
+  max_flow_test.run();
   std::cout << "max flow value: " << max_flow_test.flowValue() << std::endl;
   std::cout << "elapsed time: " << ts << std::endl;