Changeset 849:cc3867a7d380 in lemon-0.x for src

Timestamp:

09/14/04 12:09:24 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

 

Location:

src

Files:

• hugo/graph_wrapper.h (modified) (2 diffs)
• hugo/preflow.h (modified) (1 diff)
• test/graph_wrapper_test.cc (added)
• work/marci/graph_wrapper_time.cc (modified) (2 diffs)
• work/marci/max_flow_demo.cc (modified) (4 diffs)

src/hugo/graph_wrapper.h

@@ -230 +230 @@
       NodeMap(const GraphWrapper<Graph>& gw) :  Parent(*(gw.graph)) { }
       NodeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
+//       NodeMap(const NodeMap<T>& map) : Parent(map) { }
+//       template<typename Map>
+//       NodeMap(const Map& map) :  Parent(map) { }
     };
 
@@ -237 +240 @@
       EdgeMap(const GraphWrapper<Graph>& gw) : Parent(*(gw.graph)) { }
       EdgeMap(const GraphWrapper<Graph>& gw, T a) : Parent(*(gw.graph), a) { }
+//       EdgeMap(const EdgeMap<T>& map) : Parent(map) { }
+//       template<typename Map>
+//       EdgeMap(const Map& map) :  Parent(map) { }
     };
   };

src/hugo/preflow.h

@@ -345 +345 @@
     ///cut. This method can be called both after running \ref
     ///phase1 and \ref phase2. It is much faster after
-    ///\ref phase1.  \pre M should be a node map of bools. \pre
+    ///\ref phase1.  \pre M should be a bool-valued node-map. \pre
     ///If \ref mincut is called after \ref phase2 then M should
     ///be initialized to false.

src/work/marci/graph_wrapper_time.cc

@@ -11 +11 @@
 #include <hugo/time_measure.h>
 #include <hugo/graph_wrapper.h>
-#include <hugo/max_flow.h>
+#include <hugo/preflow.h>
 #include <hugo/dimacs.h>
 #include <hugo/list_graph.h>
@@ -33 +33 @@
   ts.reset();
 
-  typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
-  MyMaxFlow max_flow(g, s, t, cap, flow);
-  max_flow.run(MyMaxFlow::NO_FLOW);
+  typedef Preflow<Graph, int, FlowMap, FlowMap> MyPreflow;
+  MyPreflow max_flow(g, s, t, cap, flow);
+  max_flow.run(MyPreflow::NO_FLOW);
   cout << "flow value: " << max_flow.flowValue() << endl;
   cout << ts << endl;

src/work/marci/max_flow_demo.cc

@@ -13 +13 @@
 #include <hugo/time_measure.h>
 //#include <graph_wrapper.h>
-#include <hugo/max_flow.h>
+#include <hugo/preflow.h>
 #include <augmenting_flow.h>
 //#include <preflow_res.h>
@@ -39 +39 @@
   Timer ts;
   Graph::EdgeMap<int> flow(g); //0 flow
-  MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+  Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(g, s, t, cap, flow);
   AugmentingFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
@@ -52 +52 @@
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;
-    max_flow_test.actMinCut(cut);
+    max_flow_test.minCut(cut);
 
     FOR_EACH_LOC(Graph::EdgeIt, e, g) {
@@ -66 +66 @@
     FOR_EACH_LOC(Graph::EdgeIt, e, g) flow.set(e, 0);
     ts.reset();
-    max_flow_test.preflow(MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
+    max_flow_test.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< max_flow_test.flowValue() << std::endl;