diff -r 88a2ab6bfc4a -r dadc9987c537 src/work/athos/lp/max_flow_expression.cc --- a/src/work/athos/lp/max_flow_expression.cc Tue Mar 22 11:45:47 2005 +0000 +++ b/src/work/athos/lp/max_flow_expression.cc Tue Mar 22 12:02:29 2005 +0000 @@ -7,7 +7,7 @@ #include #include #include -#include +#include using std::cout; using std::endl; @@ -16,10 +16,10 @@ template class PrimalMap { protected: - LPGLPK* lp; + LpGlpk* lp; EdgeIndexMap* edge_index_map; public: - PrimalMap(LPGLPK& _lp, EdgeIndexMap& _edge_index_map) : + PrimalMap(LpGlpk& _lp, EdgeIndexMap& _edge_index_map) : lp(&_lp), edge_index_map(&_edge_index_map) { } double operator[](Edge e) const { return lp->getPrimal((*edge_index_map)[e]); @@ -43,7 +43,7 @@ readDimacs(std::cin, g, cap, s, t); Timer ts; - typedef LPGLPK LPSolver; + typedef LpGlpk LPSolver; LPSolver lp; lp.setMaximize(); typedef LPSolver::Col Col;