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

[Lemon SVN]

Author: marci
Date: Mon Feb 16 19:15:31 2004
New Revision: 106

Added:
   hugo/trunk/src/work/marci/preflow_demo_athos.cc
   hugo/trunk/src/work/marci/preflow_demo_jacint.cc
Modified:
   hugo/trunk/src/work/marci/comparison   (contents, props changed)
   hugo/trunk/src/work/marci/makefile

Log:
Can you test more preflow algs?


Modified: hugo/trunk/src/work/marci/comparison
==============================================================================
--- hugo/trunk/src/work/marci/comparison	(original)
+++ hugo/trunk/src/work/marci/comparison	Mon Feb 16 19:15:31 2004
@@ -1,4 +1,6 @@
-./preflow_demo_leda < flow-1.dim
-./preflow_demo_boost < flow-1.dim
-./edmonds_karp_demo < flow-1.dim
-./edmonds_karp_demo_boost < flow-1.dim
\ No newline at end of file
+./preflow_demo_leda < $1
+./preflow_demo_boost < $1
+./preflow_demo_jacint < $1
+./preflow_demo_athos < $1
+./edmonds_karp_demo < $1
+./edmonds_karp_demo_boost < $1

Modified: hugo/trunk/src/work/marci/makefile
==============================================================================
--- hugo/trunk/src/work/marci/makefile	(original)
+++ hugo/trunk/src/work/marci/makefile	Mon Feb 16 19:15:31 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
+BINARIES = edmonds_karp_demo preflow_demo_leda preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos 
 
 all: $(BINARIES)
 
@@ -27,6 +27,12 @@
 edmonds_karp_demo_boost:
 	$(CXX2) -ftemplate-depth-30 -O3 -I. -I/home/marci/boost -o edmonds_karp_demo_boost edmonds_karp_demo_boost.cc
 
+preflow_demo_jacint: 
+	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../jacint -o preflow_demo_jacint preflow_demo_jacint.cc
+
+preflow_demo_athos: 
+	$(CXX3) $(CXXFLAGS) -O3 -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
+
 clean:
 	$(RM) *.o $(BINARIES) .depend
 

Added: hugo/trunk/src/work/marci/preflow_demo_athos.cc
==============================================================================
--- (empty file)
+++ hugo/trunk/src/work/marci/preflow_demo_athos.cc	Mon Feb 16 19:15:31 2004
@@ -0,0 +1,44 @@
+#include <iostream>
+#include <fstream>
+
+#include <list_graph.hh>
+#include <dimacs.hh>
+#include <preflow_push.hh>
+#include <time_measure.h>
+
+using namespace marci;
+
+// Use a DIMACS max flow file as stdin.
+// read_dimacs_demo < dimacs_max_flow_file
+int main(int, char **) {
+  typedef ListGraph::NodeIt NodeIt;
+  typedef ListGraph::EachEdgeIt EachEdgeIt;
+
+  ListGraph G;
+  NodeIt s, t;
+  ListGraph::EdgeMap<int> cap(G);
+  readDimacsMaxFlow(std::cin, G, s, t, cap);
+
+  std::cout << "preflow demo (ATHOS)..." << std::endl;
+  //ListGraph::EdgeMap<int> flow(G); //0 flow
+
+  double pre_time=currTime();
+  preflow_push<ListGraph, int> max_flow_test(G, s, t, cap);
+  int flow_value=max_flow_test.run();
+  //ListGraph::NodeMap<bool> cut=max_flow_test.mincut();
+  //int cut_value=0;
+  //for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
+  //  if (cut.get(G.tail(e)) && !cut.get(G.head(e))) cut_value+=cap.get(e);
+  //}
+  double post_time=currTime();
+  //std::cout << "maximum flow: "<< std::endl;
+  //for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) { 
+  //  std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
+  //}
+  //std::cout<<std::endl;
+  std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "flow value: "<< flow_value << std::endl;
+  //std::cout << "cut value: "<< cut_value << std::endl;
+
+  return 0;
+}

Added: hugo/trunk/src/work/marci/preflow_demo_jacint.cc
==============================================================================
--- (empty file)
+++ hugo/trunk/src/work/marci/preflow_demo_jacint.cc	Mon Feb 16 19:15:31 2004
@@ -0,0 +1,44 @@
+#include <iostream>
+#include <fstream>
+
+#include <list_graph.hh>
+#include <dimacs.hh>
+#include <preflow_push_max_flow.h>
+#include <time_measure.h>
+
+using namespace marci;
+
+// Use a DIMACS max flow file as stdin.
+// read_dimacs_demo < dimacs_max_flow_file
+int main(int, char **) {
+  typedef ListGraph::NodeIt NodeIt;
+  typedef ListGraph::EachEdgeIt EachEdgeIt;
+
+  ListGraph G;
+  NodeIt s, t;
+  ListGraph::EdgeMap<int> cap(G);
+  readDimacsMaxFlow(std::cin, G, s, t, cap);
+
+  std::cout << "preflow demo (JACINT)..." << std::endl;
+  //ListGraph::EdgeMap<int> flow(G); //0 flow
+
+  double pre_time=currTime();
+  preflow_push_max_flow<ListGraph, int> max_flow_test(G, s, t, cap);
+  max_flow_test.run();
+  ListGraph::NodeMap<bool> cut=max_flow_test.mincut();
+  int cut_value=0;
+  for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) {
+    if (cut.get(G.tail(e)) && !cut.get(G.head(e))) cut_value+=cap.get(e);
+  }
+  double post_time=currTime();
+  //std::cout << "maximum flow: "<< std::endl;
+  //for(EachEdgeIt e=G.first<EachEdgeIt>(); e.valid(); ++e) { 
+  //  std::cout<<"("<<G.tail(e)<< "-"<<flow.get(e)<<"->"<<G.head(e)<<") ";
+  //}
+  //std::cout<<std::endl;
+  std::cout << "elapsed time: " << post_time-pre_time << " sec"<< std::endl; 
+  std::cout << "flow value: "<< max_flow_test.maxflow() << std::endl;
+  std::cout << "cut value: "<< cut_value << std::endl;
+
+  return 0;
+}