[Lemon-commits] [lemon_svn] marci: r125 - hugo/trunk/src/work/marci

[Lemon SVN]

Author: marci
Date: Wed Feb 18 14:06:41 2004
New Revision: 125

Modified:
   hugo/trunk/src/work/marci/comparison   (contents, props changed)
   hugo/trunk/src/work/marci/comparison_result
   hugo/trunk/src/work/marci/makefile

Log:
numerical results


Modified: hugo/trunk/src/work/marci/comparison
==============================================================================
--- hugo/trunk/src/work/marci/comparison	(original)
+++ hugo/trunk/src/work/marci/comparison	Wed Feb 18 14:06:41 2004
@@ -3,4 +3,5 @@
 ./preflow_demo_jacint < $1
 ./preflow_demo_athos < $1
 ./edmonds_karp_demo < $1
+./edmonds_karp_demo_alpar < $1
 ./edmonds_karp_demo_boost < $1

Modified: hugo/trunk/src/work/marci/comparison_result
==============================================================================
--- hugo/trunk/src/work/marci/comparison_result	(original)
+++ hugo/trunk/src/work/marci/comparison_result	Wed Feb 18 14:06:41 2004
@@ -1,12 +1,26 @@
 preflow demo (LEDA)...
-elapsed time: 0.385217 sec
+elapsed time: 0.510031 sec
 flow value: 6068
 preflow demo (BOOST)...
-elapsed time: 0.869221 sec
+elapsed time: 1.32288 sec
 flow value: 6068
+preflow demo (preflow_push_max_flow by JACINT)...
+elapsed time: 0.300136 sec
+flow value: 6068
+cut value: 6068
+preflow demo (preflow_push_hl by JACINT)...
+A is 1 elapsed time: 0.4667 sec
+flow value: 6068
+cut value: 6068
+preflow demo (ATHOS)...
+elapsed time: 0.150702 sec
+flow value: 415
 edmonds karp demo...
-elapsed time: 69.4014 sec
+elapsed time: 62.3518 sec
+flow value: 6068
+edmonds karp demo (ALPAR)...
+elapsed time: 58.7259 sec
 flow value: 6068
 edmonds karp demo (BOOST)...
-elapsed time: 188.151 sec
+elapsed time: 185.794 sec
 flow value: 6068

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Wed Feb 18 14:06:41 2004
@@ -3,7 +3,7 @@
 CXXFLAGS = -W -Wall -ansi -pedantic
 LEDAROOT = /ledasrc/LEDA-4.1
 
-BINARIES = edmonds_karp_demo preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos 
+BINARIES = edmonds_karp_demo edmonds_karp_demo_alpar preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos 
 
 all: $(BINARIES)
 
@@ -18,6 +18,9 @@
 	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -o edmonds_karp_demo edmonds_karp_demo.cc
 	$(CXX3) $(CXXFLAGS) -g -pg -O3 -I. -I.. -o edmonds_karp_demo_prof edmonds_karp_demo.cc
 
+edmonds_karp_demo_alpar: 
+	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
+
 preflow_demo_leda:
 	$(CXX2) -W -Wall -O3 -DLEDA_PREFIX -I. -I$(LEDAROOT)/incl -L$(LEDAROOT) -o preflow_demo_leda preflow_demo_leda.cc -lP -lm -lL -lG