Changeset 2366:bfbdded3763a in lemon-0.x

Timestamp:

02/16/07 20:11:31 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Using const in lp interface
colByName functionality

Location:

lemon

Files:

• lp_base.h (modified) (22 diffs)
• lp_cplex.cc (modified) (18 diffs)
• lp_cplex.h (modified) (2 diffs)
• lp_glpk.cc (modified) (14 diffs)
• lp_glpk.h (modified) (2 diffs)
• lp_skeleton.cc (modified) (11 diffs)
• lp_skeleton.h (modified) (11 diffs)
• lp_soplex.cc (modified) (12 diffs)
• lp_soplex.h (modified) (3 diffs)
• mip_cplex.cc (modified) (4 diffs)
• mip_cplex.h (modified) (1 diff)
• mip_glpk.cc (modified) (4 diffs)
• mip_glpk.h (modified) (1 diff)

lemon/lp_base.h

@@ -136 +136 @@
 
     class ColIt : public Col {
-      LpSolverBase *_lp;
+      const LpSolverBase *_lp;
     public:
       ColIt() {}
-      ColIt(LpSolverBase &lp) : _lp(&lp)
+      ColIt(const LpSolverBase &lp) : _lp(&lp)
       {
         _lp->cols.firstFix(id);
@@ -181 +181 @@
 
     class RowIt : public Row {
-      LpSolverBase *_lp;
+      const LpSolverBase *_lp;
     public:
       RowIt() {}
-      RowIt(LpSolverBase &lp) : _lp(&lp)
+      RowIt(const LpSolverBase &lp) : _lp(&lp)
       {
         _lp->rows.firstFix(id);
@@ -736 +736 @@
     virtual int _addCol() = 0;
     virtual int _addRow() = 0; 
+
     virtual void _eraseCol(int col) = 0;
     virtual void _eraseRow(int row) = 0;
-    virtual void _getColName(int col, std::string & name) = 0;
+
+    virtual void _getColName(int col, std::string & name) const = 0;
     virtual void _setColName(int col, const std::string & name) = 0;
+    virtual int _colByName(const std::string& name) const = 0;
+
     virtual void _setRowCoeffs(int i, ConstRowIterator b, 
                                ConstRowIterator e) = 0;
-    virtual void _getRowCoeffs(int i, RowIterator b) = 0;
+    virtual void _getRowCoeffs(int i, RowIterator b) const = 0;
     virtual void _setColCoeffs(int i, ConstColIterator b, 
                                ConstColIterator e) = 0;
-    virtual void _getColCoeffs(int i, ColIterator b) = 0;
+    virtual void _getColCoeffs(int i, ColIterator b) const = 0;
     virtual void _setCoeff(int row, int col, Value value) = 0;
-    virtual Value _getCoeff(int row, int col) = 0;
+    virtual Value _getCoeff(int row, int col) const = 0;
     virtual void _setColLowerBound(int i, Value value) = 0;
-    virtual Value _getColLowerBound(int i) = 0;
+    virtual Value _getColLowerBound(int i) const = 0;
     virtual void _setColUpperBound(int i, Value value) = 0;
-    virtual Value _getColUpperBound(int i) = 0;
+    virtual Value _getColUpperBound(int i) const = 0;
     virtual void _setRowBounds(int i, Value lower, Value upper) = 0;
-    virtual void _getRowBounds(int i, Value &lower, Value &upper)=0;
+    virtual void _getRowBounds(int i, Value &lower, Value &upper) const = 0;
 
     virtual void _setObjCoeff(int i, Value obj_coef) = 0;
-    virtual Value _getObjCoeff(int i) = 0;
+    virtual Value _getObjCoeff(int i) const = 0;
     virtual void _clearObj()=0;
 
     virtual SolveExitStatus _solve() = 0;
-    virtual Value _getPrimal(int i) = 0;
-    virtual Value _getDual(int i) = 0;
-    virtual Value _getPrimalValue() = 0;
-    virtual bool _isBasicCol(int i) = 0;
-    virtual SolutionStatus _getPrimalStatus() = 0;
-    virtual SolutionStatus _getDualStatus() = 0;
-    ///\todo This could be implemented here, too, using _getPrimalStatus() and
-    ///_getDualStatus()
-    virtual ProblemTypes _getProblemType() = 0;
+    virtual Value _getPrimal(int i) const = 0;
+    virtual Value _getDual(int i) const = 0;
+    virtual Value _getPrimalValue() const = 0;
+    virtual bool _isBasicCol(int i) const = 0;
+    virtual SolutionStatus _getPrimalStatus() const = 0;
+    virtual SolutionStatus _getDualStatus() const = 0;
+    virtual ProblemTypes _getProblemType() const = 0;
 
     virtual void _setMax() = 0;
@@ -774 +776 @@
     
 
-    virtual bool _isMax() = 0;
+    virtual bool _isMax() const = 0;
 
     //Own protected stuff
@@ -878 +880 @@
     ///\param r is the column to get
     ///\return the dual expression associated to the column
-    DualExpr col(Col c) {
+    DualExpr col(Col c) const {
       DualExpr e;
       _getColCoeffs(_lpId(c), ColIterator(std::inserter(e, e.end()), *this));
@@ -975 +977 @@
     ///\todo Option to control whether a constraint with a single variable is
     ///added or not.
-    void row(Row r, Value l,const Expr &e, Value u) {
+    void row(Row r, Value l, const Expr &e, Value u) {
       e.simplify();
       _setRowCoeffs(_lpId(r), ConstRowIterator(e.begin(), *this),
@@ -996 +998 @@
     ///\param r is the row to get
     ///\return the expression associated to the row
-    Expr row(Row r) {
+    Expr row(Row r) const {
       Expr e;
       _getRowCoeffs(_lpId(r), RowIterator(std::inserter(e, e.end()), *this));
@@ -1046 +1048 @@
     ///\param c is the coresponding coloumn 
     ///\return The name of the colunm
-    std::string colName(Col c){
+    std::string colName(Col c) const {
       std::string name;
       _getColName(_lpId(c), name);
@@ -1056 +1058 @@
     ///\param c is the coresponding coloumn 
     ///\param name The name to be given
-    void colName(Col c, const std::string& name){
+    void colName(Col c, const std::string& name) {
       _setColName(_lpId(c), name);
     }
@@ -1066 +1068 @@
     ///\param val is the new value of the coefficient
 
-    void coeff(Row r, Col c, Value val){
+    void coeff(Row r, Col c, Value val) {
       _setCoeff(_lpId(r),_lpId(c), val);
     }
@@ -1076 +1078 @@
     ///\return the corresponding coefficient
 
-    Value coeff(Row r, Col c){
+    Value coeff(Row r, Col c) const {
       return _getCoeff(_lpId(r),_lpId(c));
     }
@@ -1094 +1096 @@
     /// (this might be -\ref INF as well).  
     ///\return The lower bound for coloumn \t c
-    Value colLowerBound(Col c) {
+    Value colLowerBound(Col c) const {
       return _getColLowerBound(_lpId(c));
     }
@@ -1149 +1151 @@
     /// (this might be \ref INF as well).  
     ///\return The upper bound for coloumn \t c
-    Value colUpperBound(Col c) {
+    Value colUpperBound(Col c) const {
       return _getColUpperBound(_lpId(c));
     }
@@ -1261 +1263 @@
     /// implementation of the setting functions for CPLEX:  
     /// check out whether this can be done for these functions.
-    void getRowBounds(Row c, Value &lower, Value &upper) {
+    void getRowBounds(Row c, Value &lower, Value &upper) const {
       _getRowBounds(_lpId(c),lower, upper);
     }
@@ -1269 +1271 @@
 
     ///Get an element of the objective function
-    Value objCoeff(Col c) {return _getObjCoeff(_lpId(c)); };
+    Value objCoeff(Col c) const { return _getObjCoeff(_lpId(c)); };
 
     ///Set the objective function
@@ -1285 +1287 @@
 
     ///\return the objective function as a linear expression of type \ref Expr.
-    Expr obj() {
+    Expr obj() const {
       Expr e;
       for (ColIt it(*this); it != INVALID; ++it) {
@@ -1303 +1305 @@
 
     ///Query function: is this a maximization problem?
-    bool is_max() {return _isMax(); }
+    bool is_max() const {return _isMax(); }
 
     ///Query function: is this a minimization problem?
-    bool is_min() {return !is_max(); }
+    bool is_min() const {return !is_max(); }
     
     ///@}
@@ -1331 +1333 @@
 
     /// The status of the primal problem (the original LP problem)
-    SolutionStatus primalStatus() {
+    SolutionStatus primalStatus() const {
       return _getPrimalStatus();
     }
 
     /// The status of the dual (of the original LP) problem 
-    SolutionStatus dualStatus() {
+    SolutionStatus dualStatus() const {
       return _getDualStatus();
     }
 
     ///The type of the original LP problem
-    ProblemTypes problemType() {
+    ProblemTypes problemType() const {
       return _getProblemType();
     }
 
     ///\e
-    Value primal(Col c) { return _getPrimal(_lpId(c)); }
+    Value primal(Col c) const { return _getPrimal(_lpId(c)); }
 
     ///\e
-    Value dual(Row r) { return _getDual(_lpId(r)); }
+    Value dual(Row r) const { return _getDual(_lpId(r)); }
 
     ///\e
-    bool isBasicCol(Col c) { return _isBasicCol(_lpId(c)); }
+    bool isBasicCol(Col c) const { return _isBasicCol(_lpId(c)); }
 
     ///\e
@@ -1361 +1363 @@
     ///- \ref NaN if no primal solution is found.
     ///- The (finite) objective value if an optimal solution is found.
-    Value primalValue() { return _getPrimalValue()+obj_const_comp;}
+    Value primalValue() const { return _getPrimalValue()+obj_const_comp;}
     ///@}
     
@@ -1395 +1397 @@
     ///
     ///Gives back the type of the column.
-    ColTypes colType(Col c){
+    ColTypes colType(Col c) const {
       return _colType(_lpId(c));
     }
@@ -1413 +1415 @@
     ///Gives back the type of the column.
     ///\return true if the column has integer type and false if not.
-    bool integer(Col c){
+    bool integer(Col c) const {
       return (colType(c)==INT);
     }
 
     /// The status of the MIP problem
-    SolutionStatus mipStatus() {
+    SolutionStatus mipStatus() const {
       return _getMipStatus();
     }
@@ -1424 +1426 @@
   protected:
 
-    virtual ColTypes _colType(int col) = 0;
+    virtual ColTypes _colType(int col) const = 0;
     virtual void _colType(int col, ColTypes col_type) = 0;
-    virtual SolutionStatus _getMipStatus()=0;
+    virtual SolutionStatus _getMipStatus() const = 0;
 
   };

lemon/lp_cplex.cc

@@ -85 +85 @@
   }
   
-  void LpCplex::_getColName(int col, std::string &name)
+  void LpCplex::_getColName(int col, std::string &name) const
   {
     ///\bug Untested
@@ -108 +108 @@
     CPXchgcolname(env, lp, 1, &col, names);    
   }
+
+  int LpCplex::_colByName(const std::string& name) const
+  {
+    int index;
+    if (CPXgetcolindex(env, lp, 
+                       const_cast<char*>(name.c_str()), &index) == 0) {
+      return index;
+    }
+    return -1; 
+  }
   
   ///\warning Data at index 0 is ignored in the arrays.
@@ -126 +136 @@
   }
 
-  void LpSoplex::_getRowCoeffs(int i, RowIterator b) {
+  void LpSoplex::_getRowCoeffs(int i, RowIterator b) const {
     /// \todo implement
   }
@@ -146 +156 @@
   }
 
-  void LpSoplex::_getColCoeffs(int i, ColIterator b) {
+  void LpSoplex::_getColCoeffs(int i, ColIterator b) const {
     /// \todo implement
   }
@@ -155 +165 @@
   }
 
-  LpCplex::Value LpCplex::_getCoeff(int row, int col) 
+  LpCplex::Value LpCplex::_getCoeff(int row, int col) const
   {
     LpCplex::Value value;
@@ -174 +184 @@
   }
 
-  LpCplex::Value LpCplex::_getColLowerBound(int i)
+  LpCplex::Value LpCplex::_getColLowerBound(int i) const
   {
     LpCplex::Value x;
@@ -192 +202 @@
   }
 
-  LpCplex::Value LpCplex::_getColUpperBound(int i)
+  LpCplex::Value LpCplex::_getColUpperBound(int i) const
   {
     LpCplex::Value x;
@@ -271 +281 @@
 //   }
   
-  void LpCplex::_getRowBounds(int i, Value &lb, Value &ub)
+  void LpCplex::_getRowBounds(int i, Value &lb, Value &ub) const
   {
     char sense;
@@ -303 +313 @@
   }
 
-  LpCplex::Value LpCplex::_getObjCoeff(int i)
+  LpCplex::Value LpCplex::_getObjCoeff(int i) const
   {
     Value x;
@@ -368 +378 @@
   }
 
-  LpCplex::Value LpCplex::_getPrimal(int i)
+  LpCplex::Value LpCplex::_getPrimal(int i) const
   {
     Value x;
@@ -375 +385 @@
   }
 
-  LpCplex::Value LpCplex::_getDual(int i)
+  LpCplex::Value LpCplex::_getDual(int i) const
   {
     Value y;
@@ -382 +392 @@
   }
   
-  LpCplex::Value LpCplex::_getPrimalValue()
+  LpCplex::Value LpCplex::_getPrimalValue() const
   {
     Value objval;
@@ -391 +401 @@
     return objval;
   }
-  bool LpCplex::_isBasicCol(int i) {
+  bool LpCplex::_isBasicCol(int i) const
+  {
     int cstat[CPXgetnumcols(env, lp)];
     CPXgetbase(env, lp, cstat, NULL);
@@ -459 +470 @@
 // Description: Method for linear optimization. 
 // Determines which algorithm is used when CPXlpopt() (or "optimize" in the Interactive Optimizer) is called. Currently the behavior of the "Automatic" setting is that CPLEX simply invokes the dual simplex method, but this capability may be expanded in the future so that CPLEX chooses the method based on problem characteristics 
-  //Hulye cplex
   void statusSwitch(CPXENVptr env,int& stat){
 #if CPX_VERSION < 900
@@ -476 +486 @@
   }
 
-  LpCplex::SolutionStatus LpCplex::_getPrimalStatus()
+  LpCplex::SolutionStatus LpCplex::_getPrimalStatus() const
   {
     //Unboundedness not treated well: the following is from cplex 9.0 doc
@@ -559 +569 @@
 // CPX_STAT_UNBOUNDED
 
-  LpCplex::SolutionStatus LpCplex::_getDualStatus()
+  LpCplex::SolutionStatus LpCplex::_getDualStatus() const
   {
     int stat = CPXgetstat(env, lp);
@@ -588 +598 @@
   }
 
-  LpCplex::ProblemTypes LpCplex::_getProblemType()
+  LpCplex::ProblemTypes LpCplex::_getProblemType() const
   {
     int stat = CPXgetstat(env, lp);
@@ -628 +638 @@
    }
 
-  bool LpCplex::_isMax()
+  bool LpCplex::_isMax() const
   {
     if (CPXgetobjsen(env, lp)==CPX_MAX)

lemon/lp_cplex.h

@@ -61 +61 @@
     virtual void _eraseCol(int i);
     virtual void _eraseRow(int i);
-    virtual void _getColName(int col,       std::string & name);
+    virtual void _getColName(int col, std::string & name) const;
     virtual void _setColName(int col, const std::string & name);
+    virtual int _colByName(const std::string& name) const;
     virtual void _setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e);
-    virtual void _getRowCoeffs(int i, RowIterator b);
+    virtual void _getRowCoeffs(int i, RowIterator b) const;
     virtual void _setColCoeffs(int i, ConstColIterator b, ConstColIterator e);
-    virtual void _getColCoeffs(int i, ColIterator b);
+    virtual void _getColCoeffs(int i, ColIterator b) const;
     virtual void _setCoeff(int row, int col, Value value);
-    virtual Value _getCoeff(int row, int col);
+    virtual Value _getCoeff(int row, int col) const;
 
     virtual void _setColLowerBound(int i, Value value);
-    virtual Value _getColLowerBound(int i);
+    virtual Value _getColLowerBound(int i) const;
     virtual void _setColUpperBound(int i, Value value);
-    virtual Value _getColUpperBound(int i);
+    virtual Value _getColUpperBound(int i) const;
 
 //     virtual void _setRowLowerBound(int i, Value value);
 //     virtual void _setRowUpperBound(int i, Value value);
     virtual void _setRowBounds(int i, Value lower, Value upper);
-    virtual void _getRowBounds(int i, Value &lb, Value &ub);
+    virtual void _getRowBounds(int i, Value &lb, Value &ub) const;
     virtual void _setObjCoeff(int i, Value obj_coef);
-    virtual Value _getObjCoeff(int i);
+    virtual Value _getObjCoeff(int i) const;
     virtual void _clearObj();
 
     
     virtual SolveExitStatus _solve();
-    virtual Value _getPrimal(int i);
-    virtual Value _getDual(int i);
-    virtual Value _getPrimalValue();
-    virtual bool _isBasicCol(int i);
+    virtual Value _getPrimal(int i) const;
+    virtual Value _getDual(int i) const;
+    virtual Value _getPrimalValue() const;
+    virtual bool _isBasicCol(int i) const;
     
-    virtual SolutionStatus _getPrimalStatus();
-    virtual SolutionStatus _getDualStatus();
-    virtual ProblemTypes _getProblemType();
+    virtual SolutionStatus _getPrimalStatus() const;
+    virtual SolutionStatus _getDualStatus() const;
+    virtual ProblemTypes _getProblemType() const;
 
     
@@ -98 +99 @@
     virtual void _setMin();
 
-    virtual bool _isMax();
+    virtual bool _isMax() const;
 
   };

lemon/lp_glpk.cc

@@ -38 +38 @@
     cols = _lp_bits::LpId(1);
     lp = lpx_create_prob();
+    lpx_create_index(lp);
     ///\todo control function for this:
     lpx_set_int_parm(lp, LPX_K_DUAL, 1);
@@ -113 +114 @@
   }
 
-  void LpGlpk::_getColName(int col, std::string & name)
+  void LpGlpk::_getColName(int col, std::string & name) const
   {
     
@@ -126 +127 @@
 
   }
+
+  int LpGlpk::_colByName(const std::string& name) const
+  {
+    int k = lpx_find_col(lp, const_cast<char*>(name.c_str()));
+    return k > 0 ? k : -1; 
+  }
+
   
   void LpGlpk::_setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e) 
@@ -143 +151 @@
   }
 
-  void LpGlpk::_getRowCoeffs(int i, RowIterator b) 
+  void LpGlpk::_getRowCoeffs(int i, RowIterator b) const
   {
     int length = lpx_get_mat_row(lp, i, 0, 0);
@@ -174 +182 @@
   }
 
-  void LpGlpk::_getColCoeffs(int i, ColIterator b) 
+  void LpGlpk::_getColCoeffs(int i, ColIterator b) const
   {
     int length = lpx_get_mat_col(lp, i, 0, 0);
@@ -248 +256 @@
   }
 
-  LpGlpk::Value LpGlpk::_getCoeff(int row, int col)
+  LpGlpk::Value LpGlpk::_getCoeff(int row, int col) const
   {
 
@@ -313 +321 @@
   }
 
-  LpGlpk::Value LpGlpk::_getColLowerBound(int i)
+  LpGlpk::Value LpGlpk::_getColLowerBound(int i) const
   {
     int b=lpx_get_col_type(lp, i);
@@ -370 +378 @@
   }
 
-  LpGlpk::Value LpGlpk::_getColUpperBound(int i)
+  LpGlpk::Value LpGlpk::_getColUpperBound(int i) const
   {
     int b=lpx_get_col_type(lp, i);
@@ -415 +423 @@
   }
 
-  void LpGlpk::_getRowBounds(int i, Value &lb, Value &ub)
+  void LpGlpk::_getRowBounds(int i, Value &lb, Value &ub) const
   {
 
@@ -445 +453 @@
   }
 
-  LpGlpk::Value LpGlpk::_getObjCoeff(int i){
+  LpGlpk::Value LpGlpk::_getObjCoeff(int i) const {
     //i=0 means the constant term (shift)
     return lpx_get_obj_coef(lp, i);
@@ -473 +481 @@
   }
 
-  LpGlpk::Value LpGlpk::_getPrimal(int i)
+  LpGlpk::Value LpGlpk::_getPrimal(int i) const
   {
     return lpx_get_col_prim(lp,i);
   }
 
-  LpGlpk::Value LpGlpk::_getDual(int i)
+  LpGlpk::Value LpGlpk::_getDual(int i) const
   {
     return lpx_get_row_dual(lp,i);
   }
   
-  LpGlpk::Value LpGlpk::_getPrimalValue()
+  LpGlpk::Value LpGlpk::_getPrimalValue() const
   {
     return lpx_get_obj_val(lp);
   }
-  bool LpGlpk::_isBasicCol(int i) {
+  bool LpGlpk::_isBasicCol(int i) const
+  {
     return (lpx_get_col_stat(lp, i)==LPX_BS);
   }
   
  
-  LpGlpk::SolutionStatus LpGlpk::_getPrimalStatus()
+  LpGlpk::SolutionStatus LpGlpk::_getPrimalStatus() const
   {
     int stat=  lpx_get_status(lp);
@@ -513 +522 @@
   }
 
-  LpGlpk::SolutionStatus LpGlpk::_getDualStatus()
-  {
-//     std::cout<<"Itt megy: "<<lpx_get_dual_stat(lp)<<std::endl;
-//     std::cout<<"Itt a primal: "<<lpx_get_prim_stat(lp)<<std::endl;
-
+  LpGlpk::SolutionStatus LpGlpk::_getDualStatus() const
+  {
     switch (lpx_get_dual_stat(lp)) {
     case LPX_D_UNDEF://Undefined (no solve has been run yet)
@@ -539 +545 @@
   }
 
-  LpGlpk::ProblemTypes LpGlpk::_getProblemType()
+  LpGlpk::ProblemTypes LpGlpk::_getProblemType() const
   {
       //int stat=  lpx_get_status(lp);
@@ -566 +572 @@
   }
 
-  bool LpGlpk::_isMax()
+  bool LpGlpk::_isMax() const
   {
     return (lpx_get_obj_dir(lp)==LPX_MAX);

lemon/lp_glpk.h

@@ -56 +56 @@
     virtual void _eraseCol(int i);
     virtual void _eraseRow(int i);
-    virtual void _getColName(int col,       std::string & name);
+    virtual void _getColName(int col, std::string & name) const;
     virtual void _setColName(int col, const std::string & name);
+    virtual int _colByName(const std::string& name) const;
     virtual void _setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e);
-    virtual void _getRowCoeffs(int i, RowIterator b);
+    virtual void _getRowCoeffs(int i, RowIterator b) const;
     virtual void _setColCoeffs(int i, ConstColIterator b, ConstColIterator e);
-    virtual void _getColCoeffs(int i, ColIterator b);
+    virtual void _getColCoeffs(int i, ColIterator b) const;
     virtual void _setCoeff(int row, int col, Value value);
-    virtual Value _getCoeff(int row, int col);
+    virtual Value _getCoeff(int row, int col) const;
 
     virtual void _setColLowerBound(int i, Value value);
-    virtual Value _getColLowerBound(int i);
+    virtual Value _getColLowerBound(int i) const;
     virtual void _setColUpperBound(int i, Value value);
-    virtual Value _getColUpperBound(int i);
+    virtual Value _getColUpperBound(int i) const;
 
-//     virtual void _setRowLowerBound(int i, Value value);
-//     virtual void _setRowUpperBound(int i, Value value);
     virtual void _setRowBounds(int i, Value lower, Value upper);
-    virtual void _getRowBounds(int i, Value &lb, Value &ub);
+    virtual void _getRowBounds(int i, Value &lb, Value &ub) const;
     virtual void _setObjCoeff(int i, Value obj_coef);
-    virtual Value _getObjCoeff(int i);
+    virtual Value _getObjCoeff(int i) const;
     virtual void _clearObj();
-//     virtual void _setObj(int length,
-//                          int  const * indices, 
-//                          Value  const * values ) = 0;
 
     ///\e
@@ -86 +82 @@
     ///
     virtual SolveExitStatus _solve();
-    virtual Value _getPrimal(int i);
-    virtual Value _getDual(int i);
-    virtual Value _getPrimalValue();
-    virtual bool _isBasicCol(int i);
+    virtual Value _getPrimal(int i) const;
+    virtual Value _getDual(int i) const;
+    virtual Value _getPrimalValue() const;
+    virtual bool _isBasicCol(int i) const;
     ///\e
     
     ///\todo It should be clarified
     ///
-    virtual SolutionStatus _getPrimalStatus();
-    virtual SolutionStatus _getDualStatus();
-    virtual ProblemTypes _getProblemType();
+    virtual SolutionStatus _getPrimalStatus() const;
+    virtual SolutionStatus _getDualStatus() const;
+    virtual ProblemTypes _getProblemType() const;
 
     virtual void _setMax();
     virtual void _setMin();
 
-    virtual bool _isMax();
+    virtual bool _isMax() const;
 
   public:

lemon/lp_skeleton.cc

@@ -51 +51 @@
   }
 
-  void LpSkeleton::_getColName(int, std::string &) {
+  void LpSkeleton::_getColName(int, std::string &) const {
   }
   
@@ -57 +57 @@
   void LpSkeleton::_setColName(int, const std::string &) {
   }
+
+  int LpSkeleton::_colByName(const std::string&) const { return -1; }
   
   
@@ -62 +64 @@
   }
 
-  void LpSkeleton::_getRowCoeffs(int, RowIterator) {
+  void LpSkeleton::_getRowCoeffs(int, RowIterator) const {
   }
   
@@ -68 +70 @@
   }
 
-  void LpSkeleton::_getColCoeffs(int, ColIterator) {
+  void LpSkeleton::_getColCoeffs(int, ColIterator) const {
   }
 
@@ -75 +77 @@
   }
 
-  LpSkeleton::Value LpSkeleton::_getCoeff(int, int)
+  LpSkeleton::Value LpSkeleton::_getCoeff(int, int) const
   {
     return 0;
@@ -85 +87 @@
   }
   
-  LpSkeleton::Value LpSkeleton::_getColLowerBound(int)
+  LpSkeleton::Value LpSkeleton::_getColLowerBound(int) const
   {
     return 0;
@@ -94 +96 @@
   }
 
-  LpSkeleton::Value LpSkeleton::_getColUpperBound(int)
+  LpSkeleton::Value LpSkeleton::_getColUpperBound(int) const
   {
     return 0;
@@ -111 +113 @@
   }
 
-  void LpSkeleton::_getRowBounds(int, Value&, Value&)
+  void LpSkeleton::_getRowBounds(int, Value&, Value&) const
   {
   }
@@ -119 +121 @@
   }
 
-  LpSkeleton::Value LpSkeleton::_getObjCoeff(int){
+  LpSkeleton::Value LpSkeleton::_getObjCoeff(int) const
+  {
     return 0;
   }
@@ -131 +134 @@
   }
 
-  bool LpSkeleton::_isMax()
+  bool LpSkeleton::_isMax() const
   {
     return true;
@@ -146 +149 @@
   }
 
-  LpSkeleton::Value LpSkeleton::_getPrimal(int)
+  LpSkeleton::Value LpSkeleton::_getPrimal(int) const
   {
     return 0;
   }
   
-  LpSkeleton::Value LpSkeleton::_getDual(int)
+  LpSkeleton::Value LpSkeleton::_getDual(int) const
   {
     return 0;
   }
   
-  LpSkeleton::Value LpSkeleton::_getPrimalValue()
+  LpSkeleton::Value LpSkeleton::_getPrimalValue() const
   {
     return 0;
   }
   
-  LpSkeleton::SolutionStatus LpSkeleton::_getPrimalStatus()
+  LpSkeleton::SolutionStatus LpSkeleton::_getPrimalStatus() const
   {
     return UNDEFINED;
   }
 
-  LpSkeleton::SolutionStatus LpSkeleton::_getDualStatus()
+  LpSkeleton::SolutionStatus LpSkeleton::_getDualStatus() const
   {
     return UNDEFINED;
   }
 
-  LpSkeleton::ProblemTypes LpSkeleton::_getProblemType()
+  LpSkeleton::ProblemTypes LpSkeleton::_getProblemType() const
   {
     return UNKNOWN;
   }
 
-  bool LpSkeleton::_isBasicCol(int)
+  bool LpSkeleton::_isBasicCol(int) const
   {
     return true;

lemon/lp_skeleton.h

@@ -45 +45 @@
     virtual void _eraseRow(int i);
     /// \e
-    virtual void _getColName(int col, std::string & name);
+    virtual void _getColName(int col, std::string & name) const;
     /// \e
     virtual void _setColName(int col, const std::string & name);
+    /// \e
+    virtual int _colByName(const std::string& name) const;
 
     /// \e
     virtual void _setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e);
     /// \e
-    virtual void _getRowCoeffs(int i, RowIterator b);
+    virtual void _getRowCoeffs(int i, RowIterator b) const;
     /// \e
     virtual void _setColCoeffs(int i, ConstColIterator b, ConstColIterator e);
     /// \e
-    virtual void _getColCoeffs(int i, ColIterator b);
+    virtual void _getColCoeffs(int i, ColIterator b) const;
     
     /// Set one element of the coefficient matrix
@@ -62 +64 @@
 
     /// Get one element of the coefficient matrix
-    virtual Value _getCoeff(int row, int col);
+    virtual Value _getCoeff(int row, int col) const;
 
     /// The lower bound of a variable (column) have to be given by an 
@@ -73 +75 @@
     /// extended number of type Value, i.e. a finite number of type 
     /// Value or -\ref INF.
-    virtual Value _getColLowerBound(int i);
+    virtual Value _getColLowerBound(int i) const;
 
     /// The upper bound of a variable (column) have to be given by an 
@@ -84 +86 @@
     /// extended number of type Value, i.e. a finite number of type 
     /// Value or \ref INF.
-    virtual Value _getColUpperBound(int i);
+    virtual Value _getColUpperBound(int i) const;
 
 //     /// The lower bound of a linear expression (row) have to be given by an 
@@ -109 +111 @@
     /// extended numbers of type Value, i.e.  finite numbers of type 
     /// Value, -\ref INF or \ref INF. 
-    virtual void _getRowBounds(int i, Value &lb, Value &ub);
+    virtual void _getRowBounds(int i, Value &lb, Value &ub) const;
     /// \e
 
@@ -119 +121 @@
 
     /// \e
-    virtual Value _getObjCoeff(int i);
+    virtual Value _getObjCoeff(int i) const;
 
     ///\e
@@ -131 +133 @@
     ///\bug Wrong interface
     ///
-    virtual Value _getPrimal(int i);
+    virtual Value _getPrimal(int i) const;
 
     ///\e
@@ -137 +139 @@
     ///\bug Wrong interface
     ///
-    virtual Value _getDual(int i);
+    virtual Value _getDual(int i) const;
 
     ///\e
@@ -143 +145 @@
     ///\bug Wrong interface
     ///
-    virtual Value _getPrimalValue();
+    virtual Value _getPrimalValue() const;
 
     ///\e
@@ -149 +151 @@
     ///\bug Wrong interface
     ///
-    virtual SolutionStatus _getPrimalStatus();
+    virtual SolutionStatus _getPrimalStatus() const;
 
     ////e
-    virtual SolutionStatus _getDualStatus();
+    virtual SolutionStatus _getDualStatus() const;
 
 
     ///\e
-    virtual ProblemTypes _getProblemType();
+    virtual ProblemTypes _getProblemType() const;
 
     ///\e
@@ -164 +166 @@
 
     ///\e
-    virtual bool _isMax();
+    virtual bool _isMax() const;
 
 
 
     ///\e
-    virtual bool _isBasicCol(int i);
+    virtual bool _isBasicCol(int i) const;
 
     

lemon/lp_soplex.cc

@@ -91 +91 @@
   }
   
-  void LpSoplex::_getColName(int col, std::string &name) {
+  void LpSoplex::_getColName(int col, std::string &name) const {
     name = colNames[col]; 
   }
   
   void LpSoplex::_setColName(int col, const std::string &name) {
+    invColNames.erase(colNames[col]);
     colNames[col] = name; 
+    if (!name.empty()) {
+      invColNames.insert(std::make_pair(name, col));
+    }
+  }
+
+  int LpSoplex::_colByName(const std::string& name) const {
+    std::map<std::string, int>::const_iterator it =
+      invColNames.find(name);
+    if (it != invColNames.end()) {
+      return it->second;
+    } else {
+      return -1;
+    }
   }
   
@@ -110 +124 @@
   }
 
-  void LpSoplex::_getRowCoeffs(int i, RowIterator b) {
+  void LpSoplex::_getRowCoeffs(int i, RowIterator b) const {
     const soplex::SVector& vec = soplex->rowVector(i);
     for (int k = 0; k < vec.size(); ++k) {
@@ -128 +142 @@
   }
 
-  void LpSoplex::_getColCoeffs(int i, ColIterator b) {
+  void LpSoplex::_getColCoeffs(int i, ColIterator b) const {
     const soplex::SVector& vec = soplex->colVector(i);
     for (int k = 0; k < vec.size(); ++k) {
@@ -141 +155 @@
   }
 
-  LpSoplex::Value LpSoplex::_getCoeff(int i, int j) {
+  LpSoplex::Value LpSoplex::_getCoeff(int i, int j) const {
     return soplex->rowVector(i)[j];
   }
@@ -150 +164 @@
   }
   
-  LpSoplex::Value LpSoplex::_getColLowerBound(int i) {
+  LpSoplex::Value LpSoplex::_getColLowerBound(int i) const {
     double value = soplex->lower(i);
     return value != -soplex::infinity ? value : -INF;
@@ -160 +174 @@
   }
 
-  LpSoplex::Value LpSoplex::_getColUpperBound(int i) {
+  LpSoplex::Value LpSoplex::_getColUpperBound(int i) const {
     double value = soplex->upper(i);
     return value != soplex::infinity ? value : INF;
@@ -170 +184 @@
     solved = false;
   }
-  void LpSoplex::_getRowBounds(int i, Value &lower, Value &upper) {
+  void LpSoplex::_getRowBounds(int i, Value &lower, Value &upper) const {
     lower = soplex->lhs(i);
     if (lower == -soplex::infinity) lower = -INF;
@@ -182 +196 @@
   }
 
-  LpSoplex::Value LpSoplex::_getObjCoeff(int i) {
+  LpSoplex::Value LpSoplex::_getObjCoeff(int i) const {
     return soplex->obj(i);
   }
@@ -213 +227 @@
   }
 
-  LpSoplex::Value LpSoplex::_getPrimal(int i) {
+  LpSoplex::Value LpSoplex::_getPrimal(int i) const {
     return primal_value[i];
   }
 
-  LpSoplex::Value LpSoplex::_getDual(int i) {
+  LpSoplex::Value LpSoplex::_getDual(int i) const {
     return dual_value[i];
   }
   
-  LpSoplex::Value LpSoplex::_getPrimalValue() {
+  LpSoplex::Value LpSoplex::_getPrimalValue() const {
     return soplex->objValue();
   }
 
-  bool LpSoplex::_isBasicCol(int i) {
+  bool LpSoplex::_isBasicCol(int i) const {
     return soplex->getBasisColStatus(i) == soplex::SPxSolver::BASIC;
   }  
 
-  LpSoplex::SolutionStatus LpSoplex::_getPrimalStatus() {
+  LpSoplex::SolutionStatus LpSoplex::_getPrimalStatus() const {
     if (!solved) return UNDEFINED;
     switch (soplex->status()) {
@@ -243 +257 @@
   }
 
-  LpSoplex::SolutionStatus LpSoplex::_getDualStatus() {
+  LpSoplex::SolutionStatus LpSoplex::_getDualStatus() const {
     if (!solved) return UNDEFINED;
     switch (soplex->status()) {
@@ -255 +269 @@
   }
 
-  LpSoplex::ProblemTypes LpSoplex::_getProblemType() {
+  LpSoplex::ProblemTypes LpSoplex::_getProblemType() const {
     if (!solved) return UNKNOWN;
     switch (soplex->status()) {
@@ -275 +289 @@
     solved = false;
   }
-  bool LpSoplex::_isMax() {
+  bool LpSoplex::_isMax() const {
     return soplex->spxSense() == soplex::SPxSolver::MAXIMIZE;
   }

lemon/lp_soplex.h

@@ -35 +35 @@
 namespace lemon {
 
+  /// \ingroup gen_opt_group
+  ///
   /// \brief Interface for the SOPLEX solver
   /// 
-  /// This class implements an interface for the SOPLEX LP solver.
+  /// This class implements an interface for the SoPlex LP solver.
+  /// The SoPlex library is an object oriented lp solver library
+  /// developed at the Konrad-Zuse-Zentrum für Informationstechnik
+  /// Berlin (ZIB). You can find detailed information about it at the
+  /// <tt>http://soplex.zib.de</tt> address.
   class LpSoplex :virtual public LpSolverBase {
   protected:
@@ -47 +53 @@
 
     std::vector<std::string> colNames;
+    std::map<std::string, int> invColNames;
 
     std::vector<Value> primal_value;
@@ -71 +78 @@
     virtual void _eraseCol(int i);
     virtual void _eraseRow(int i);
-    virtual void _getColName(int col, std::string & name);
+    virtual void _getColName(int col, std::string & name) const;
     virtual void _setColName(int col, const std::string & name);
+    virtual int _colByName(const std::string& name) const;
     virtual void _setRowCoeffs(int i, ConstRowIterator b, ConstRowIterator e);
-    virtual void _getRowCoeffs(int i, RowIterator b);
+    virtual void _getRowCoeffs(int i, RowIterator b) const;
     virtual void _setColCoeffs(int i, ConstColIterator b, ConstColIterator e);
-    virtual void _getColCoeffs(int i, ColIterator b);
+    virtual void _getColCoeffs(int i, ColIterator b) const;
     virtual void _setCoeff(int row, int col, Value value);
-    virtual Value _getCoeff(int row, int col);
+    virtual Value _getCoeff(int row, int col) const;
     virtual void _setColLowerBound(int i, Value value);
-    virtual Value _getColLowerBound(int i);
+    virtual Value _getColLowerBound(int i) const;
     virtual void _setColUpperBound(int i, Value value);
-    virtual Value _getColUpperBound(int i);
+    virtual Value _getColUpperBound(int i) const;
     virtual void _setRowBounds(int i, Value lower, Value upper);
-    virtual void _getRowBounds(int i, Value &lower, Value &upper);
+    virtual void _getRowBounds(int i, Value &lower, Value &upper) const;
     virtual void _setObjCoeff(int i, Value obj_coef);
-    virtual Value _getObjCoeff(int i);
+    virtual Value _getObjCoeff(int i) const;
     virtual void _clearObj();
     
     virtual SolveExitStatus _solve();
-    virtual Value _getPrimal(int i);
-    virtual Value _getDual(int i);
-    virtual Value _getPrimalValue();
-    virtual bool _isBasicCol(int i);
+    virtual Value _getPrimal(int i) const;
+    virtual Value _getDual(int i) const;
+    virtual Value _getPrimalValue() const;
+    virtual bool _isBasicCol(int i) const;
     
-    virtual SolutionStatus _getPrimalStatus();
-    virtual SolutionStatus _getDualStatus();
-    virtual ProblemTypes _getProblemType();
+    virtual SolutionStatus _getPrimalStatus() const;
+    virtual SolutionStatus _getDualStatus() const;
+    virtual ProblemTypes _getProblemType() const;
 
     
     virtual void _setMax();
     virtual void _setMin();
-    virtual bool _isMax();
+    virtual bool _isMax() const;
 
   };

lemon/mip_cplex.cc

@@ -59 +59 @@
   }
   
-  MipCplex::ColTypes MipCplex::_colType(int i){
+  MipCplex::ColTypes MipCplex::_colType(int i) const {
     
     char ctype[1];
@@ -86 +86 @@
 
 
-  LpCplex::SolutionStatus MipCplex::_getMipStatus(){
+  LpCplex::SolutionStatus MipCplex::_getMipStatus() const {
 
     int stat = CPXgetstat(env, lp);
@@ -120 +120 @@
   }  
 
-  MipCplex::Value MipCplex::_getPrimal(int i){
+  MipCplex::Value MipCplex::_getPrimal(int i) const {
     Value x;
     CPXgetmipx(env, lp, &x, i, i);
@@ -126 +126 @@
   }
   
-  MipCplex::Value MipCplex::_getPrimalValue(){
+  MipCplex::Value MipCplex::_getPrimalValue() const {
     Value objval;
     status = CPXgetmipobjval(env, lp, &objval);

lemon/mip_cplex.h

@@ -48 +48 @@
   protected:
   
-    virtual ColTypes _colType(int col);
+    virtual ColTypes _colType(int col) const;
     virtual void _colType(int col, ColTypes col_type);
     
     virtual LpCplex::SolveExitStatus _solve();
-    virtual LpCplex::SolutionStatus _getMipStatus();
-    virtual ParentLp::Value _getPrimal(int i);
-    virtual ParentLp::Value _getPrimalValue();
+    virtual LpCplex::SolutionStatus _getMipStatus() const;
+    virtual ParentLp::Value _getPrimal(int i) const;
+    virtual ParentLp::Value _getPrimalValue() const;
   };
 

lemon/mip_glpk.cc

@@ -41 +41 @@
   }
   
-  MipGlpk::ColTypes MipGlpk::_colType(int i){
+  MipGlpk::ColTypes MipGlpk::_colType(int i) const {
     switch (lpx_get_col_kind(lp,i)){
     case LPX_IV:
@@ -53 +53 @@
   }
   
-  LpGlpk::SolveExitStatus MipGlpk::_solve(){
+  LpGlpk::SolveExitStatus MipGlpk::_solve() {
     int result = lpx_simplex(lp);
     //
@@ -72 +72 @@
 
 
-  LpGlpk::SolutionStatus MipGlpk::_getMipStatus(){
+  LpGlpk::SolutionStatus MipGlpk::_getMipStatus() const {
 
     if (lpx_get_status(lp)==LPX_OPT){
@@ -101 +101 @@
   }  
 
-  MipGlpk::Value MipGlpk::_getPrimal(int i){
+  MipGlpk::Value MipGlpk::_getPrimal(int i) const {
     return lpx_mip_col_val(lp,i);
   }
   
-  MipGlpk::Value MipGlpk::_getPrimalValue(){
+  MipGlpk::Value MipGlpk::_getPrimalValue() const {
     return lpx_mip_obj_val(lp);
   }

lemon/mip_glpk.h

@@ -46 +46 @@
   protected:
   
-    virtual ColTypes _colType(int col);
+    virtual ColTypes _colType(int col) const;
     virtual void _colType(int col, ColTypes col_type);
     
     virtual LpGlpk::SolveExitStatus _solve();
-    virtual LpGlpk::SolutionStatus _getMipStatus();
-    virtual ParentLp::Value _getPrimal(int i);
-    virtual ParentLp::Value _getPrimalValue();
+    virtual LpGlpk::SolutionStatus _getMipStatus() const;
+    virtual ParentLp::Value _getPrimal(int i) const;
+    virtual ParentLp::Value _getPrimalValue() const;
   };