Ignore:
Timestamp:
Jul 26, 2011 5:31:51 AM (10 years ago)
Author:
forrest
Message:

changes for advanced use of Clp

File:
1 edited

Legend:

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

    r1761 r1769  
    895895          int status = eventHandler_->event(ClpEventHandler::goodFactorization);
    896896          if (status >= 0) {
    897             numberThrownOut=status;
    898           } else {
    899             numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
     897            lastSumInfeasibility = COIN_DBL_MAX;
    900898          }
    901 #else
     899#endif
    902900          numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
    903 #endif
    904901          double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
    905902          int reason2 = 0;
     
    31633160          if (pivotRow_ >= numberRows_)
    31643161               pivotRow_ = -1;
     3162#ifdef CLP_USER_DRIVEN
     3163          if (theta_<0.0) {
     3164            if (theta_>=-1.0e-12)
     3165              theta_=0.0;
     3166            //else
     3167            //printf("negative theta %g\n",theta_);
     3168          }
     3169#endif
    31653170          updatePrimalsInPrimal(rowArray_[1], theta_, objectiveChange, ifValuesPass);
    31663171          pivotRow_ = savePivot;
Note: See TracChangeset for help on using the changeset viewer.