Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/lp_soplex.cc

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

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

lemon/lp_soplex.cc

@@ -45 +45 @@
   LpSolverBase &LpSoplex::_copyLp() {
     LpSoplex* newlp = new LpSoplex();
-    ((soplex::SPxLP&)*(newlp->soplex)) = *soplex;
+    (*static_cast<soplex::SPxLP*>(newlp->soplex)) = *soplex;
     return *newlp;
   }
 
   int LpSoplex::_addCol() {
-    soplex::LPCol col;
-    col.setLower(-soplex::infinity);
-    col.setUpper(soplex::infinity);
-    soplex->addCol(col);
+    soplex::LPCol c;
+    c.setLower(-soplex::infinity);
+    c.setUpper(soplex::infinity);
+    soplex->addCol(c);
 
     colNames.push_back(std::string());
@@ -63 +63 @@
 
   int LpSoplex::_addRow() {
-    soplex::LPRow row;
-    row.setLhs(-soplex::infinity);
-    row.setRhs(soplex::infinity);
-    soplex->addRow(row);
+    soplex::LPRow r;
+    r.setLhs(-soplex::infinity);
+    r.setRhs(soplex::infinity);
+    soplex->addRow(r);
 
     dual_value.push_back(0.0);
@@ -93 +93 @@
   }
   
-  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; 
+  void LpSoplex::_getColName(int c, std::string &name) const {
+    name = colNames[c]; 
+  }
+  
+  void LpSoplex::_setColName(int c, const std::string &name) {
+    invColNames.erase(colNames[c]);
+    colNames[c] = name; 
     if (!name.empty()) {
-      invColNames.insert(std::make_pair(name, col));
+      invColNames.insert(std::make_pair(name, c));
     }
   }