Changeset 1449 for stable/2.4
 Timestamp:
 May 19, 2010 4:47:09 AM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

stable/2.4/Cbc/src/CbcModel.cpp
r1408 r1449 7121 7121 generator_[i]>switchedOff()) 7122 7122 generate=false; 7123 if (switchOff ) {7123 if (switchOff&&!generator_[i]>mustCallAgain()) { 7124 7124 // switch off if default 7125 7125 if (generator_[i]>howOften()==1&&generator_[i]>whatDepth()<0) { … … 8091 8091 } 8092 8092 numberTries = 0 ; 8093 keepGoing=false; 8093 8094 } 8094 8095 } while (numberTries>0keepGoing) ; … … 12476 12477 //std::cout<<solver_<<std::endl; 12477 12478 resolve(solver_); 12479 int saveNumberRows=solver_>getNumRows(); 12478 12480 double objval = solver_>getObjValue(); 12479 12481 lastHeuristic_ = NULL; … … 12494 12496 feasible=false; // pretend infeasible 12495 12497 } 12496 if(feasible) 12498 if( saveNumberRows<solver_>getNumRows()) { 12499 // delete rows  but leave solution 12500 int n = solver_>getNumRows(); 12501 int * del = new int [nsaveNumberRows]; 12502 for (int i=saveNumberRows;i<n;i++) 12503 del[isaveNumberRows]=i; 12504 solver_>deleteRows(nsaveNumberRows,del); 12505 delete [] del; 12506 } 12507 if(feasible) { 12497 12508 anyAction = 1; 12498 else12509 } else { 12499 12510 anyAction = 2; 12511 } 12500 12512 } 12501 12513 /*
Note: See TracChangeset
for help on using the changeset viewer.