Changeset 730


Ignore:
Timestamp:
Feb 18, 2006 3:40:21 PM (15 years ago)
Author:
forrest
Message:

for odd problems

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplex.cpp

    r722 r730  
    377377  }
    378378  if (valuesPass) {
     379    double badInfeasibility = nonLinearCost_->largestInfeasibility();
    379380#ifdef CLP_DEBUG
    380381    std::cout<<"Largest given infeasibility "<<oldValue
     
    385386    double useError = CoinMin(largestPrimalError_,
    386387                              1.0e5/maximumAbsElement(solution_,numberRows_+numberColumns_)); 
    387     if (oldValue<incomingInfeasibility_
    388         &&nonLinearCost_->largestInfeasibility()>
    389         CoinMax(incomingInfeasibility_,allowedInfeasibility_)||
     388    if ((oldValue<incomingInfeasibility_||badInfeasibility>
     389         (CoinMax(10.0*allowedInfeasibility_,100.0*oldValue)))
     390        &&badInfeasibility>CoinMax(incomingInfeasibility_,allowedInfeasibility_)||
    390391        useError>1.0e-3) {
    391392      //printf("Original largest infeas %g, now %g, primalError %g\n",
Note: See TracChangeset for help on using the changeset viewer.