Changeset 2312:07e46cbb7d85 in lemon-0.x for lemon/lp_cplex.cc

Timestamp:

11/29/06 16:01:13 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

modified _setColCoeff and _setRowCoeff parameters
const simplify() for expressions

File:

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

lemon/lp_cplex.cc

@@ -110 +110 @@
   
   ///\warning Data at index 0 is ignored in the arrays.
-  void LpCplex::_setRowCoeffs(int i, 
-                              int length,
-                              int  const * indices, 
-                              Value  const * values )
-  {
-    int rowlist[length+1];
-    int* p=rowlist;
-    for (int k=1;k<=length;++k){
-      rowlist[k]=i;
-    }
-    status = CPXchgcoeflist(env, lp, 
-                            length, 
-                            p+1, 
-                            const_cast<int * >(indices+1), 
-                            const_cast<Value * >(values+1));
-  }
-  
-  void LpCplex::_setColCoeffs(int i, 
-                              int length,
-                              int  const * indices, 
-                              Value  const * values)
-  {
-    int collist[length+1];
-    int* p=collist;
-    for (int k=1;k<=length;++k){
-      collist[k]=i;
-    }
-    status = CPXchgcoeflist(env, lp, 
-                            length, 
-                            const_cast<int * >(indices+1), 
-                            p+1, 
-                            const_cast<Value * >(values+1));
+  void LpCplex::_setRowCoeffs(int i, LpRowIterator b, LpRowIterator e)
+  {
+    std::vector<int> indices;
+    std::vector<int> rowlist;
+    std::vector<Value> values;
+
+    for(LpRowIterator it=b; it!=e; ++it) {
+      indices.push_back(it->first);
+      values.push_back(it->second);
+      rowlist.push_back(i);
+    }
+
+    status = CPXchgcoeflist(env, lp, values.size(), 
+                            &rowlist[0], &indices[0], &values[0]); 
+  }
+  
+  void LpCplex::_setColCoeffs(int i, LpColIterator b, LpColIterator e)
+  {
+    std::vector<int> indices;
+    std::vector<int> collist;
+    std::vector<Value> values;
+
+    for(LpColIterator it=b; it!=e; ++it) {
+      indices.push_back(it->first);
+      values.push_back(it->second);
+      collist.push_back(i);
+    }
+
+    status = CPXchgcoeflist(env, lp, values.size(), 
+                            &indices[0], &collist[0], &values[0]); 
   }