Changeset 1322:cfc26d103bcf in lemon-0.x for src/demo

Timestamp:

04/08/05 08:34:34 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Demo prog that computes the max flow by LP

Location:

src/demo

Files:

• Makefile.am (modified) (2 diffs)
• lp_demo.cc (modified) (2 diffs)

src/demo/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
-
+LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
 EXTRA_DIST = sub_graph_wrapper_demo.dim
 
@@ -6 +6 @@
                         sub_graph_wrapper_demo                          \
                         graph_to_eps_demo                               \
+                        lp_demo                                         \
                         dim_to_lgf
 
 dim_to_dot_SOURCES = dim_to_dot.cc
 
-sub_graph_wrapper_demo_SOURCES = sub_graph_wrapper_demo.cc tight_edge_filter_map.h
+sub_graph_wrapper_demo_SOURCES = sub_graph_wrapper_demo.cc \
+        tight_edge_filter_map.h
 
 graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
 
+lp_demo_SOURCES = lp_demo.cc
+
 dim_to_lgf_SOURCES = dim_to_lgf.cc

src/demo/lp_demo.cc

@@ -38 +38 @@
     lp.setObj(ex);
   }
-
+  lp.max();
   lp.solve();
 
-  return 0;
+  return lp.primalValue();
 }
 
@@ -49 +49 @@
 
   ListGraph g;
-  ListGraph::Node s=g.addNode();
-  ListGraph::Node t=g.addNode();
+  ListGraph::Node s;
+  ListGraph::Node t;
+  
 
   ListGraph::EdgeMap<double> cap(g);
   
   GraphReader<ListGraph> reader(std::cin,g);
-  reader.addEdgeMap("capacity",cap).run();
+  reader.addNode("source",s).addNode("target",t)
+    .addEdgeMap("capacity",cap).run();
   
-  maxFlow(g,cap,s,t);
+  // std::ifstream file("../test/preflow_");
+//   readDimacs(file, g, cap, s, t);
+
+  std::cout << "Max flow value = " << maxFlow(g,cap,s,t) << std::endl;
 
 }