1.1 --- a/src/work/marci/comparison Wed Feb 18 12:45:44 2004 +0000
1.2 +++ b/src/work/marci/comparison Wed Feb 18 13:06:41 2004 +0000
1.3 @@ -3,4 +3,5 @@
1.4 ./preflow_demo_jacint < $1
1.5 ./preflow_demo_athos < $1
1.6 ./edmonds_karp_demo < $1
1.7 +./edmonds_karp_demo_alpar < $1
1.8 ./edmonds_karp_demo_boost < $1
2.1 --- a/src/work/marci/comparison_result Wed Feb 18 12:45:44 2004 +0000
2.2 +++ b/src/work/marci/comparison_result Wed Feb 18 13:06:41 2004 +0000
2.3 @@ -1,12 +1,26 @@
2.4 preflow demo (LEDA)...
2.5 -elapsed time: 0.385217 sec
2.6 +elapsed time: 0.510031 sec
2.7 flow value: 6068
2.8 preflow demo (BOOST)...
2.9 -elapsed time: 0.869221 sec
2.10 +elapsed time: 1.32288 sec
2.11 flow value: 6068
2.12 +preflow demo (preflow_push_max_flow by JACINT)...
2.13 +elapsed time: 0.300136 sec
2.14 +flow value: 6068
2.15 +cut value: 6068
2.16 +preflow demo (preflow_push_hl by JACINT)...
2.17 +A is 1 elapsed time: 0.4667 sec
2.18 +flow value: 6068
2.19 +cut value: 6068
2.20 +preflow demo (ATHOS)...
2.21 +elapsed time: 0.150702 sec
2.22 +flow value: 415
2.23 edmonds karp demo...
2.24 -elapsed time: 69.4014 sec
2.25 +elapsed time: 62.3518 sec
2.26 +flow value: 6068
2.27 +edmonds karp demo (ALPAR)...
2.28 +elapsed time: 58.7259 sec
2.29 flow value: 6068
2.30 edmonds karp demo (BOOST)...
2.31 -elapsed time: 188.151 sec
2.32 +elapsed time: 185.794 sec
2.33 flow value: 6068
3.1 --- a/src/work/marci/makefile Wed Feb 18 12:45:44 2004 +0000
3.2 +++ b/src/work/marci/makefile Wed Feb 18 13:06:41 2004 +0000
3.3 @@ -3,7 +3,7 @@
3.4 CXXFLAGS = -W -Wall -ansi -pedantic
3.5 LEDAROOT = /ledasrc/LEDA-4.1
3.6
3.7 -BINARIES = edmonds_karp_demo preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos
3.8 +BINARIES = edmonds_karp_demo edmonds_karp_demo_alpar preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos
3.9
3.10 all: $(BINARIES)
3.11
3.12 @@ -18,6 +18,9 @@
3.13 $(CXX3) $(CXXFLAGS) -O3 -I. -I.. -o edmonds_karp_demo edmonds_karp_demo.cc
3.14 $(CXX3) $(CXXFLAGS) -g -pg -O3 -I. -I.. -o edmonds_karp_demo_prof edmonds_karp_demo.cc
3.15
3.16 +edmonds_karp_demo_alpar:
3.17 + $(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../alpar -o edmonds_karp_demo_alpar edmonds_karp_demo_alpar.cc
3.18 +
3.19 preflow_demo_leda:
3.20 $(CXX2) -W -Wall -O3 -DLEDA_PREFIX -I. -I$(LEDAROOT)/incl -L$(LEDAROOT) -o preflow_demo_leda preflow_demo_leda.cc -lP -lm -lL -lG
3.21