Changeset 841 for stable/0.4


Ignore:
Timestamp:
Feb 19, 2012 8:06:50 PM (8 years ago)
Author:
pbelotti
Message:

merged changes from trunk (problems in readnl+simplify)

Location:
stable/0.4
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4

    • Property svn:externals
      •  

        old new  
        99ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.0.3/
        1010CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.6/CoinUtils
        11 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.5/Cbc
         11Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.6/Cbc
        1212Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.3/Cgl
        1313Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.6/Clp
        1414Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.3/Osi
        15 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.1/Ipopt
         15Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.2/Ipopt
        1616Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.2/Bonmin
        17 
    • Property svn:mergeinfo changed
      /trunk/Couenne/src (added)merged: 839
  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/bound_tightening

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/heuristics/BonNlpHeuristic.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/readnl/readnl.cpp

    r752 r841  
    149149    expression
    150150      *body,
    151       *nl = nl2e (OBJ_DE [i] . e, asl);
     151      *nl = nl2e (OBJ_DE [i] . e, asl),
     152      *nls = nl -> simplify ();
     153
     154    if (nls) {
     155      delete nl;
     156      nl = nls;
     157    }
    152158
    153159    if (nterms) { // have linear terms
     
    322328      sign = COUENNE_EQ;
    323329
    324     expression *body;
    325 
    326     expression **nll = new expression * [1];
     330    expression
     331       *body,
     332      **nll = new expression * [1],
     333       *nls;
     334
    327335    *nll = nl2e (CON_DE [i] . e, asl);
     336
     337    nls = (*nll) -> simplify ();
     338
     339    if (nls) {
     340      delete *nll;
     341      *nll = nls;
     342    }
    328343
    329344    if (indexL [i] && (*(indexL [i]) >= 0)) {
     
    466481  struct cexp1 *common1 = ((const ASL_fg *) asl) -> I.cexps1_ + i;
    467482
    468   expression *nle = p -> nl2e (which ? common1 -> e : common -> e, asl);
     483  expression
     484    *nle = p -> nl2e (which ? common1 -> e : common -> e, asl),
     485    *nls = nle -> simplify ();
     486
     487  if (nls) {
     488    delete nle;
     489    nle = nls;
     490  }
    469491
    470492#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.