Changeset 580


Ignore:
Timestamp:
May 22, 2011 3:25:35 AM (9 years ago)
Author:
pbelotti
Message:

merging change in cutoff saving from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.3/Couenne/src/problem/problem.cpp

    r267 r580  
    2929const CouNumber SafeCutoff = 1e-4;
    3030
     31// absolute difference
     32const CouNumber SafeDelta = 1e-2;
     33
    3134/// initialize auxiliary variables from original variables in the
    3235/// nonlinear problem
     
    273276    if (Var (indobj) -> isInteger ())
    274277      pcutoff_    -> setCutOff (floor (cutoff + COUENNE_EPS));
    275     else pcutoff_ -> setCutOff (cutoff + SafeCutoff * (1. + fabs(cutoff)));
     278    else pcutoff_ -> setCutOff
     279           (cutoff + CoinMin (SafeDelta, SafeCutoff * (1. + fabs (cutoff))));  // tolerance needed to retain feasibility
    276280  }
    277281} // tolerance needed to retain feasibility
Note: See TracChangeset for help on using the changeset viewer.