Changeset 68


Ignore:
Timestamp:
Jan 31, 2009 10:57:15 AM (12 years ago)
Author:
pbelotti
Message:

fixed branching distance to exponential (thanks to Pete Janes for pointing that out). Added mainpage.dox.

Location:
trunk/Couenne
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/branch/operators/branchExprExp.cpp

    r1 r68  
    118118
    119119    way = TWO_LEFT;
    120     return CoinMin (brDist [0] = log (y0) - x0,
    121                     brDist [1] = projectSeg (x0, y0, l, exp (l), *brpts, exp (*brpts), -1));
     120    return CoinMin (brDist [0] = projectSeg (x0, y0, l, exp (l), *brpts, exp (*brpts), -1),
     121                    brDist [1] = log (y0) - x0);
     122                   
    122123  }
    123124
Note: See TracChangeset for help on using the changeset viewer.