Changeset 2605:852361980706 in lemon-0.x for lemon/lp_glpk.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_glpk.h (modified) (2 diffs)

lemon/lp_glpk.h

@@ -50 +50 @@
     
   protected:
-    virtual LpSolverBase &_newLp();
-    virtual LpSolverBase &_copyLp();
+    virtual LpSolverBase* _newLp();
+    virtual LpSolverBase* _copyLp();
 
     virtual int _addCol();
@@ -121 +121 @@
     ///Pointer to the underlying GLPK data structure.
     LPX *lpx() {return lp;}
+
+    ///Returns the constraint identifier understood by GLPK.
+    int lpxRow(Row r) { return _lpId(r); }
+
+    ///Returns the variable identifier understood by GLPK.
+    int lpxCol(Col c) { return _lpId(c); }
   };
 } //END OF NAMESPACE LEMON