Changeset 834 for stable/0.4


Ignore:
Timestamp:
Feb 11, 2012 9:11:00 AM (8 years ago)
Author:
pbelotti
Message:

merged changes from trunk:833 -- fix bug in impliedBound-exprPow

Location:
stable/0.4/Couenne/src/bound_tightening
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/bound_tightening/impliedBounds.cpp

    r532 r834  
    4343    int j=0;
    4444    for (int i=0; i < nVars (); i++)
    45       if (variables_ [i] -> Multiplicity () >= 0) {
     45      if (variables_ [i] -> Multiplicity () > 0) {
    4646        Jnlst()->Printf(Ipopt::J_MOREVECTOR, J_BOUNDTIGHTENING,
    4747                        "x_%03d [%+10g %+10g] ", i,
  • stable/0.4/Couenne/src/bound_tightening/operators/impliedBounds-exprPow.cpp

    r560 r834  
    5353
    5454  CouNumber
    55     wl = ((sign == expression::AUX_GEQ) ? -COIN_DBL_MAX : l [wind]), // lower w
    56     wu = ((sign == expression::AUX_LEQ) ?  COIN_DBL_MAX : u [wind]); // upper w
     55    wl = ((sign == expression::AUX_LEQ) ? -COIN_DBL_MAX : l [wind]), // lower w
     56    wu = ((sign == expression::AUX_GEQ) ?  COIN_DBL_MAX : u [wind]); // upper w
    5757
    5858  if ((isint || isinvint) && (intk % 2)) {
Note: See TracChangeset for help on using the changeset viewer.