Changeset 2439
- Timestamp:
- Mar 27, 2019 10:10:04 PM (2 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
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/ClpEventHandler.cpp
r2385 r2439 56 56 int ClpEventHandler::event(Event whichEvent) 57 57 { 58 59 assert (!model_||model_->eventHandler()==this); 58 60 if (whichEvent != theta) 59 61 return -1; // do nothing -
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 } -
trunk/Clp/src/ClpSimplexNonlinear.cpp
r2385 r2439 2099 2099 //objTheta=-1.0; // so we fall through 2100 2100 } 2101 assert(theta_ < 1.0e30); // for now 2101 if (theta_ >= 1.0e30) // odd 2102 ordinaryDj=true; 2102 2103 // See if we need to pivot 2103 2104 if (theta_ == basicTheta || ordinaryDj) { -
trunk/Clp/src/ClpSolve.cpp
r2385 r2439 3117 3117 ClpInterior barrier(*model2); 3118 3118 #endif 3119 barrier.eventHandler()->setSimplex(NULL); 3119 3120 if (interrupt) 3120 3121 currentModel2 = &barrier; -
trunk/Clp/src/OsiClp
- Property svn:mergeinfo changed
/stable/1.17/Clp/src/OsiClp (added) merged: 2438
- Property svn:mergeinfo changed
-
trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp
r2428 r2439 117 117 deleteSolver = true; 118 118 solver->borrowModel(*modelPtr_); 119 solver->eventHandler()->setSimplex(solver); 119 120 // See if user set factorization frequency 120 121 // borrowModel does not move
Note: See TracChangeset
for help on using the changeset viewer.