Changeset 1081:c0ad2673b11f in lemon-0.x for src/work/marci/lp/min_cost_gen_flow.h

Timestamp:

01/14/05 14:17:16 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

more precise distinction 'tween low and high level lp interfaces

File:

• src/work/marci/lp/min_cost_gen_flow.h (modified) (5 diffs)

src/work/marci/lp/min_cost_gen_flow.h

@@ -22 +22 @@
   class PrimalMap {
   protected:
-    LPSolverWrapper* lp;
+    LPGLPK* lp;
     EdgeIndexMap* edge_index_map;
   public:
-    PrimalMap(LPSolverWrapper& _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 { 
@@ -212 +212 @@
     }
     void runByLP() {
-      typedef LPSolverWrapper LPSolver;
+      typedef LPGLPK LPSolver;
       LPSolver lp;
       lp.setMinimize();
@@ -224 +224 @@
         edge_index_map.set(e, col_it);
         if (lcapacity[e]==capacity[e])
-          lp.setColBounds(col_it, LPX_FX, lcapacity[e], capacity[e]);
+          lp.setColBounds(col_it, LPSolver::FIXED, lcapacity[e], capacity[e]);
         else 
-          lp.setColBounds(col_it, LPX_DB, lcapacity[e], capacity[e]);
+          lp.setColBounds(col_it, LPSolver::DOUBLE, lcapacity[e], capacity[e]);
         lp.setObjCoef(col_it, cost[e]);
       }
@@ -233 +233 @@
            lp.col_iter_map.valid(col_it); 
            lp.col_iter_map.next(col_it)) {
-        std::cout << "ize " << lp.col_iter_map[col_it] << std::endl;
+//      std::cout << "ize " << lp.col_iter_map[col_it] << std::endl;
       }
       for (typename Graph::NodeIt n(g); n!=INVALID; ++n) {
@@ -251 +251 @@
         }
         //std::cout << std::endl;
-        std::cout << " " << g.id(n) << " " << row.size() << std::endl;
+        //std::cout << " " << g.id(n) << " " << row.size() << std::endl;
         lp.setRowCoeffs(row_it, row.begin(), row.end());
-        lp.setRowBounds(row_it, LPX_FX, 0.0, 0.0);
+        lp.setRowBounds(row_it, LPSolver::FIXED, 0.0, 0.0);
       }
       lp.solveSimplex();