1.1 --- a/src/work/athos/lp/lp_test.cc	Fri Mar 25 16:19:03 2005 +0000
     1.2 +++ b/src/work/athos/lp/lp_test.cc	Fri Mar 25 18:56:07 2005 +0000
     1.3 @@ -1,5 +1,6 @@
     1.4  #include"lp_solver_skeleton.h"
     1.5  #include"lp_glpk.h"
     1.6 +#include<lemon/list_graph.h>
     1.7  
     1.8  using namespace lemon;
     1.9  
    1.10 @@ -36,9 +37,52 @@
    1.11    lp.addRow(LP::INF,3.0*(x[1]+x[2]/2)-x[3],23);
    1.12    lp.addRow(LP::INF,3.0*(p1+p2*2-5*p3+12-p4/3)+2*p4-4,23);
    1.13    lp.addRow(LP::INF,3.0*(x[1]+x[2]*2-5*x[3]+12-x[4]/3)+2*x[4]-4,23);
    1.14 +
    1.15 +  lp.addRow(x[1]+x[3]<=x[5]-3);
    1.16 +  lp.addRow(-7<=x[1]+x[3]-12<=3);
    1.17  }
    1.18  
    1.19  
    1.20 +template<class G,class C>
    1.21 +double maxFlow(const G &g,const C &cap,typename G::Node s,typename G::Node t)
    1.22 +{
    1.23 +  LpGlpk lp;
    1.24 +  
    1.25 +  typedef G Graph;
    1.26 +  typedef typename G::Node Node;
    1.27 +  typedef typename G::NodeIt NodeIt;
    1.28 +  typedef typename G::Edge Edge;
    1.29 +  typedef typename G::EdgeIt EdgeIt;
    1.30 +  typedef typename G::OutEdgeIt OutEdgeIt;
    1.31 +  typedef typename G::InEdgeIt InEdgeIt;
    1.32 +  
    1.33 +  typename G::EdgeMap<LpGlpk::Col> x(g);
    1.34 +  // lp.addColSet(x);
    1.35 +  for(EdgeIt e(g);e!=INVALID;++e) x[e]=lp.addCol();
    1.36 +  
    1.37 +  for(EdgeIt e(g);e!=INVALID;++e) {
    1.38 +    lp.setColUpperBound(x[e],cap[e]);
    1.39 +    lp.setColLowerBound(x[e],0);
    1.40 +  }
    1.41 +
    1.42 +  for(NodeIt n(g);n!=INVALID;++n) if(n!=s&&n!=t) {
    1.43 +    LpGlpk::Expr ex;
    1.44 +    for(InEdgeIt  e(g,n);e!=INVALID;++e) ex+=x[e];
    1.45 +    for(OutEdgeIt e(g,n);e!=INVALID;++e) ex-=x[e];
    1.46 +    lp.addRow(0,ex,0);
    1.47 +  }
    1.48 +  {
    1.49 +    LpGlpk::Expr ex;
    1.50 +    for(InEdgeIt  e(g,t);e!=INVALID;++e) ex+=x[e];
    1.51 +    for(OutEdgeIt e(g,t);e!=INVALID;++e) ex-=x[e];
    1.52 +    lp.setObj(ex);
    1.53 +  }
    1.54 +
    1.55 +  lp.solve();
    1.56 +
    1.57 +  return 0;
    1.58 +}
    1.59 +
    1.60  int main() 
    1.61  {
    1.62    LpSolverSkeleton lp_skel;
    1.63 @@ -46,4 +90,10 @@
    1.64  
    1.65    lpTest(lp_skel);
    1.66    lpTest(lp_glpk);
    1.67 +
    1.68 +  ListGraph g;
    1.69 +  ListGraph::EdgeMap<double> cap(g);
    1.70 +  
    1.71 +  maxFlow(g,cap,ListGraph::NodeIt(g),ListGraph::NodeIt(g));
    1.72 +
    1.73  }