Changeset 390:8dc830d3f9ef in lemon-0.x

Timestamp:

04/24/04 14:53:46 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

jacint mindig modosit, es ezert nekunk is kell

Location:

src/work

Files:

• jacint/preflow_res.h (modified) (1 diff)
• makefile (modified) (1 diff)
• marci/edmonds_karp_demo.cc (modified) (3 diffs)

src/work/jacint/preflow_res.h

@@ -491 +491 @@
 } //namespace hugo
 
-#endif //PREFLOW_H
-
-
-
-
+#endif //HUGO_PREFLOW_RES_H
+
+
+
+

src/work/makefile

@@ -1 +1 @@
 INCLUDEDIRS ?= -I../include -I. -I./{marci,jacint,alpar,klao,akos}
-CXXFLAGS = -g -O2 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
+CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic
 
 BINARIES ?= bin_heap_demo

src/work/marci/edmonds_karp_demo.cc

@@ -10 +10 @@
 //#include <graph_wrapper.h>
 #include <preflow.h>
-#include <preflowproba.h>
+#include <preflow_res.h>
 #include <for_each_macros.h>
 
@@ -73 +73 @@
   Preflow<Graph, int, Graph::EdgeMap<int>, Graph::EdgeMap<int> > 
     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);
+  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);
@@ -90 +90 @@
     FOR_EACH_LOC(Graph::EdgeIt, e, G) flow.set(e, 0);
     ts.reset();
-    pre_flow_proba.run();
+    pre_flow_res.run();
     std::cout << "elapsed time: " << ts << std::endl;
     std::cout << "flow value: "<< pre_flow_test.flowValue() << std::endl;