Changeset 1438 for stable/1.10

Timestamp:

Sep 29, 2009 11:39:55 AM (11 years ago)

Author:

forrest

Message:

changes for quadratic

Location:

stable/1.10/Clp/src

Files:

• ClpSimplexNonlinear.cpp (modified) (1 diff)
• ClpSolve.cpp (modified) (1 diff)

stable/1.10/Clp/src/ClpSimplexNonlinear.cpp

@@ -50 +50 @@
     // for moment only if no scaling
     // May be faster if switched off - but can't see why
-    if (!quadraticObj->fullMatrix()&&!rowScale_&&objectiveScale_==1.0) {
+    if (!quadraticObj->fullMatrix()&&(!rowScale_&&!scalingFlag_)&&objectiveScale_==1.0) {
       saveObjective = objective_;
       objective_=new ClpQuadraticObjective(*quadraticObj,1);

stable/1.10/Clp/src/ClpSolve.cpp

@@ -2113 +2113 @@
       }
     }
-    if (method==ClpSolve::useBarrier) {
+    if (method==ClpSolve::useBarrier||barrierStatus<0) {
       if (maxIts&&barrierStatus<4&&!quadraticObj) {
         //printf("***** crossover - needs more thought on difficult models\n");