Changeset 376:5c12f3515452 in lemon-0.x for src/work

Timestamp:

04/22/04 18:07:17 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

preflow mods

Location:

src/work

Files:

• jacint/preflowproba.h (modified) (4 diffs)
• marci/edmonds_karp_demo.cc (modified) (3 diffs)
• marci/graph_wrapper.h (modified) (1 diff)
• marci/makefile (modified) (2 diffs)

src/work/jacint/preflowproba.h

@@ -41 +41 @@
 */
 
-#ifndef HUGO_PREFLOW_H
-#define HUGO_PREFLOW_H
+#ifndef HUGO_PREFLOW_PROBA_H
+#define HUGO_PREFLOW_PROBA_H
 
 #define H0 20
@@ -56 +56 @@
             typename CapMap=typename Graph::EdgeMap<T>, 
             typename FlowMap=typename Graph::EdgeMap<T> >
-  class Preflow {
+  class PreflowProba {
     
     typedef typename Graph::Node Node;
@@ -79 +79 @@
  
   public:
-    Preflow(Graph& _G, Node _s, Node _t, CapMap& _capacity, 
+    PreflowProba(Graph& _G, Node _s, Node _t, CapMap& _capacity, 
             FlowMap& _flow, bool _constzero, bool _res ) :
       G(_G), s(_s), t(_t), capacity(_capacity), flow(_flow), constzero(_constzero), res(_res) {}
@@ -683 +683 @@
 } //namespace hugo
 
-#endif //PREFLOW_H
-
-
-
-
+#endif //PREFLOW_PROBA_H
+
+
+
+

src/work/marci/edmonds_karp_demo.cc

@@ -10 +10 @@
 //#include <graph_wrapper.h>
 #include <preflow.h>
+#include <preflowproba.h>
 #include <for_each_macros.h>
 
@@ -71 +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);
+    pre_flow_test(G, s, t, cap, flow, true);
+  PreflowProba<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
+    pre_flow_proba(G, s, t, cap, flow, true, true);
   MaxFlow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     max_flow_test(G, s, t, cap, flow);
@@ -79 +82 @@
     ts.reset();
     pre_flow_test.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_proba.run();
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;

src/work/marci/graph_wrapper.h

@@ -696 +696 @@
     Node bNode(OutEdgeIt e) const { 
       return ((e.forward) ? graph->bNode(e.out) : graph->bNode(e.in)); }
+
+    Node aNode(InEdgeIt e) const { 
+      return ((e.forward) ? graph->aNode(e.in) : graph->aNode(e.out)); }
+    Node bNode(InEdgeIt e) const { 
+      return ((e.forward) ? graph->bNode(e.in) : graph->bNode(e.out)); }
 
 //    int nodeNum() const { return graph->nodeNum(); }

src/work/marci/makefile

@@ -7 +7 @@
 INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
 LEDAINCLUDE ?= -I$(LEDAROOT)/incl
-CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
+CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
@@ -42 +42 @@
         $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
 
-edmonds_karp_demo: 
-        $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
+#edmonds_karp_demo: 
+#       $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
 #       $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc