Changeset 1787:932b8490caf0 in lemon-0.x

Timestamp:

11/13/05 21:01:17 (19 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

bugfix in setCol, getting dual values

Location:

lemon

Files:

• lp_base.h (modified) (4 diffs)
• lp_cplex.cc (modified) (1 diff)
• lp_cplex.h (modified) (1 diff)
• lp_glpk.cc (modified) (1 diff)
• lp_glpk.h (modified) (1 diff)

lemon/lp_base.h

@@ -37 +37 @@
   class _FixId 
   {
+  protected:
     std::vector<int> index;
     std::vector<int> cross;
@@ -593 +594 @@
     virtual SolveExitStatus _solve() = 0;
     virtual Value _getPrimal(int i) = 0;
+    virtual Value _getDual(int i) = 0;
     virtual Value _getPrimalValue() = 0;
     virtual SolutionStatus _getPrimalStatus() = 0;
@@ -709 +711 @@
       for(DualExpr::const_iterator i=e.begin(); i!=e.end(); ++i)
         if((*i).second!=0) { ///\bug EPSILON would be necessary here!!!
-          indices.push_back(cols.floatingId((*i).first.id));
+          indices.push_back(rows.floatingId((*i).first.id));
           values.push_back((*i).second);
         }
@@ -1002 +1004 @@
 
     ///\e
+    Value dual(Row r) { return _getDual(rows.floatingId(r.id)); }
+
+    ///\e
 
     ///\return

lemon/lp_cplex.cc

@@ -267 +267 @@
     CPXgetx(env, lp, &x, i, i);
     return x;
+  }
+
+  LpCplex::Value LpCplex::_getDual(int i)
+  {
+    Value y;
+    CPXgety(env, lp, &y, i, i);
+    return y;
   }
   

lemon/lp_cplex.h

@@ -79 +79 @@
 
     virtual Value _getPrimal(int i);
-
+    virtual Value _getDual(int i);
     
     virtual Value _getPrimalValue();

lemon/lp_glpk.cc

@@ -409 +409 @@
   {
     return lpx_get_col_prim(lp,i);
+  }
+
+  LpGlpk::Value LpGlpk::_getDual(int i)
+  {
+    return lpx_get_row_dual(lp,i);
   }
   

lemon/lp_glpk.h

@@ -80 +80 @@
     virtual SolveExitStatus _solve();
     virtual Value _getPrimal(int i);
+    virtual Value _getDual(int i);
     virtual Value _getPrimalValue();
     ///\e