Changeset 332 for stable/0.2/Couenne


Ignore:
Timestamp:
May 7, 2010 10:40:41 AM (10 years ago)
Author:
pbelotti
Message:

merge bugfix from stable/0.3 and trunk on reformulating xk:=xh with k>h

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

Legend:

Unmodified
Added
Removed
  • stable/0.2/Couenne/src/expression/operators/exprSum.hpp

    r159 r332  
    7979   *
    8080   *  is given such that all \f$a_i\f$ are positive for \f$i \in I1\f$ and
    81    *  negative for \f$i \in I2\f$. If the bounds on \f$w \in [l,b]\f$, implied
     81   *  negative for \f$i \in I2\f$. If the bounds on \f$w \in [l,u]\f$, implied
    8282   *  bounds on all \f$x_i, i\in I1 \cup I2\f$ are as follows:
    8383   *
  • stable/0.2/Couenne/src/standardize/constrStandardize.cpp

    r269 r332  
    9393      int xind = rest -> Index ();
    9494
    95       if (xind >= 0) {
     95      if (false && (xind >= 0)) {
    9696        p -> auxiliarize (p -> Var (wind), p -> Var (xind));
    9797        p -> Var (wind) -> zeroMult ();
Note: See TracChangeset for help on using the changeset viewer.