Changeset 2232 for stable


Ignore:
Timestamp:
Dec 5, 2016 12:15:33 PM (3 years ago)
Author:
tkr
Message:

Reverse merging r2230

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp/src/ClpSimplexPrimal.cpp

    r2230 r2232  
    973973          numberThrownOut = gutsOfSolution(NULL, NULL, sayValuesPass);
    974974          double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
    975           // have to use single criterion for primal infeasibilities
    976           assert (!sumPrimalInfeasibilities_);
    977           assert (!sumOfRelaxedPrimalInfeasibilities_);
    978           sumPrimalInfeasibilities_=sumInfeasibility;
    979           sumOfRelaxedPrimalInfeasibilities_=sumInfeasibility;
    980975          int reason2 = 0;
    981976#if CLP_CAUTION
     
    15131508                    }
    15141509               } else {
    1515                     if (alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
     1510                    if (!alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
    15161511                         problemStatus_ = 0; // optimal
    15171512                    else
Note: See TracChangeset for help on using the changeset viewer.