Changeset 989:38e1d4383262 in lemon-main for lemon/cbc.cc

Timestamp:

05/06/12 17:18:39 (12 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

991:a10624ed1997, 1054:c40a9d94442d

Parents:

987:cfbabca1b4e9 (diff), 988:8d281761dea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge bugfix #441

Files:

• lemon/cbc.cc (modified) (1 diff)
• lemon/cbc.cc (modified) (1 diff)

lemon/cbc.cc

@@ -436 +436 @@
 
     _prob = new CoinModel();
-    rows.clear();
-    cols.clear();
   }
 

lemon/cbc.cc

@@ -90 +90 @@
   }
 
+  int CbcMip::_addRow(Value l, ExprIterator b, ExprIterator e, Value u) {
+    std::vector<int> indexes;
+    std::vector<Value> values;
+
+    for(ExprIterator it = b; it != e; ++it) {
+      indexes.push_back(it->first);
+      values.push_back(it->second);
+    }
+
+    _prob->addRow(values.size(), &indexes.front(), &values.front(), l, u);
+    return _prob->numberRows() - 1;
+  }
 
   void CbcMip::_eraseCol(int i) {