Changeset 2366:bfbdded3763a in lemon-0.x for lemon/lp_soplex.cc

Timestamp:

02/16/07 20:11:31 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Using const in lp interface
colByName functionality

File:

• lemon/lp_soplex.cc (modified) (12 diffs)

lemon/lp_soplex.cc

@@ -91 +91 @@
   }
   
-  void LpSoplex::_getColName(int col, std::string &name) {
+  void LpSoplex::_getColName(int col, std::string &name) const {
     name = colNames[col]; 
   }
   
   void LpSoplex::_setColName(int col, const std::string &name) {
+    invColNames.erase(colNames[col]);
     colNames[col] = name; 
+    if (!name.empty()) {
+      invColNames.insert(std::make_pair(name, col));
+    }
+  }
+
+  int LpSoplex::_colByName(const std::string& name) const {
+    std::map<std::string, int>::const_iterator it =
+      invColNames.find(name);
+    if (it != invColNames.end()) {
+      return it->second;
+    } else {
+      return -1;
+    }
   }
   
@@ -110 +124 @@
   }
 
-  void LpSoplex::_getRowCoeffs(int i, RowIterator b) {
+  void LpSoplex::_getRowCoeffs(int i, RowIterator b) const {
     const soplex::SVector& vec = soplex->rowVector(i);
     for (int k = 0; k < vec.size(); ++k) {
@@ -128 +142 @@
   }
 
-  void LpSoplex::_getColCoeffs(int i, ColIterator b) {
+  void LpSoplex::_getColCoeffs(int i, ColIterator b) const {
     const soplex::SVector& vec = soplex->colVector(i);
     for (int k = 0; k < vec.size(); ++k) {
@@ -141 +155 @@
   }
 
-  LpSoplex::Value LpSoplex::_getCoeff(int i, int j) {
+  LpSoplex::Value LpSoplex::_getCoeff(int i, int j) const {
     return soplex->rowVector(i)[j];
   }
@@ -150 +164 @@
   }
   
-  LpSoplex::Value LpSoplex::_getColLowerBound(int i) {
+  LpSoplex::Value LpSoplex::_getColLowerBound(int i) const {
     double value = soplex->lower(i);
     return value != -soplex::infinity ? value : -INF;
@@ -160 +174 @@
   }
 
-  LpSoplex::Value LpSoplex::_getColUpperBound(int i) {
+  LpSoplex::Value LpSoplex::_getColUpperBound(int i) const {
     double value = soplex->upper(i);
     return value != soplex::infinity ? value : INF;
@@ -170 +184 @@
     solved = false;
   }
-  void LpSoplex::_getRowBounds(int i, Value &lower, Value &upper) {
+  void LpSoplex::_getRowBounds(int i, Value &lower, Value &upper) const {
     lower = soplex->lhs(i);
     if (lower == -soplex::infinity) lower = -INF;
@@ -182 +196 @@
   }
 
-  LpSoplex::Value LpSoplex::_getObjCoeff(int i) {
+  LpSoplex::Value LpSoplex::_getObjCoeff(int i) const {
     return soplex->obj(i);
   }
@@ -213 +227 @@
   }
 
-  LpSoplex::Value LpSoplex::_getPrimal(int i) {
+  LpSoplex::Value LpSoplex::_getPrimal(int i) const {
     return primal_value[i];
   }
 
-  LpSoplex::Value LpSoplex::_getDual(int i) {
+  LpSoplex::Value LpSoplex::_getDual(int i) const {
     return dual_value[i];
   }
   
-  LpSoplex::Value LpSoplex::_getPrimalValue() {
+  LpSoplex::Value LpSoplex::_getPrimalValue() const {
     return soplex->objValue();
   }
 
-  bool LpSoplex::_isBasicCol(int i) {
+  bool LpSoplex::_isBasicCol(int i) const {
     return soplex->getBasisColStatus(i) == soplex::SPxSolver::BASIC;
   }  
 
-  LpSoplex::SolutionStatus LpSoplex::_getPrimalStatus() {
+  LpSoplex::SolutionStatus LpSoplex::_getPrimalStatus() const {
     if (!solved) return UNDEFINED;
     switch (soplex->status()) {
@@ -243 +257 @@
   }
 
-  LpSoplex::SolutionStatus LpSoplex::_getDualStatus() {
+  LpSoplex::SolutionStatus LpSoplex::_getDualStatus() const {
     if (!solved) return UNDEFINED;
     switch (soplex->status()) {
@@ -255 +269 @@
   }
 
-  LpSoplex::ProblemTypes LpSoplex::_getProblemType() {
+  LpSoplex::ProblemTypes LpSoplex::_getProblemType() const {
     if (!solved) return UNKNOWN;
     switch (soplex->status()) {
@@ -275 +289 @@
     solved = false;
   }
-  bool LpSoplex::_isMax() {
+  bool LpSoplex::_isMax() const {
     return soplex->spxSense() == soplex::SPxSolver::MAXIMIZE;
   }