Changeset 2605:852361980706 in lemon-0.x for lemon/lp_soplex.cc

Timestamp:

04/08/08 18:01:28 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fixes in LP solvers

• the copyLp is clarified
• newLp and copyLp gives back pointers
• cplex gives back empty string for variables without name
• cplex row and column retrieval
• added macro for soplex

File:

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

lemon/lp_soplex.cc

@@ -37 +37 @@
     delete soplex;
   }
-  
-  LpSolverBase &LpSoplex::_newLp() {
+
+  LpSoplex::LpSoplex(const LpSoplex& lp) : LpSolverBase() {
+    rows = lp.rows;
+    rows.setIdHandler(relocateIdHandler);
+
+    cols = lp.cols;
+    cols.setIdHandler(relocateIdHandler);
+
+    soplex = new soplex::SoPlex;
+    (*static_cast<soplex::SPxLP*>(soplex)) = *(lp.soplex);
+
+    colNames = lp.colNames;
+    invColNames = lp.invColNames;
+
+    primal_value = lp.primal_value;
+    dual_value = lp.dual_value;
+
+  }
+  
+  LpSolverBase* LpSoplex::_newLp() {
     LpSoplex* newlp = new LpSoplex();
-    return *newlp;
-  }
-
-  LpSolverBase &LpSoplex::_copyLp() {
-    LpSoplex* newlp = new LpSoplex();
-    (*static_cast<soplex::SPxLP*>(newlp->soplex)) = *soplex;
-    return *newlp;
+    return newlp;
+  }
+
+  LpSolverBase* LpSoplex::_copyLp() {
+    LpSoplex* newlp = new LpSoplex(*this);
+    return newlp;
   }