[Lemon-commits] [lemon_svn] marci: r521 - in hugo/trunk/src/work: . jacint marci

[Lemon SVN]

Author: marci
Date: Sat Apr 24 14:53:46 2004
New Revision: 521

Modified:
   hugo/trunk/src/work/jacint/preflow_res.h
   hugo/trunk/src/work/makefile
   hugo/trunk/src/work/marci/edmonds_karp_demo.cc

Log:
jacint mindig modosit, es ezert nekunk is kell


Modified: hugo/trunk/src/work/jacint/preflow_res.h
==============================================================================
--- hugo/trunk/src/work/jacint/preflow_res.h	(original)
+++ hugo/trunk/src/work/jacint/preflow_res.h	Sat Apr 24 14:53:46 2004
@@ -490,7 +490,7 @@
 
 } //namespace hugo
 
-#endif //PREFLOW_H
+#endif //HUGO_PREFLOW_RES_H
 
 
 

Modified: hugo/trunk/src/work/makefile
==============================================================================
--- hugo/trunk/src/work/makefile	(original)
+++ hugo/trunk/src/work/makefile	Sat Apr 24 14:53:46 2004
@@ -1,5 +1,5 @@
 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
 

Modified: hugo/trunk/src/work/marci/edmonds_karp_demo.cc
==============================================================================
--- hugo/trunk/src/work/marci/edmonds_karp_demo.cc	(original)
+++ hugo/trunk/src/work/marci/edmonds_karp_demo.cc	Sat Apr 24 14:53:46 2004
@@ -9,7 +9,7 @@
 #include <time_measure.h>
 //#include <graph_wrapper.h>
 #include <preflow.h>
-#include <preflowproba.h>
+#include <preflow_res.h>
 #include <for_each_macros.h>
 
 using namespace hugo;
@@ -72,8 +72,8 @@
   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);
-  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);
 
@@ -89,7 +89,7 @@
     std::cout << "wrapped preflow ..." << std::endl;
     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;
   }