Changeset 2230 for stable


Ignore:
Timestamp:
Dec 5, 2016 7:57:06 AM (3 years ago)
Author:
forrest
Message:

correct incorrect feasible

File:
1 edited

Legend:

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

    r2163 r2230  
    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;
    975980          int reason2 = 0;
    976981#if CLP_CAUTION
     
    15081513                    }
    15091514               } else {
    1510                     if (!alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
     1515                    if (alwaysOptimal || !sumOfRelaxedPrimalInfeasibilities_)
    15111516                         problemStatus_ = 0; // optimal
    15121517                    else
Note: See TracChangeset for help on using the changeset viewer.