Changeset 743


Ignore:
Timestamp:
Jul 22, 2011 3:19:57 PM (9 years ago)
Author:
pbelotti
Message:

merge changeset 742 in trunk: fix bug in exprLog::gradientNorm()

Location:
stable/0.3/Couenne/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.3/Couenne/src/branch/CouenneObject.cpp

    r734 r743  
    384384             CoinMax (1., fabs (fval)));
    385385
    386   //printf ("checkinf --> v=%e f=%e den=%e ret=%e ratio=%e\n", vval, fval, denom, retval, ratio);
     386  //jnlst_ -> Printf (J_DETAILED, J_BRANCHING, "checkinf --> v=%e f=%e den=%e ret=%e ratio=%e\n", vval, fval, denom, retval, ratio);
    387387
    388388  if ((ratio < 2)  &&
  • stable/0.3/Couenne/src/expression/operators/exprLog.cpp

    r154 r743  
    9999CouNumber exprLog::gradientNorm (const double *x) {
    100100  return (argument_ -> Index () < 0) ? 0. :
    101     1. / (CoinMin (1 / COUENNE_INFINITY, x [argument_ -> Index ()]));
     101    1. / (CoinMax (1. / COUENNE_INFINITY, x [argument_ -> Index ()]));
    102102}
    103103
Note: See TracChangeset for help on using the changeset viewer.