- Timestamp:
- May 19, 2010 5:13:56 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcModel.cpp
r1432 r1450 7495 7495 } 7496 7496 numberTries = 0 ; 7497 keepGoing=false; 7497 7498 } 7498 7499 } while (numberTries > 0 || keepGoing) ; … … 8326 8327 || generator_[i]->switchedOff()) 8327 8328 generate = false; 8328 if (switchOff ) {8329 if (switchOff&&!generator_[i]->mustCallAgain()) { 8329 8330 // switch off if default 8330 8331 if (generator_[i]->howOften() == 1 && generator_[i]->whatDepth() < 0) { … … 12345 12346 resolve(solver_); 12346 12347 double objval = solver_->getObjValue(); 12348 int saveNumberRows=solver_->getNumRows(); 12347 12349 lastHeuristic_ = NULL; 12348 12350 setBestSolution(CBC_SOLUTION, objval, … … 12362 12364 feasible = false; // pretend infeasible 12363 12365 } 12366 if( saveNumberRows<solver_->getNumRows()) { 12367 // delete rows - but leave solution 12368 int n = solver_->getNumRows(); 12369 int * del = new int [n-saveNumberRows]; 12370 for (int i=saveNumberRows;i<n;i++) 12371 del[i-saveNumberRows]=i; 12372 solver_->deleteRows(n-saveNumberRows,del); 12373 delete [] del; 12374 } 12364 12375 if (feasible) 12365 12376 anyAction = -1;
Note: See TracChangeset
for help on using the changeset viewer.