Changeset 2363:2aabce558574 in lemon-0.x for lemon/lp_glpk.cc

Timestamp:

02/15/07 15:22:08 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Changes on the LP interface

_FixId => LpId?

• handling of not common ids soplex

LpGlpk? row and col erase bug fix

• calling lpx_std_basis before simplex

LpSoplex?

• added getter functions
• better m4 file
• integration to the tests
• better handling of unsolved lps

File:

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

lemon/lp_glpk.cc

@@ -25 +25 @@
 
 
-  LpGlpk::LpGlpk() : Parent(), 
-                     lp(lpx_create_prob()) {
-    ///\todo constrol function for this:
+  LpGlpk::LpGlpk() : Parent() {
+    rows = _lp_bits::LpId(1);
+    cols = _lp_bits::LpId(1);
+    lp = lpx_create_prob();
+    ///\todo control function for this:
     lpx_set_int_parm(lp, LPX_K_DUAL, 1);
     messageLevel(0);
   }
   
-  LpGlpk::LpGlpk(const LpGlpk &glp) : Parent(glp), 
-                                      lp(lpx_create_prob()) {
-    ///\todo constrol function for this:
+  LpGlpk::LpGlpk(const LpGlpk &glp) : Parent() {
+    rows = _lp_bits::LpId(1);
+    cols = _lp_bits::LpId(1);
+    lp = lpx_create_prob();
+    ///\todo control function for this:
     lpx_set_int_parm(lp, LPX_K_DUAL, 1);
     messageLevel(0);
@@ -350 +354 @@
   }
   
-//   void LpGlpk::_setRowLowerBound(int i, Value lo)
-//   {
-//     if (lo==INF) {
-//       //FIXME error
-//     }
-//     int b=lpx_get_row_type(lp, i);
-//     double up=lpx_get_row_ub(lp, i); 
-//     if (lo==-INF) {
-//       switch (b) {
-//       case LPX_FR:
-//       case LPX_LO:
-//      lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
-//      break;
-//       case LPX_UP:
-//      break;
-//       case LPX_DB:
-//       case LPX_FX:
-//      lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
-//      break;
-//       default: ;
-//      //FIXME error
-//       }
-//     } else {
-//       switch (b) {
-//       case LPX_FR:
-//       case LPX_LO:
-//      lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
-//      break;
-//       case LPX_UP:     
-//       case LPX_DB:
-//       case LPX_FX:
-//      if (lo==up) 
-//        lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
-//      else 
-//        lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
-//      break;
-//       default: ;
-//      //FIXME error
-//       }
-//     }
-//   }
-  
-//   void LpGlpk::_setRowUpperBound(int i, Value up)
-//   {
-//     if (up==-INF) {
-//       //FIXME error
-//     }
-//     int b=lpx_get_row_type(lp, i);
-//     double lo=lpx_get_row_lb(lp, i);
-//     if (up==INF) {
-//       switch (b) {
-//       case LPX_FR:
-//       case LPX_LO:
-//      break;
-//       case LPX_UP:
-//      lpx_set_row_bnds(lp, i, LPX_FR, lo, up);
-//      break;
-//       case LPX_DB:
-//       case LPX_FX:
-//      lpx_set_row_bnds(lp, i, LPX_LO, lo, up);
-//      break;
-//       default: ;
-//      //FIXME error
-//       }
-//     } else {
-//       switch (b) {
-//       case LPX_FR:
-//      lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
-//      break;
-//       case LPX_UP:
-//      lpx_set_row_bnds(lp, i, LPX_UP, lo, up);
-//      break;
-//       case LPX_LO:
-//       case LPX_DB:
-//       case LPX_FX:
-//      if (lo==up) 
-//        lpx_set_row_bnds(lp, i, LPX_FX, lo, up);
-//      else 
-//        lpx_set_row_bnds(lp, i, LPX_DB, lo, up);
-//      break;
-//       default: ;
-//      //FIXME error
-//       }
-//     }
-//   }
-
   void LpGlpk::_setRowBounds(int i, Value lb, Value ub)
   {
@@ -509 +427 @@
     }
   }
-//   void LpGlpk::_setObj(int length,
-//                     int  const * indices, 
-//                     Value  const * values )
-//   {
-//     Value new_values[1+lpx_num_cols()];
-//     for (i=0;i<=lpx_num_cols();++i){
-//       new_values[i]=0;
-//     }
-//     for (i=1;i<=length;++i){
-//       new_values[indices[i]]=values[i];
-//     }
-    
-//     for (i=0;i<=lpx_num_cols();++i){
-//       lpx_set_obj_coef(lp, i, new_values[i]);
-//     }
-//   }
 
   LpGlpk::SolveExitStatus LpGlpk::_solve()
@@ -531 +433 @@
     //lpx_write_cpxlp(lp,"naittvan.cpx");    
 
+    lpx_std_basis(lp);
     int i =  lpx_simplex(lp);
+    
     switch (i) {
     case LPX_E_OK: