1.1 --- a/src/demo/lp_demo.cc	Fri Apr 08 06:33:11 2005 +0000
     1.2 +++ b/src/demo/lp_demo.cc	Fri Apr 08 06:34:34 2005 +0000
     1.3 @@ -37,10 +37,10 @@
     1.4      for(OutEdgeIt e(g,t);e!=INVALID;++e) ex-=x[e];
     1.5      lp.setObj(ex);
     1.6    }
     1.7 -
     1.8 +  lp.max();
     1.9    lp.solve();
    1.10  
    1.11 -  return 0;
    1.12 +  return lp.primalValue();
    1.13  }
    1.14  
    1.15  int main() 
    1.16 @@ -48,14 +48,19 @@
    1.17    LpGlpk lp_glpk;
    1.18  
    1.19    ListGraph g;
    1.20 -  ListGraph::Node s=g.addNode();
    1.21 -  ListGraph::Node t=g.addNode();
    1.22 +  ListGraph::Node s;
    1.23 +  ListGraph::Node t;
    1.24 +  
    1.25  
    1.26    ListGraph::EdgeMap<double> cap(g);
    1.27    
    1.28    GraphReader<ListGraph> reader(std::cin,g);
    1.29 -  reader.addEdgeMap("capacity",cap).run();
    1.30 +  reader.addNode("source",s).addNode("target",t)
    1.31 +    .addEdgeMap("capacity",cap).run();
    1.32    
    1.33 -  maxFlow(g,cap,s,t);
    1.34 +  // std::ifstream file("../test/preflow_");
    1.35 +//   readDimacs(file, g, cap, s, t);
    1.36 +
    1.37 +  std::cout << "Max flow value = " << maxFlow(g,cap,s,t) << std::endl;
    1.38  
    1.39  }