Changeset 2366:bfbdded3763a in lemon-0.x for lemon/lp_glpk.cc

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

File:

• lemon/lp_glpk.cc (modified) (14 diffs)

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);