Changeset 1438 for stable


Ignore:
Timestamp:
Sep 29, 2009 11:39:55 AM (10 years ago)
Author:
forrest
Message:

changes for quadratic

Location:
stable/1.10/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.10/Clp/src/ClpSimplexNonlinear.cpp

    r1321 r1438  
    5050    // for moment only if no scaling
    5151    // 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) {
    5353      saveObjective = objective_;
    5454      objective_=new ClpQuadraticObjective(*quadraticObj,1);
  • stable/1.10/Clp/src/ClpSolve.cpp

    r1432 r1438  
    21132113      }
    21142114    }
    2115     if (method==ClpSolve::useBarrier) {
     2115    if (method==ClpSolve::useBarrier||barrierStatus<0) {
    21162116      if (maxIts&&barrierStatus<4&&!quadraticObj) {
    21172117        //printf("***** crossover - needs more thought on difficult models\n");
Note: See TracChangeset for help on using the changeset viewer.