Changeset 648:8c13444bccf6 in lemon-0.x for src

Timestamp:

05/19/04 18:20:10 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

for_each fix

Location:

src/work/marci/leda

Files:

• bipartite_matching_leda.cc (modified) (3 diffs)
• bipartite_matching_leda_gen.cc (modified) (3 diffs)
• comparison.cc (modified) (5 diffs)

src/work/marci/leda/bipartite_matching_leda.cc

@@ -11 +11 @@
 
 #include <leda_graph_wrapper.h>
-#include <list_graph.h>
+#include <sage_graph.h>
 //#include <smart_graph.h>
 //#include <dimacs.h>
 #include <hugo/time_measure.h>
-#include <for_each_macros.h>
+#include <hugo/for_each_macros.h>
 #include <hugo/graph_wrapper.h>
 #include <bipartite_graph_wrapper.h>
@@ -52 +52 @@
   Graph g(lg);
 
-  //for UndirListGraph
-  //typedef UndirListGraph Graph; 
+  //for UndirSageGraph
+  //typedef UndirSageGraph Graph; 
   //Graph g;
 
@@ -108 +108 @@
   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
 //  while (max_flow_test.augmentOnShortestPath()) { }
-  typedef ListGraph MutableGraph;
+  typedef SageGraph MutableGraph;
 //  while (max_flow_test.augmentOnBlockingFlow1<MutableGraph>()) {
   while (max_flow_test.augmentOnBlockingFlow2()) {

src/work/marci/leda/bipartite_matching_leda_gen.cc

@@ -11 +11 @@
 
 #include <leda_graph_wrapper.h>
-#include <list_graph.h>
+#include <sage_graph.h>
 //#include <smart_graph.h>
 //#include <dimacs.h>
 #include <hugo/time_measure.h>
-#include <for_each_macros.h>
+#include <hugo/for_each_macros.h>
 #include <hugo/graph_wrapper.h>
 #include <bipartite_graph_wrapper.h>
@@ -52 +52 @@
   Graph g(lg);
 
-  //for UndirListGraph
-  //typedef UndirListGraph Graph; 
+  //for UndirSageGraph
+  //typedef UndirSageGraph Graph; 
   //Graph g;
 
@@ -125 +125 @@
   ts.reset();
   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
-  typedef ListGraph MutableGraph;
+  typedef SageGraph MutableGraph;
   while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { }
   std::cout << "HUGO max matching algorithm based on blocking flow augmentation." 

src/work/marci/leda/comparison.cc

@@ -11 +11 @@
 
 #include <leda_graph_wrapper.h>
-#include <list_graph.h>
+#include <sage_graph.h>
 //#include <smart_graph.h>
 //#include <dimacs.h>
 #include <hugo/time_measure.h>
-#include <for_each_macros.h>
+#include <hugo/for_each_macros.h>
 #include <hugo/graph_wrapper.h>
 #include <bipartite_graph_wrapper.h>
@@ -52 +52 @@
   Graph g(lg);
 
-  //for UndirListGraph
-  //typedef UndirListGraph Graph; 
+  //for UndirSageGraph
+  //typedef UndirSageGraph Graph; 
   //Graph g;
 
@@ -124 +124 @@
 //   ts.reset();
 //   FOR_EACH_LOC(stGW::EdgeIt, e, stgw) flow.set(e, 0);
-//   typedef ListGraph MutableGraph;
+//   typedef SageGraph MutableGraph;
 //   while (max_flow_test.augmentOnBlockingFlow<MutableGraph>()) { }
 //   std::cout << "HUGO max matching algorithm based on blocking flow augmentation." 
@@ -132 +132 @@
 
   {
-  ListGraph hg;
-  ListGraph::Node s=hg.addNode();  
-  ListGraph::Node t=hg.addNode();
-  BGW::NodeMap<ListGraph::Node> b_s_nodes(bgw);  
-  BGW::NodeMap<ListGraph::Node> b_t_nodes(bgw);
+  SageGraph hg;
+  SageGraph::Node s=hg.addNode();  
+  SageGraph::Node t=hg.addNode();
+  BGW::NodeMap<SageGraph::Node> b_s_nodes(bgw);  
+  BGW::NodeMap<SageGraph::Node> b_t_nodes(bgw);
   
   FOR_EACH_INC_LOC(BGW::ClassNodeIt, n, bgw, BGW::S_CLASS) {
@@ -150 +150 @@
     hg.addEdge(b_s_nodes[bgw.tail(e)], b_t_nodes[bgw.head(e)]);
 
-  ConstMap<ListGraph::Edge, int> cm(1);
-  ListGraph::EdgeMap<int> flow(hg); //0
+  ConstMap<SageGraph::Edge, int> cm(1);
+  SageGraph::EdgeMap<int> flow(hg); //0
   
   Timer ts;
 
   ts.reset();
-  MaxFlow<ListGraph, int, ConstMap<ListGraph::Edge, int>, 
-    ListGraph::EdgeMap<int> > 
+  MaxFlow<SageGraph, int, ConstMap<SageGraph::Edge, int>, 
+    SageGraph::EdgeMap<int> > 
     max_flow_test(hg, s, t, cm, flow);
   max_flow_test.run();
-  std::cout << "HUGO max matching algorithm on ListGraph by copying the graph, based on preflow." 
+  std::cout << "HUGO max matching algorithm on SageGraph by copying the graph, based on preflow." 
             << std::endl 
             << "Size of matching: "