Changeset 1031:0b7169db694f in lemon-0.x

Timestamp:

12/06/04 12:56:10 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

:-(

Location:

src/work/marci/lp

Files:

• lp_solver_wrapper_2.h (added)
• max_flow_by_lp.cc (modified) (2 diffs)
• min_cost_gen_flow.h (modified) (2 diffs)

src/work/marci/lp/max_flow_by_lp.cc

@@ -11 +11 @@
 #include <augmenting_flow.h>
 //#include <preflow_res.h>
-#include <lp_solver_wrapper.h>
+//#include <lp_solver_wrapper_2.h>
 #include <min_cost_gen_flow.h>
 
@@ -180 +180 @@
     min_cost(g, excess, lcap, cap, flow, cost); 
   min_cost.feasible();
-  min_cost.run();
+  min_cost.runByLP();
 
   std::cout << "elapsed time: " << ts << std::endl;

src/work/marci/lp/min_cost_gen_flow.h

@@ -15 +15 @@
 //#include <preflow_res.h>
 #include <work/marci/merge_node_graph_wrapper.h>
-#include <work/marci/lp/lp_solver_wrapper.h>
+#include <work/marci/lp/lp_solver_wrapper_2.h>
 
 namespace lemon {
@@ -212 +212 @@
     }
     void runByLP() {
-      LPSolverWrapper lp;
+      typedef LPSolverWrapper LPSolver;
+      LPSolver lp;
       lp.setMinimize();
-      typedef LPSolverWrapper::ColIt ColIt;
-      typedef LPSolverWrapper::RowIt RowIt;
+      typedef LPSolver::ColIt ColIt;
+      typedef LPSolver::RowIt RowIt;
       typedef typename Graph::template EdgeMap<ColIt> EdgeIndexMap;
       EdgeIndexMap edge_index_map(g);