Changeset 2164 for trunk


Ignore:
Timestamp:
Sep 4, 2015 4:27:47 AM (3 years ago)
Author:
forrest
Message:

stop over-zealous infeasible

File:
1 edited

Legend:

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

    r2149 r2164  
    213213     // save data
    214214     ClpDataSave data = saveData();
     215     if (problemStatus_==10&&sumPrimalInfeasibilities_==-123456789.0) {
     216       // large infeasibility cost wanted
     217       infeasibilityCost_ = CoinMax(infeasibilityCost_,1.0e13);
     218     }
    215219     matrix_->refresh(this); // make sure matrix okay
    216220
     
    964968            largestDualError_=1.0e7;
    965969          }
    966           numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
     970          bool sayValuesPass = (firstFree_>=0);
     971          //if (ifValuesPass&&numberIterations_==baseIteration_)
     972          //sayValuesPass=true;
     973          numberThrownOut = gutsOfSolution(NULL, NULL, sayValuesPass);
    967974          double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
    968975          int reason2 = 0;
     
    16161623          problemStatus_ = 10; // try dual
    16171624          // See if second call
    1618           if ((moreSpecialOptions_ & 256) != 0||nonLinearCost_->sumInfeasibilities()>1.0e2) {
     1625          if ((moreSpecialOptions_ & 256) != 0&&nonLinearCost_->sumInfeasibilities()>1.0e2) {
    16191626               numberPrimalInfeasibilities_ = nonLinearCost_->numberInfeasibilities();
    16201627               sumPrimalInfeasibilities_ = nonLinearCost_->sumInfeasibilities();
     
    26232630                              if (printOut)
    26242631                                   printf("col %d lower from %g to %g, upper from %g to %g\n",
    2625                                           iSequence, lower_[iSequence], lowerValue, upper_[iSequence], upperValue);
     2632                                          iSequence, lowerValue, lower_[iSequence], upperValue , upper_[iSequence]);
    26262633                              if (solutionValue) {
    26272634                                   largest = CoinMax(largest, value);
Note: See TracChangeset for help on using the changeset viewer.