Changeset 465:d72e56f1730d in lemon-0.x

Timestamp:

04/29/04 11:08:14 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

mods implied by preflow mods

Location:

src

Files:

• include/dimacs.h (modified) (1 diff)
• work/jacint/preflow.h (modified) (3 diffs)
• work/marci/bipartite_matching_try.cc (modified) (1 diff)
• work/marci/edmonds_karp_demo.cc (modified) (2 diffs)
• work/marci/lg_vs_sg.cc (modified) (2 diffs)

src/include/dimacs.h

@@ -21 +21 @@
   /// If the data is a shortest path problem instance then \c s will be the 
   /// source node and \c capacity will contain the edge lengths.
+  ///
+  ///\author Marton Makai
   template<typename Graph, typename CapacityMap>
   void readDimacsMaxFlow(std::istream& is, Graph &g, typename Graph::Node &s, typename Graph::Node &t, CapacityMap& capacity) {

src/work/jacint/preflow.h

@@ -63 +63 @@
     Node s;
     Node t;
-    CapMap* capacity;  
+    const CapMap* capacity;  
     FlowMap* flow;
     int n;      //the number of nodes of G
@@ -78 +78 @@
     };
 
-    Preflow(Graph& _G, Node _s, Node _t, CapMap& _capacity, 
+    Preflow(const Graph& _G, Node _s, Node _t, const CapMap& _capacity, 
             FlowMap& _flow) :
       G(_G), s(_s), t(_t), capacity(&_capacity), 
@@ -154 +154 @@
           break;
         }
+//       default:
+//      break;
+//      ZERO_FLOW ize kell
+
       }
       

src/work/marci/bipartite_matching_try.cc

@@ -182 +182 @@
   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(stgw, stgw.S_NODE, stgw.T_NODE, const1map, pre_flow/*, true*/);
   pre_flow_test.run();
   std::cout << "pre flow value: " << max_flow_test.flowValue() << std::endl;

src/work/marci/edmonds_karp_demo.cc

@@ -72 +72 @@
   Graph::EdgeMap<int> flow(G); //0 flow
   Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-    pre_flow_test(G, s, t, cap, flow, true);
+    pre_flow_test(G, s, t, cap, flow/*, true*/);
   Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-    pre_flow_ize(G, s, t, cap, flow, false);
-  PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-    pre_flow_res(G, s, t, cap, flow, true);
+    pre_flow_ize(G, s, t, cap, flow/*, false*/);
+//   PreflowRes<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+//     pre_flow_res(G, s, t, cap, flow/*, true*/);
   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(G, s, t, cap, flow);
@@ -92 +92 @@
     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
     ts.reset();
-    pre_flow_ize.run();
+    pre_flow_ize.preflow(Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> >::GEN_FLOW);
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< pre_flow_ize.flowValue() << std::endl;
   }
 
-  {
-    std::cout << "wrapped preflow ..." << std::endl;
-    FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
-    ts.reset();
-    pre_flow_res.run();
-    std::cout << "elapsed time: " << ts << std::endl;
-    std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
-  }
+//   {
+//     std::cout << "wrapped preflow ..." << std::endl;
+//     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
+//     ts.reset();
+//     pre_flow_res.run();
+//     std::cout << "elapsed time: " << ts << std::endl;
+//     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;
+//   }
 
   {

src/work/marci/lg_vs_sg.cc

@@ -36 +36 @@
     Graph::EdgeMap<int> flow(G); //0 flow
     Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      pre_flow_test(G, s, t, cap, flow, true);
+      pre_flow_test(G, s, t, cap, flow/*, true*/);
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
       max_flow_test(G, s, t, cap, flow);
@@ -110 +110 @@
     Graph::EdgeMap<int> flow(G); //0 flow
     Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
-      pre_flow_test(G, s, t, cap, flow, true);
+      pre_flow_test(G, s, t, cap, flow/*, true*/);
     MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
       max_flow_test(G, s, t, cap, flow);