Ignore:
Timestamp:
May 31, 2007 4:11:46 PM (12 years ago)
Author:
pbelotti
Message:

fixed bug in setting branching point

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/Couenne/Couenne/src/branch/CouenneBranchingObject.cpp

    r557 r558  
    7272    if (u < COUENNE_INFINITY)
    7373      if (l > - COUENNE_INFINITY)    value_ = alpha * x + (1. - alpha) * (l + u) / 2.;
    74       else                           value_ = (u<0) ? -(1+u) : u/2;
    75     else if (l > - COUENNE_INFINITY) value_ = (l>0) ?  (1+l) : l/2;
     74      else                           value_ = (u<0) ? (u-1) : u/2;
     75    else if (l > - COUENNE_INFINITY) value_ = (l>0) ? (l+1) : l/2;
    7676    else                             value_ = 0;
    7777  else value_ = x;
    7878
    7979  if (0) {
    80     printf ("=== x%d branches on %g (at %g) [%g,%g]\n",
     80    printf ("=== x%d will branch on %g (at %g) [%g,%g]\n",
    8181            index_,
    8282            value_,
Note: See TracChangeset for help on using the changeset viewer.