Changeset 2439 for trunk/Clp/src/ClpSimplex.cpp
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/stable/1.17 (added) merged: 2435,2437-2438
- Property svn:mergeinfo changed
-
trunk/Clp
- Property svn:mergeinfo changed
/stable/1.17/Clp (added) merged: 2435,2437-2438
- Property svn:mergeinfo changed
-
trunk/Clp/src
- Property svn:mergeinfo changed
/stable/1.17/Clp/src (added) merged: 2435,2437-2438
- Property svn:mergeinfo changed
-
trunk/Clp/src/ClpSimplex.cpp
r2393 r2439 153 153 primalColumnPivot_ = new ClpPrimalColumnSteepest(); 154 154 solveType_ = 1; // say simplex based life form 155 eventHandler_->setSimplex(this); 155 156 } 156 157 … … 266 267 primalColumnPivot_ = new ClpPrimalColumnSteepest(); 267 268 solveType_ = 1; // say simplex based life form 269 eventHandler_->setSimplex(this); 268 270 if (fixOthers) { 269 271 int numberOtherColumns = rhs->numberColumns(); … … 412 414 } 413 415 saveStatus_ = NULL; 416 eventHandler_->setSimplex(this); 414 417 factorization_ = new ClpFactorization(*rhs->factorization_, -numberRows_); 415 418 //factorization_ = new ClpFactorization(*rhs->factorization_, … … 6269 6272 ClpInterior barrier; 6270 6273 barrier.borrowModel(*model2); 6274 barrier.eventHandler()->setSimplex(NULL); 6271 6275 // See if quadratic objective 6272 6276 ClpQuadraticObjective *quadraticObj = NULL; … … 7394 7398 << CoinMessageEol; 7395 7399 problemStatus_ = 1; 7400 // but set secondary status to avoid errors 7401 secondaryStatus_ = 6; // good enough 7396 7402 return false; 7397 7403 }
Note: See TracChangeset
for help on using the changeset viewer.