Changeset 2364:3a5e67bd42d2 in lemon-0.x for lemon/lp_soplex.cc

Timestamp:

02/15/07 20:15:14 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Lp row and col getter function
lp section reader and writer for lemon IO

File:

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

lemon/lp_soplex.cc

@@ -100 +100 @@
   
 
-  void LpSoplex::_setRowCoeffs(int i, LpRowIterator b, LpRowIterator e) {
+  void LpSoplex::_setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e) {
     for (int j = 0; j < soplex->nCols(); ++j) {
       soplex->changeElement(i, j, 0.0);
     }
-    for(LpRowIterator it = b; it != e; ++it) {
+    for(ConstRowIterator it = b; it != e; ++it) {
       soplex->changeElement(i, it->first, it->second);
     }
     solved = false;
   }
-  
-  void LpSoplex::_setColCoeffs(int j, LpColIterator b, LpColIterator e) {
+
+  void LpSoplex::_getRowCoeffs(int i, RowIterator b) {
+    const soplex::SVector& vec = soplex->rowVector(i);
+    for (int k = 0; k < vec.size(); ++k) {
+      *b = std::make_pair(vec.index(k), vec.value(k));
+      ++b;
+    }
+  }
+  
+  void LpSoplex::_setColCoeffs(int j, ConstColIterator b, ConstColIterator e) {
     for (int i = 0; i < soplex->nRows(); ++i) {
       soplex->changeElement(i, j, 0.0);
     }
-    for(LpColIterator it = b; it != e; ++it) {
+    for(ConstColIterator it = b; it != e; ++it) {
       soplex->changeElement(it->first, j, it->second);
     }
     solved = false;
+  }
+
+  void LpSoplex::_getColCoeffs(int i, ColIterator b) {
+    const soplex::SVector& vec = soplex->colVector(i);
+    for (int k = 0; k < vec.size(); ++k) {
+      *b = std::make_pair(vec.index(k), vec.value(k));
+      ++b;
+    }
   }