Changeset 1140:8d281761dea4 in lemon for lemon

Timestamp:

05/05/12 10:22:44 (12 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

1141:c3a7ca108705, 1142:4764031c082c, 1143:38e1d4383262, 1144:7440937d154b

Phase:

public

Message:

Fix buggy reinitialization in _solver_bits::VarIndex::clear() (#441)

• In addition, rows.clear() and cols.clear() are moved up to LpBase::clear()

Location:

lemon

Files:

• bits/solver_bits.h (modified) (1 diff)
• cbc.cc (modified) (1 diff)
• clp.cc (modified) (1 diff)
• cplex.cc (modified) (1 diff)
• glpk.cc (modified) (1 diff)
• lp_base.h (modified) (1 diff)

lemon/bits/solver_bits.h

@@ -45 +45 @@
       void clear() {
         first_item = -1;
+        last_item = -1;
         first_free_item = -1;
         items.clear();

lemon/cbc.cc

@@ -424 +424 @@
 
     _prob = new CoinModel();
-    rows.clear();
-    cols.clear();
   }
 

lemon/clp.cc

@@ -425 +425 @@
     delete _prob;
     _prob = new ClpSimplex();
-    rows.clear();
-    cols.clear();
     _col_names_ref.clear();
     _clear_temporals();

lemon/cplex.cc

@@ -438 +438 @@
     int status;
     _prob = CPXcreateprob(cplexEnv(), &status, "Cplex problem");
-    rows.clear();
-    cols.clear();
   }
 

lemon/glpk.cc

@@ -521 +521 @@
   void GlpkBase::_clear() {
     glp_erase_prob(lp);
-    rows.clear();
-    cols.clear();
   }
 

lemon/lp_base.h

@@ -1543 +1543 @@
 
     ///Clears the problem
-    void clear() { _clear(); }
+    void clear() { _clear(); rows.clear(); cols.clear(); }
 
     /// Sets the message level of the solver