1.1 --- a/src/work/athos/lp/max_flow_expression.cc	Tue Mar 22 11:45:47 2005 +0000
     1.2 +++ b/src/work/athos/lp/max_flow_expression.cc	Tue Mar 22 12:02:29 2005 +0000
     1.3 @@ -7,7 +7,7 @@
     1.4  #include <lemon/list_graph.h>
     1.5  #include <lemon/dimacs.h>
     1.6  #include <lemon/time_measure.h>
     1.7 -#include <lp_solver_base.h>
     1.8 +#include <lp_solver_glpk.h>
     1.9  
    1.10  using std::cout;
    1.11  using std::endl;
    1.12 @@ -16,10 +16,10 @@
    1.13  template<typename Edge, typename EdgeIndexMap> 
    1.14  class PrimalMap {
    1.15  protected:
    1.16 -  LPGLPK* lp;
    1.17 +  LpGlpk* lp;
    1.18    EdgeIndexMap* edge_index_map;
    1.19  public:
    1.20 -  PrimalMap(LPGLPK& _lp, EdgeIndexMap& _edge_index_map) : 
    1.21 +  PrimalMap(LpGlpk& _lp, EdgeIndexMap& _edge_index_map) : 
    1.22      lp(&_lp), edge_index_map(&_edge_index_map) { }
    1.23    double operator[](Edge e) const { 
    1.24      return lp->getPrimal((*edge_index_map)[e]);
    1.25 @@ -43,7 +43,7 @@
    1.26    readDimacs(std::cin, g, cap, s, t);
    1.27    Timer ts;
    1.28    
    1.29 -  typedef LPGLPK LPSolver;
    1.30 +  typedef LpGlpk LPSolver;
    1.31    LPSolver lp;
    1.32    lp.setMaximize();
    1.33    typedef LPSolver::Col Col;