Changeset 2605:852361980706 in lemon-0.x for lemon/lp_base.h

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_base.h (modified) (4 diffs)

lemon/lp_base.h

@@ -372 +372 @@
       }
 
-      //std::ostream &
-      void prettyPrint(std::ostream &os) {
-        //std::fmtflags os.flags();
-        //os.setf(std::ios::showpos);
-        Base::iterator j=Base::begin();
-        if (j!=Base::end())
-          os<<j->second<<"*x["<<id(j->first)<<"]";
-        ++j;
-        for (; j!=Base::end(); ++j){
-          if (j->second>=0)
-            os<<"+";
-          os<<j->second<<"*x["<<id(j->first)<<"]";
-        }
-        //Nem valami korrekt, de nem talaltam meg, hogy kell
-        //os.unsetf(std::ios::showpos);
-
-        //return os;
-      }
-
     };
     
@@ -482 +463 @@
       }
 
-      void prettyPrint(std::ostream &os) {
-        if (_lb==-LpSolverBase::INF||isNaN(_lb))
-          os<<"-infty<=";
-        else
-          os<<_lb<<"<=";
-        _expr.prettyPrint(os);
-        if (_ub==LpSolverBase::INF)
-          os<<"<=infty";
-        else
-          os<<"<="<<_ub;
-        //return os;
-      }
-
     };
     
@@ -736 +704 @@
 
     //Abstract virtual functions
-    virtual LpSolverBase &_newLp() = 0;
-    virtual LpSolverBase &_copyLp(){
-      ///\todo This should be implemented here, too, when we have
-      ///problem retrieving routines. It can be overriden.
-
-      //Starting:
-      LpSolverBase & newlp(_newLp());
+    virtual LpSolverBase* _newLp() = 0;
+    virtual LpSolverBase* _copyLp(){
+      LpSolverBase* newlp = _newLp();
+
+      std::map<Col, Col> ref;
+      for (LpSolverBase::ColIt it(*this); it != INVALID; ++it) {
+        Col ccol = newlp->addCol();
+        ref[it] = ccol;
+        newlp->colName(ccol, colName(it));
+        newlp->colLowerBound(ccol, colLowerBound(it));
+        newlp->colUpperBound(ccol, colUpperBound(it));
+      }
+
+      for (LpSolverBase::RowIt it(*this); it != INVALID; ++it) {
+        Expr e = row(it), ce;
+        for (Expr::iterator jt = e.begin(); jt != e.end(); ++jt) {
+          ce[ref[jt->first]] = jt->second;
+        }
+        ce += e.constComp();
+        Row r = newlp->addRow(ce);
+
+        double lower, upper;
+        getRowBounds(it, lower, upper);
+        newlp->rowBounds(r, lower, upper);
+      }
+
       return newlp;
-      //return *(LpSolverBase*)0;
     };
 
@@ -805 +791 @@
 
     ///Creates a new LP problem
-    LpSolverBase &newLp() {return _newLp();}
+    LpSolverBase* newLp() {return _newLp();}
     ///Makes a copy of the LP problem
-    LpSolverBase &copyLp() {return _copyLp();}
+    LpSolverBase* copyLp() {return _copyLp();}
     
     ///\name Build up and modify the LP