Changeset 1144:1cfabf245433 in lemon-0.x for src/work/marci/lp/max_flow_expression.cc

Timestamp:

02/10/05 19:53:30 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

trying to add constraints of kind 1 <= x[2]+x[3] <= 4

File:

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

src/work/marci/lp/max_flow_expression.cc

@@ -47 +47 @@
   LPSolver lp;
   lp.setMaximize();
-  typedef LPSolver::ColIt ColIt;
-  typedef LPSolver::RowIt RowIt;
-  typedef Graph::EdgeMap<ColIt> EdgeIndexMap;
-  typedef Graph::NodeMap<RowIt> NodeIndexMap;
+  typedef LPSolver::Col Col;
+  typedef LPSolver::Row Row;
+  typedef Graph::EdgeMap<Col> EdgeIndexMap;
+  typedef Graph::NodeMap<Row> NodeIndexMap;
   EdgeIndexMap edge_index_map(g);
   NodeIndexMap node_index_map(g);
@@ -57 +57 @@
   // nonnegativity of flow and capacity function
   for (Graph::EdgeIt e(g); e!=INVALID; ++e) {
-    ColIt col_it=lp.addCol();
-    edge_index_map.set(e, col_it);
+    Col col=lp.addCol();
+    edge_index_map.set(e, col);
     // interesting property in GLPK:
     // 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, 0);
+      lp.setColUpperBound(col, cap[e]);
   }
   
@@ -78 +78 @@
     // flow conservation constraints
     if ((n!=s) && (n!=t)) {
-      RowIt row_it=lp.addRow();
-      node_index_map.set(n, row_it);
-      lp.setRowCoeffs(row_it, expr);
-      lp.setRowLowerBound(row_it, 0.0);
-      lp.setRowUpperBound(row_it, 0.0);
-//       cout << expr << endl;
-//       {
-//      LPSolver::Expression expr;
-//      lp.getRowCoeffs(node_index_map[n], expr);       
-//      cout << expr << endl;
-//       }
+      node_index_map.set(n, lp.addRow(expr == 0.0));
     }
   }
   lp.solveSimplex();
-//   cout << "num of nodes: " << countNodes(g) << endl;
-//   cout << "num of edges: " << countEdges(g) << endl;
-//   cout << "num of rows: " << lp.rowNum() << endl;
-//   cout << "num of rows: " << lp.int_row_map.size() << endl;
-//   for (int i=0; i<lp.int_row_map.size(); ++i) {
-//     cout << lp.int_row_map[i] << " " << endl;
-//   }
-//   cout << "num of columns: " << lp.colNum() << endl;
-//   cout << "num of columns: " << lp.int_col_map.size() << endl;
-//   for (int i=0; i<lp.int_col_map.size(); ++i) {
-//     cout << lp.int_col_map[i] << " " << endl;
-//   }
   cout << "elapsed time: " << ts << endl;
-//   Graph::NodeIt n(g);
-//   ++n;
-//   for(Graph::OutEdgeIt e(g, n); e!=INVALID; ++e) {
-//     cout << edge_index_map[e] << endl;
-//   }
-//   for(Graph::InEdgeIt e(g, n); e!=INVALID; ++e) {
-//     cout << edge_index_map[e] << endl;
-//   }
-//   LPSolver::DualExpression expr;
-//   lp.getRowCoeffs(node_index_map[n], expr);
-//   cout << expr << endl;
 }