Changeset 1048


Ignore:
Timestamp:
Jan 19, 2014 7:25:24 PM (6 years ago)
Author:
pbelotti
Message:

merge changeset 1047: fix right-hand side for exprTrilinear

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/convex/operators/conv-exprTrilinear-gencuts.cpp

    r597 r1048  
    11821182    double *coe = new double [size];
    11831183
     1184    // Fix right hand sides: all cuts have coefficients of w equal to
     1185    // one, but they might be inequality-type auxiliaries.
     1186
     1187    exprAux *waux = dynamic_cast <exprAux *> (w);
     1188
     1189    if (waux) {
     1190      if      (waux -> sign () == expression::AUX_LEQ) cutLb [i] = - COUENNE_INFINITY;
     1191      else if (waux -> sign () == expression::AUX_GEQ) cutUb [i] =   COUENNE_INFINITY;
     1192    }
     1193
    11841194    std::copy (cutIndices [i].begin (), cutIndices [i].end (), ind);
    11851195    std::copy (cutCoeff   [i].begin (), cutCoeff   [i].end (), coe);
Note: See TracChangeset for help on using the changeset viewer.