Ignore:
Timestamp:
Feb 16, 2007 2:53:48 PM (13 years ago)
Author:
forrest
Message:

must update to match CoinUtils?/trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSimplexDual.cpp

    r914 r919  
    39063906        //assert(numberDualInfeasibilitiesWithoutFree_==0);
    39073907
    3908         if (numberDualInfeasibilities_||situationChanged==2)
     3908        if (numberDualInfeasibilities_) {
     3909          if (numberPrimalInfeasibilities_||numberPivots)
     3910            problemStatus_=-1; // carry on as normal
     3911          else
     3912            problemStatus_=10; // try primal
     3913        } else if (situationChanged==2) {
    39093914          problemStatus_=-1; // carry on as normal
     3915        }
    39103916        situationChanged=0;
    39113917      } else {
     
    41134119    lower_[iSequence]=auxiliaryModel_->lowerRegion()[iSequence+numberRows_+numberColumns_];
    41144120    upper_[iSequence]=auxiliaryModel_->upperRegion()[iSequence+numberRows_+numberColumns_];
     4121    setFakeBound(iSequence,noFake);
    41154122    return;
    41164123  }
     
    50305037    case superBasic:
    50315038    case ClpSimplex::isFixed:
    5032       assert (bound==noFake);
     5039      //setFakeBound (iSequence, noFake);
    50335040      break;
    50345041    case atUpperBound:
     
    51385145          thetaUp = 0.0;
    51395146          bestAlphaDown = fabs(alpha);
    5140           bestAlphaUp = bestAlphaUp;
     5147          bestAlphaUp = bestAlphaDown;
    51415148          sequenceDown =iSequence2;
    51425149          sequenceUp = sequenceDown;
     
    53585365          thetaUp = 0.0;
    53595366          bestAlphaDown = fabs(alpha);
    5360           bestAlphaUp = bestAlphaUp;
     5367          bestAlphaUp = bestAlphaDown;
    53615368          sequenceDown =iSequence2;
    53625369          sequenceUp = sequenceDown;
Note: See TracChangeset for help on using the changeset viewer.