Changeset 1438 for stable/1.10
- Timestamp:
- Sep 29, 2009 11:39:55 AM (11 years ago)
- Location:
- stable/1.10/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/1.10/Clp/src/ClpSimplexNonlinear.cpp
r1321 r1438 50 50 // for moment only if no scaling 51 51 // May be faster if switched off - but can't see why 52 if (!quadraticObj->fullMatrix()&& !rowScale_&&objectiveScale_==1.0) {52 if (!quadraticObj->fullMatrix()&&(!rowScale_&&!scalingFlag_)&&objectiveScale_==1.0) { 53 53 saveObjective = objective_; 54 54 objective_=new ClpQuadraticObjective(*quadraticObj,1); -
stable/1.10/Clp/src/ClpSolve.cpp
r1432 r1438 2113 2113 } 2114 2114 } 2115 if (method==ClpSolve::useBarrier ) {2115 if (method==ClpSolve::useBarrier||barrierStatus<0) { 2116 2116 if (maxIts&&barrierStatus<4&&!quadraticObj) { 2117 2117 //printf("***** crossover - needs more thought on difficult models\n");
Note: See TracChangeset
for help on using the changeset viewer.