Changeset 1450 for trunk/Cbc

Timestamp:

May 19, 2010 5:13:56 AM (11 years ago)

Author:

forrest

Message:

for BonMin?

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (4 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -7495 +7495 @@
             }
             numberTries = 0 ;
+            keepGoing=false;
         }
     } while (numberTries > 0 || keepGoing) ;
@@ -8326 +8327 @@
                 || generator_[i]->switchedOff())
             generate = false;
-        if (switchOff) {
+        if (switchOff&&!generator_[i]->mustCallAgain()) {
             // switch off if default
             if (generator_[i]->howOften() == 1 && generator_[i]->whatDepth() < 0) {
@@ -12345 +12346 @@
             resolve(solver_);
             double objval = solver_->getObjValue();
+            int saveNumberRows=solver_->getNumRows();
             lastHeuristic_ = NULL;
             setBestSolution(CBC_SOLUTION, objval,
@@ -12362 +12364 @@
                 feasible = false; // pretend infeasible
             }
+            if( saveNumberRows<solver_->getNumRows()) {
+                // delete rows - but leave solution
+                int n = solver_->getNumRows();
+                int * del = new int [n-saveNumberRows];
+                for (int i=saveNumberRows;i<n;i++)
+                    del[i-saveNumberRows]=i;
+                solver_->deleteRows(n-saveNumberRows,del);
+                delete [] del;
+            }
             if (feasible)
                 anyAction = -1;