Changeset 1309:b3ce42a4d7d2 in lemon-0.x

Timestamp:

04/06/05 09:24:48 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

lp_test added
WARNING: Overall glpk dependency! (we should avoid)

Location:

src

Files:

• demo/lp_demo.cc (added)
• test/Makefile.am (modified) (3 diffs)
• test/lp_test.cc (moved) (moved from src/work/athos/lp/lp_test.cc) (4 diffs)

src/test/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
+LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
 
 EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
@@ -18 +19 @@
         graph_utils_test \
         kruskal_test \
+        lp_test \
         max_matching_test \
         maps_test \
@@ -42 +44 @@
 graph_wrapper_test_SOURCES = graph_wrapper_test.cc
 kruskal_test_SOURCES = kruskal_test.cc
+lp_test_SOURCES = lp_test.cc
 maps_test_SOURCES = maps_test.cc
 min_cost_flow_test_SOURCES = min_cost_flow_test.cc

src/test/lp_test.cc

@@ -1 @@
-#include"lp_solver_skeleton.h"
-#include"lp_glpk.h"
-#include<lemon/list_graph.h>
+#include<lemon/lp_solver_skeleton.h>
+#include<lemon/lp_glpk.h>
 
 using namespace lemon;
@@ -9 +8 @@
   typedef LpSolverBase LP;
 
-  std::vector<LP::Col> x;
-  for(int i=0;i<10;i++) x.push_back(lp.addCol());
+  std::vector<LP::Col> x(10);
+  //  for(int i=0;i<10;i++) x.push_back(lp.addCol());
+  lp.addColSet(x);
 
   std::vector<LP::Col> y(10);
@@ -124 +124 @@
   lp.addRow(x[1]<=x[5]);
 
-}
 
-
-template<class G,class C>
-double maxFlow(const G &g,const C &cap,typename G::Node s,typename G::Node t)
-{
-  LpGlpk lp;
   
-  typedef G Graph;
-  typedef typename G::Node Node;
-  typedef typename G::NodeIt NodeIt;
-  typedef typename G::Edge Edge;
-  typedef typename G::EdgeIt EdgeIt;
-  typedef typename G::OutEdgeIt OutEdgeIt;
-  typedef typename G::InEdgeIt InEdgeIt;
-  
-  typename G::template EdgeMap<LpGlpk::Col> x(g);
-  lp.addColSet(x);
-  
-  for(EdgeIt e(g);e!=INVALID;++e) {
-    lp.colUpperBound(x[e],cap[e]);
-    lp.colLowerBound(x[e],0);
-  }
-
-  for(NodeIt n(g);n!=INVALID;++n) if(n!=s&&n!=t) {
-    LpGlpk::Expr ex;
-    for(InEdgeIt  e(g,n);e!=INVALID;++e) ex+=x[e];
-    for(OutEdgeIt e(g,n);e!=INVALID;++e) ex-=x[e];
-    lp.addRow(ex==0);
-  }
-  {
-    LpGlpk::Expr ex;
-    for(InEdgeIt  e(g,t);e!=INVALID;++e) ex+=x[e];
-    for(OutEdgeIt e(g,t);e!=INVALID;++e) ex-=x[e];
-    lp.setObj(ex);
-  }
-
-  lp.solve();
-
-  return 0;
 }
 
@@ -174 +136 @@
   lpTest(lp_glpk);
 
-  ListGraph g;
-  ListGraph::Node s=g.addNode();
-  ListGraph::Node t=g.addNode();
-
-  ListGraph::EdgeMap<double> cap(g);
-  
-  maxFlow(g,cap,s,t);
-
+  return 0;
 }