Changeset 1051 for trunk


Ignore:
Timestamp:
Jan 26, 2014 7:14:21 PM (6 years ago)
Author:
pbelotti
Message:

use exprTrilinear's Arglist instead of its auxiliary's

File:
1 edited

Legend:

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

    r1049 r1051  
    12381238      case 2:
    12391239
    1240         { // easy... cut is w = f1 * f2 * v3, where f* are fixed and v* is remaining
     1240        { // easy... cut is w = (f1 * f2) * v3, where f* are fixed and v* is remaining
    12411241
    12421242          int varInd = (!isFixed [0]) ? 0 : (!isFixed [1]) ? 1 : 2;
     
    12461246            ub = ((sign == expression::AUX_GEQ) ?   COIN_DBL_MAX : 0);
    12471247
    1248           if (!(cg->createCut (cs, lb, ub, w -> Index (), 1, w -> ArgList () [varInd] -> Index (), -fixed_prod))) {
    1249             cg -> Problem () -> Jnlst () -> Printf (Ipopt::J_ERROR, J_CONVEXIFYING, "exprTriLin: variable should be fixed but cut can't be added: "); w -> print ();
     1248          if (!(cg->createCut (cs, lb, ub, w -> Index (), 1, ArgList () [varInd] -> Index (), -fixed_prod))) {
     1249            cg -> Problem () -> Jnlst () -> Printf (Ipopt::J_ERROR, J_CONVEXIFYING, "exprTriLin: variable should be fixed but cut can't be added: ");
     1250            w -> print ();
    12501251            cg -> Problem () -> Jnlst () -> Printf (Ipopt::J_ERROR, J_CONVEXIFYING, "\n");
    12511252          }
Note: See TracChangeset for help on using the changeset viewer.