Changeset 1111:88ade201ffc6 in lemon-0.x for src/work/marci/lp/max_flow_expression.cc

Timestamp:

02/01/05 13:53:30 (18 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

lower and upper bound handling functions for rows

File:

• src/work/marci/lp/max_flow_expression.cc (modified) (4 diffs)

src/work/marci/lp/max_flow_expression.cc

@@ -7 +7 @@
 #include <lemon/dimacs.h>
 #include <lemon/time_measure.h>
-#include <lp_solver_wrapper_3.h>
+#include <lp_solver_base.h>
 
 using std::cout;
@@ -52 +52 @@
   PrimalMap<Edge, EdgeIndexMap> flow(lp, edge_index_map);
 
-  // capacity function
+  // nonnegativity of flow and capacity function
   for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
     ColIt col_it=lp.addCol();
@@ -59 +59 @@
     // if you change the order of the following two lines, the 
     // two runs of GLPK are extremely different
+      lp.setColLowerBound(col_it, 0);
       lp.setColUpperBound(col_it, cap[e]);
-      lp.setColLowerBound(col_it, 0);
   }
   
@@ -73 +73 @@
       lp.setObjCoeffs(expr);      
     }
-    // flow conservation
+    // flow conservation constraints
     if ((n!=s) && (n!=t)) {
       RowIt row_it=lp.addRow();
       lp.setRowCoeffs(row_it, expr);
-      lp.setRowBounds(row_it, LPSolver::FIXED, 0.0, 0.0);
+      lp.setRowLowerBound(row_it, 0.0);
+      lp.setRowUpperBound(row_it, 0.0);
     }
   }