Changeset 988:8d281761dea4 in lemon-main

Timestamp:

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

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

989:38e1d4383262, 990: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()

Files:

• lemon/bits/solver_bits.h (modified) (1 diff)
• lemon/cbc.cc (modified) (1 diff)
• lemon/clp.cc (modified) (1 diff)
• lemon/cplex.cc (modified) (1 diff)
• lemon/glpk.cc (modified) (1 diff)
• lemon/lp_base.h (modified) (1 diff)
• test/lp_test.cc (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

test/lp_test.cc

@@ -42 +42 @@
 using namespace lemon;
 
+int countCols(LpBase & lp) {
+  int count=0;
+  for (LpBase::ColIt c(lp); c!=INVALID; ++c) ++count;
+  return count;
+}
+
+int countRows(LpBase & lp) {
+  int count=0;
+  for (LpBase::RowIt r(lp); r!=INVALID; ++r) ++count;
+  return count;
+}
+
+
 void lpTest(LpSolver& lp)
 {
 
   typedef LpSolver LP;
+
+  // Test LpBase::clear()
+  check(countRows(lp)==0, "Wrong number of rows");
+  check(countCols(lp)==0, "Wrong number of cols");
+  lp.addCol(); lp.addRow(); lp.addRow();
+  check(countRows(lp)==2, "Wrong number of rows");
+  check(countCols(lp)==1, "Wrong number of cols");
+  lp.clear();
+  check(countRows(lp)==0, "Wrong number of rows");
+  check(countCols(lp)==0, "Wrong number of cols");
+  lp.addCol(); lp.addCol(); lp.addCol(); lp.addRow();
+  check(countRows(lp)==1, "Wrong number of rows");
+  check(countCols(lp)==3, "Wrong number of cols");
+  lp.clear();
 
   std::vector<LP::Col> x(10);