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

Timestamp:

04/29/04 18:59:00 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

corrections for leda matching files

File:

• src/work/marci/leda/bipartite_matching_leda.cc (modified) (3 diffs)

src/work/marci/leda/bipartite_matching_leda.cc

@@ -19 +19 @@
 #include <graph_wrapper.h>
 #include <maps.h>
-#include <edmonds_karp.h>
-#include <preflow.h>
+#include <max_flow.h>
 
 /**
@@ -102 +101 @@
 
   Timer ts;
+  stGW::EdgeMap<int> flow(stgw);
+  MaxFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
+    max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow);
+
   ts.reset();
-  stGW::EdgeMap<int> max_flow(stgw);
-  MaxFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
-    max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, max_flow);
+  FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
 //  while (max_flow_test.augmentOnShortestPath()) { }
   typedef ListGraph MutableGraph;
@@ -114 +115 @@
   std::cout << "max flow value: " << max_flow_test.flowValue() << std::endl;
   std::cout << "elapsed time: " << ts << std::endl;
-//   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) { 
-//     std::cout << e << ": " << max_flow[e] << "\n"; 
-//   }
-//   std::cout << "\n";
 
   ts.reset();
-  stGW::EdgeMap<int> pre_flow(stgw);
-  Preflow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
-    pre_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, pre_flow/*, true*/);
-  pre_flow_test.run();
+  FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
+  max_flow_test.run();
   std::cout << "pre flow value: " << max_flow_test.flowValue() << std::endl;
   std::cout << "elapsed time: " << ts << std::endl;
-//   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) { 
-//     std::cout << e << ": " << pre_flow[e] << "\n"; 
-//   }
-//   std::cout << "\n";
 
   ts.reset();  
   leda_list<leda_edge> ml=MAX_CARD_BIPARTITE_MATCHING(lg);
-  //  stGW::EdgeMap<int> pre_flow(stgw);
-  //Preflow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
-  //  pre_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, pre_flow, true);
-  //pre_flow_test.run();
   std::cout << "leda matching value: " << ml.size() << std::endl;
   std::cout << "elapsed time: " << ts << std::endl;
-//   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) { 
-//     std::cout << e << ": " << pre_flow[e] << "\n"; 
-//   }
-//   std::cout << "\n";
 
   return 0;