Changeset 1840:173b53b28d7c in lemon-0.x

Timestamp:

11/30/05 18:00:17 (18 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

max flow with lp column generation

Location:

lemon

Files:

• lp_base.h (modified) (2 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

@@ -596 +596 @@
     virtual Value _getDual(int i) = 0;
     virtual Value _getPrimalValue() = 0;
+    virtual bool _isBasicCol(int i) = 0;
     virtual SolutionStatus _getPrimalStatus() = 0;
     virtual SolutionStatus _getDualStatus() = 0;
@@ -1001 +1002 @@
 
     ///\e
+    bool isBasicCol(Col c) { return _isBasicCol(cols.floatingId(c.id)); }
+
+    ///\e
 
     ///\return

lemon/lp_cplex.cc

@@ -285 +285 @@
     return objval;
   }
-  
+  bool LpCplex::_isBasicCol(int i) {
+    int* cstat=new int[CPXgetnumcols(env, lp)];
+    return CPXgetbase(env, lp, cstat, NULL);
+    bool result=(cstat[i]==CPX_BASIC);
+    delete[] cstat;
+    return result;
+  }  
 
 //7.5-os cplex statusai (Vigyazat: a 9.0-asei masok!)

lemon/lp_cplex.h

@@ -77 +77 @@
     
     virtual SolveExitStatus _solve();
-
     virtual Value _getPrimal(int i);
     virtual Value _getDual(int i);
-    
     virtual Value _getPrimalValue();
+    virtual bool _isBasicCol(int i);
     
     virtual SolutionStatus _getPrimalStatus();

lemon/lp_glpk.cc

@@ -419 +419 @@
   {
     return lpx_get_obj_val(lp);
+  }
+  bool LpGlpk::_isBasicCol(int i) {
+    return (lpx_get_col_stat(lp, i)==LPX_BS);
   }
   

lemon/lp_glpk.h

@@ -82 +82 @@
     virtual Value _getDual(int i);
     virtual Value _getPrimalValue();
+    virtual bool _isBasicCol(int i);
     ///\e