Changeset 312


Ignore:
Timestamp:
Mar 10, 2010 6:43:21 PM (11 years ago)
Author:
pbelotti
Message:

gave Couenne prefix to all header files

Location:
trunk/Couenne/src
Files:
104 edited
41 moved

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/Makefile.am

    r311 r312  
    122122includecoin_HEADERS = \
    123123        ../inc/config_couenne.h \
    124         util/rootQ.hpp \
    125         util/funtriplets.hpp \
     124        util/CouenneRootQ.hpp \
     125        util/CouenneFunTriplets.hpp \
    126126        main/BonCouenneInfo.hpp \
    127127        main/BonCouenneSetup.hpp \
     
    141141        branch/CouenneOrbitBranchingObj.hpp \
    142142        branch/CouenneSOSObject.hpp \
    143         branch/projections.hpp \
    144         standardize/lqelems.hpp \
    145         expression/domain.hpp \
    146         expression/operators/exprAbs.hpp \
    147         expression/operators/exprExp.hpp \
    148         expression/operators/exprInv.hpp \
    149         expression/operators/exprMul.hpp \
    150         expression/operators/exprOpp.hpp \
    151         expression/operators/exprLog.hpp \
    152         expression/operators/exprDiv.hpp \
    153         expression/operators/exprMin.hpp \
    154         expression/operators/exprSum.hpp \
    155         expression/operators/exprMax.hpp \
    156         expression/operators/exprPow.hpp \
    157         expression/operators/exprSin.hpp \
    158         expression/operators/exprCos.hpp \
    159         expression/operators/exprSub.hpp \
    160         expression/operators/exprGroup.hpp \
    161         expression/operators/exprQuad.hpp \
    162         expression/operators/exprIf.hpp \
    163         expression/operators/exprNorm.hpp \
    164         expression/operators/exprPWLinear.hpp \
    165         expression/operators/bounds/exprBMul.hpp \
    166         expression/operators/bounds/exprBDiv.hpp \
    167         expression/operators/bounds/exprBSin.hpp \
    168         expression/operators/bounds/exprBCos.hpp \
    169         expression/exprConst.hpp \
    170         expression/exprIVar.hpp \
    171         expression/exprVar.hpp \
    172         expression/exprAux.hpp \
    173         expression/exprUnary.hpp \
    174         expression/expression.hpp \
    175         expression/exprClone.hpp \
    176         expression/exprBound.hpp \
    177         expression/exprCopy.hpp \
    178         expression/exprStore.hpp \
    179         expression/exprOp.hpp \
     143        branch/CouenneProjections.hpp \
     144        standardize/CouenneLQelems.hpp \
     145        expression/CouenneDomain.hpp \
     146        expression/operators/CouenneExprAbs.hpp \
     147        expression/operators/CouenneExprExp.hpp \
     148        expression/operators/CouenneExprInv.hpp \
     149        expression/operators/CouenneExprMul.hpp \
     150        expression/operators/CouenneExprOpp.hpp \
     151        expression/operators/CouenneExprLog.hpp \
     152        expression/operators/CouenneExprDiv.hpp \
     153        expression/operators/CouenneExprMin.hpp \
     154        expression/operators/CouenneExprSum.hpp \
     155        expression/operators/CouenneExprMax.hpp \
     156        expression/operators/CouenneExprPow.hpp \
     157        expression/operators/CouenneExprSin.hpp \
     158        expression/operators/CouenneExprCos.hpp \
     159        expression/operators/CouenneExprSub.hpp \
     160        expression/operators/CouenneExprGroup.hpp \
     161        expression/operators/CouenneExprQuad.hpp \
     162        expression/operators/CouenneExprIf.hpp \
     163        expression/operators/CouenneExprNorm.hpp \
     164        expression/operators/CouenneExprPWLinear.hpp \
     165        expression/operators/bounds/CouenneExprBMul.hpp \
     166        expression/operators/bounds/CouenneExprBDiv.hpp \
     167        expression/operators/bounds/CouenneExprBSin.hpp \
     168        expression/operators/bounds/CouenneExprBCos.hpp \
     169        expression/CouenneExprConst.hpp \
     170        expression/CouenneExprIVar.hpp \
     171        expression/CouenneExprVar.hpp \
     172        expression/CouenneExprAux.hpp \
     173        expression/CouenneExprUnary.hpp \
     174        expression/CouenneExpression.hpp \
     175        expression/CouenneExprClone.hpp \
     176        expression/CouenneExprBound.hpp \
     177        expression/CouenneExprCopy.hpp \
     178        expression/CouenneExprStore.hpp \
     179        expression/CouenneExprOp.hpp \
    180180        expression/CouExpr.hpp \
    181181        expression/CouennePrecisions.hpp \
    182         problem/depGraph/depGraph.hpp \
     182        problem/depGraph/CouenneDepGraph.hpp \
    183183        problem/CouenneProblemElem.hpp \
    184184        problem/CouenneProblem.hpp \
  • trunk/Couenne/src/Makefile.in

    r311 r312  
    371371includecoin_HEADERS = \
    372372        ../inc/config_couenne.h \
    373         util/rootQ.hpp \
    374         util/funtriplets.hpp \
     373        util/CouenneRootQ.hpp \
     374        util/CouenneFunTriplets.hpp \
    375375        main/BonCouenneInfo.hpp \
    376376        main/BonCouenneSetup.hpp \
     
    390390        branch/CouenneOrbitBranchingObj.hpp \
    391391        branch/CouenneSOSObject.hpp \
    392         branch/projections.hpp \
    393         standardize/lqelems.hpp \
    394         expression/domain.hpp \
    395         expression/operators/exprAbs.hpp \
    396         expression/operators/exprExp.hpp \
    397         expression/operators/exprInv.hpp \
    398         expression/operators/exprMul.hpp \
    399         expression/operators/exprOpp.hpp \
    400         expression/operators/exprLog.hpp \
    401         expression/operators/exprDiv.hpp \
    402         expression/operators/exprMin.hpp \
    403         expression/operators/exprSum.hpp \
    404         expression/operators/exprMax.hpp \
    405         expression/operators/exprPow.hpp \
    406         expression/operators/exprSin.hpp \
    407         expression/operators/exprCos.hpp \
    408         expression/operators/exprSub.hpp \
    409         expression/operators/exprGroup.hpp \
    410         expression/operators/exprQuad.hpp \
    411         expression/operators/exprIf.hpp \
    412         expression/operators/exprNorm.hpp \
    413         expression/operators/exprPWLinear.hpp \
    414         expression/operators/bounds/exprBMul.hpp \
    415         expression/operators/bounds/exprBDiv.hpp \
    416         expression/operators/bounds/exprBSin.hpp \
    417         expression/operators/bounds/exprBCos.hpp \
    418         expression/exprConst.hpp \
    419         expression/exprIVar.hpp \
    420         expression/exprVar.hpp \
    421         expression/exprAux.hpp \
    422         expression/exprUnary.hpp \
    423         expression/expression.hpp \
    424         expression/exprClone.hpp \
    425         expression/exprBound.hpp \
    426         expression/exprCopy.hpp \
    427         expression/exprStore.hpp \
    428         expression/exprOp.hpp \
     392        branch/CouenneProjections.hpp \
     393        standardize/CouenneLQelems.hpp \
     394        expression/CouenneDomain.hpp \
     395        expression/operators/CouenneExprAbs.hpp \
     396        expression/operators/CouenneExprExp.hpp \
     397        expression/operators/CouenneExprInv.hpp \
     398        expression/operators/CouenneExprMul.hpp \
     399        expression/operators/CouenneExprOpp.hpp \
     400        expression/operators/CouenneExprLog.hpp \
     401        expression/operators/CouenneExprDiv.hpp \
     402        expression/operators/CouenneExprMin.hpp \
     403        expression/operators/CouenneExprSum.hpp \
     404        expression/operators/CouenneExprMax.hpp \
     405        expression/operators/CouenneExprPow.hpp \
     406        expression/operators/CouenneExprSin.hpp \
     407        expression/operators/CouenneExprCos.hpp \
     408        expression/operators/CouenneExprSub.hpp \
     409        expression/operators/CouenneExprGroup.hpp \
     410        expression/operators/CouenneExprQuad.hpp \
     411        expression/operators/CouenneExprIf.hpp \
     412        expression/operators/CouenneExprNorm.hpp \
     413        expression/operators/CouenneExprPWLinear.hpp \
     414        expression/operators/bounds/CouenneExprBMul.hpp \
     415        expression/operators/bounds/CouenneExprBDiv.hpp \
     416        expression/operators/bounds/CouenneExprBSin.hpp \
     417        expression/operators/bounds/CouenneExprBCos.hpp \
     418        expression/CouenneExprConst.hpp \
     419        expression/CouenneExprIVar.hpp \
     420        expression/CouenneExprVar.hpp \
     421        expression/CouenneExprAux.hpp \
     422        expression/CouenneExprUnary.hpp \
     423        expression/CouenneExpression.hpp \
     424        expression/CouenneExprClone.hpp \
     425        expression/CouenneExprBound.hpp \
     426        expression/CouenneExprCopy.hpp \
     427        expression/CouenneExprStore.hpp \
     428        expression/CouenneExprOp.hpp \
    429429        expression/CouExpr.hpp \
    430430        expression/CouennePrecisions.hpp \
    431         problem/depGraph/depGraph.hpp \
     431        problem/depGraph/CouenneDepGraph.hpp \
    432432        problem/CouenneProblemElem.hpp \
    433433        problem/CouenneProblem.hpp \
  • trunk/Couenne/src/bound_tightening/obbt.cpp

    r310 r312  
    1212#include "CglCutGenerator.hpp"
    1313
    14 #include "expression.hpp"
     14#include "CouenneExpression.hpp"
    1515#include "CouenneCutGenerator.hpp"
    1616#include "CouenneProblem.hpp"
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprDiv.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprDiv.hpp"
     11#include "CouenneExprDiv.hpp"
    1212#include "CouennePrecisions.hpp"
    1313#include "CoinHelperFunctions.hpp"
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprMul.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprMul.hpp"
     11#include "CouenneExprMul.hpp"
    1212#include "CouennePrecisions.hpp"
    1313#include "CoinFinite.hpp"
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprPow.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprPow.hpp"
    12 #include "expression.hpp"
     11#include "CouenneExprPow.hpp"
     12#include "CouenneExpression.hpp"
    1313#include "CoinHelperFunctions.hpp"
    1414
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprQuad.cpp

    r307 r312  
    1313
    1414#include "CoinHelperFunctions.hpp"
    15 #include "exprQuad.hpp"
     15#include "CouenneExprQuad.hpp"
    1616
    1717//#define DEBUG
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-exprSum.cpp

    r309 r312  
    1010
    1111#include "CoinHelperFunctions.hpp"
    12 #include "exprSum.hpp"
    13 #include "exprGroup.hpp"
     12#include "CouenneExprSum.hpp"
     13#include "CouenneExprGroup.hpp"
    1414
    1515/// vector operation to find bound to variable in a sum
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-mul.cpp

    r141 r312  
    1212
    1313#include "CoinHelperFunctions.hpp"
    14 #include "exprMul.hpp"
     14#include "CouenneExprMul.hpp"
    1515
    1616int exprMul::impliedBoundMul (CouNumber wl,
  • trunk/Couenne/src/bound_tightening/operators/impliedBounds-sum.cpp

    r141 r312  
    1212
    1313#include "CoinHelperFunctions.hpp"
    14 #include "exprSum.hpp"
     14#include "CouenneExprSum.hpp"
    1515
    1616#define ALMOST_INF (1e-5 * COUENNE_INFINITY)
  • trunk/Couenne/src/branch/CouenneBranchingObject.hpp

    r215 r312  
    1414
    1515#include "CoinFinite.hpp"
    16 #include "exprAux.hpp"
     16#include "CouenneExprAux.hpp"
    1717#include "CouenneJournalist.hpp"
    1818#include "OsiBranchingObject.hpp"
  • trunk/Couenne/src/branch/CouenneObject.hpp

    r259 r312  
    1616#include "CoinFinite.hpp"
    1717
    18 #include "exprVar.hpp"
     18#include "CouenneExprVar.hpp"
    1919#include "CouenneJournalist.hpp"
    2020#include "OsiBranchingObject.hpp"
  • trunk/Couenne/src/branch/CouenneOrbitBranchingObj.hpp

    r258 r312  
    1313
    1414#include "CoinFinite.hpp"
    15 #include "exprAux.hpp"
     15#include "CouenneExprAux.hpp"
    1616#include "CouenneJournalist.hpp"
    1717#include "OsiBranchingObject.hpp"
  • trunk/Couenne/src/branch/CouenneOrbitObj.cpp

    r286 r312  
    1616#include "CouenneBranchingObject.hpp"
    1717
    18 #include "exprGroup.hpp"
     18#include "CouenneExprGroup.hpp"
    1919
    2020/// Empty constructor
  • trunk/Couenne/src/branch/CouenneOrbitObj.hpp

    r259 r312  
    1515#include "CoinFinite.hpp"
    1616
    17 #include "exprVar.hpp"
     17#include "CouenneExprVar.hpp"
    1818#include "CouenneJournalist.hpp"
    1919#include "OsiBranchingObject.hpp"
  • trunk/Couenne/src/branch/CouenneThreeWayBranchObj.hpp

    r141 r312  
    1616#include "OsiBranchingObject.hpp"
    1717
    18 #include "exprAux.hpp"
     18#include "CouenneExprAux.hpp"
    1919#include "CouenneObject.hpp"
    2020
  • trunk/Couenne/src/branch/feasibleRegion.cpp

    r215 r312  
    1717#include "CouenneThreeWayBranchObj.hpp"
    1818
    19 #include "exprGroup.hpp"
    20 #include "exprQuad.hpp"
    21 #include "lqelems.hpp"
     19#include "CouenneExprGroup.hpp"
     20#include "CouenneExprQuad.hpp"
     21#include "CouenneLQelems.hpp"
    2222
    2323#define TOL 0.
  • trunk/Couenne/src/branch/operators/branchExprAbs.cpp

    r141 r312  
    1212
    1313#include "CoinHelperFunctions.hpp"
    14 #include "exprAbs.hpp"
     14#include "CouenneExprAbs.hpp"
    1515#include "CouenneObject.hpp"
    1616
  • trunk/Couenne/src/branch/operators/branchExprDiv.cpp

    r141 r312  
    99 */
    1010
    11 #include "exprDiv.hpp"
    12 #include "exprMul.hpp"
     11#include "CouenneExprDiv.hpp"
     12#include "CouenneExprMul.hpp"
    1313#include "CouenneBranchingObject.hpp"
    1414#include "CouenneObject.hpp"
  • trunk/Couenne/src/branch/operators/branchExprExp.cpp

    r141 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212
    13 #include "exprExp.hpp"
     13#include "CouenneExprExp.hpp"
    1414#include "CouenneObject.hpp"
    1515#include "CouenneBranchingObject.hpp"
    16 #include "projections.hpp"
    17 #include "funtriplets.hpp"
     16#include "CouenneProjections.hpp"
     17#include "CouenneFunTriplets.hpp"
    1818
    1919
  • trunk/Couenne/src/branch/operators/branchExprInv.cpp

    r141 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212
    13 #include "exprInv.hpp"
     13#include "CouenneExprInv.hpp"
    1414#include "CouenneObject.hpp"
    1515#include "CouenneBranchingObject.hpp"
    16 #include "projections.hpp"
    17 #include "funtriplets.hpp"
     16#include "CouenneProjections.hpp"
     17#include "CouenneFunTriplets.hpp"
    1818
    1919
  • trunk/Couenne/src/branch/operators/branchExprLog.cpp

    r141 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212
    13 #include "exprLog.hpp"
     13#include "CouenneExprLog.hpp"
    1414#include "CouenneObject.hpp"
    1515#include "CouenneBranchingObject.hpp"
    16 #include "projections.hpp"
    17 #include "funtriplets.hpp"
     16#include "CouenneProjections.hpp"
     17#include "CouenneFunTriplets.hpp"
    1818
    1919
  • trunk/Couenne/src/branch/operators/branchExprMul.cpp

    r141 r312  
    1313#include "CouenneObject.hpp"
    1414
    15 #include "exprMul.hpp"
    16 #include "funtriplets.hpp"
    17 #include "projections.hpp"
     15#include "CouenneExprMul.hpp"
     16#include "CouenneFunTriplets.hpp"
     17#include "CouenneProjections.hpp"
    1818
    1919
  • trunk/Couenne/src/branch/operators/branchExprPow.cpp

    r141 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212
    13 #include "exprPow.hpp"
     13#include "CouenneExprPow.hpp"
    1414#include "CouenneObject.hpp"
    1515#include "CouenneBranchingObject.hpp"
    16 #include "projections.hpp"
    17 #include "funtriplets.hpp"
     16#include "CouenneProjections.hpp"
     17#include "CouenneFunTriplets.hpp"
    1818
    1919
  • trunk/Couenne/src/branch/operators/branchExprQuad.cpp

    r141 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212
    13 #include "exprQuad.hpp"
     13#include "CouenneExprQuad.hpp"
    1414#include "CouenneObject.hpp"
    1515#include "CouenneBranchingObject.hpp"
  • trunk/Couenne/src/branch/operators/branchExprSinCos.cpp

    r141 r312  
    1111#include <math.h>
    1212
    13 #include "funtriplets.hpp"
    14 #include "exprSin.hpp"
     13#include "CouenneFunTriplets.hpp"
     14#include "CouenneExprSin.hpp"
    1515#include "CouenneObject.hpp"
    1616#include "CouenneBranchingObject.hpp"
  • trunk/Couenne/src/branch/operators/computeMulBrDist.cpp

    r141 r312  
    1313#include "CouenneObject.hpp"
    1414
    15 #include "exprMul.hpp"
    16 #include "funtriplets.hpp"
    17 #include "projections.hpp"
     15#include "CouenneExprMul.hpp"
     16#include "CouenneFunTriplets.hpp"
     17#include "CouenneProjections.hpp"
    1818
    1919// compute distance from future convexifications in set \f$\{(x,y,w):
  • trunk/Couenne/src/branch/operators/minMaxDelta.cpp

    r141 r312  
    1212
    1313#include "CouenneObject.hpp"
    14 #include "funtriplets.hpp"
     14#include "CouenneFunTriplets.hpp"
    1515
    1616const int maxIter = 20;
  • trunk/Couenne/src/convex/addEnvelope.cpp

    r141 r312  
    1414#include "CouenneTypes.hpp"
    1515#include "CouenneCutGenerator.hpp"
    16 #include "funtriplets.hpp"
     16#include "CouenneFunTriplets.hpp"
    1717
    1818
  • trunk/Couenne/src/convex/operators/alphaConvexify.cpp

    r308 r312  
    1414#include "IpLapack.hpp"
    1515
    16 #include "exprQuad.hpp"
     16#include "CouenneExprQuad.hpp"
    1717#include "CouenneProblem.hpp"
    1818
  • trunk/Couenne/src/convex/operators/conv-exprAbs.cpp

    r307 r312  
    1313#include "CouenneCutGenerator.hpp"
    1414#include "CouenneProblem.hpp"
    15 #include "exprAbs.hpp"
    16 #include "exprAux.hpp"
     15#include "CouenneExprAbs.hpp"
     16#include "CouenneExprAux.hpp"
    1717
    1818
  • trunk/Couenne/src/convex/operators/conv-exprDiv.cpp

    r307 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "expression.hpp"
    13 #include "exprAux.hpp"
    14 #include "exprOp.hpp"
    15 #include "exprDiv.hpp"
    16 #include "exprClone.hpp"
    17 #include "exprMul.hpp"
     12#include "CouenneExpression.hpp"
     13#include "CouenneExprAux.hpp"
     14#include "CouenneExprOp.hpp"
     15#include "CouenneExprDiv.hpp"
     16#include "CouenneExprClone.hpp"
     17#include "CouenneExprMul.hpp"
    1818#include "CouenneProblem.hpp"
    1919#include "CouenneCutGenerator.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprExp.cpp

    r307 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "exprExp.hpp"
    13 #include "exprConst.hpp"
    14 #include "exprAux.hpp"
    15 #include "exprPow.hpp"
     12#include "CouenneExprExp.hpp"
     13#include "CouenneExprConst.hpp"
     14#include "CouenneExprAux.hpp"
     15#include "CouenneExprPow.hpp"
    1616
    1717#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprGroup.cpp

    r307 r312  
    1212#include "OsiCuts.hpp"
    1313
    14 #include "exprGroup.hpp"
    15 #include "exprBound.hpp"
    16 #include "exprMul.hpp"
     14#include "CouenneExprGroup.hpp"
     15#include "CouenneExprBound.hpp"
     16#include "CouenneExprMul.hpp"
    1717
    1818#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprInv.cpp

    r307 r312  
    1111#include "CouenneTypes.hpp"
    1212
    13 #include "exprInv.hpp"
    14 #include "exprClone.hpp"
    15 #include "exprConst.hpp"
    16 #include "exprMin.hpp"
    17 #include "exprOpp.hpp"
    18 #include "exprDiv.hpp"
    19 #include "exprSum.hpp"
    20 #include "exprMul.hpp"
    21 #include "exprPow.hpp"
     13#include "CouenneExprInv.hpp"
     14#include "CouenneExprClone.hpp"
     15#include "CouenneExprConst.hpp"
     16#include "CouenneExprMin.hpp"
     17#include "CouenneExprOpp.hpp"
     18#include "CouenneExprDiv.hpp"
     19#include "CouenneExprSum.hpp"
     20#include "CouenneExprMul.hpp"
     21#include "CouenneExprPow.hpp"
    2222
    2323#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprLog.cpp

    r307 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "exprLog.hpp"
    13 #include "exprPow.hpp"
    14 #include "exprAux.hpp"
     12#include "CouenneExprLog.hpp"
     13#include "CouenneExprPow.hpp"
     14#include "CouenneExprAux.hpp"
    1515
    1616#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprMul-genCuts.cpp

    r307 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "exprMul.hpp"
     12#include "CouenneExprMul.hpp"
    1313#include "CouenneCutGenerator.hpp"
    1414#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprMul.cpp

    r230 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "exprMul.hpp"
    13 #include "exprBMul.hpp"
    14 #include "exprConst.hpp"
    15 #include "exprPow.hpp"
    16 #include "exprClone.hpp"
     12#include "CouenneExprMul.hpp"
     13#include "CouenneExprBMul.hpp"
     14#include "CouenneExprConst.hpp"
     15#include "CouenneExprPow.hpp"
     16#include "CouenneExprClone.hpp"
    1717#include "CouenneProblem.hpp"
    1818
  • trunk/Couenne/src/convex/operators/conv-exprOpp.cpp

    r307 r312  
    1010
    1111#include "CouenneTypes.hpp"
    12 #include "exprOpp.hpp"
    13 #include "exprConst.hpp"
     12#include "CouenneExprOpp.hpp"
     13#include "CouenneExprConst.hpp"
    1414
    1515#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprPow-envelope.cpp

    r217 r312  
    1212
    1313#include "CouenneTypes.hpp"
    14 #include "rootQ.hpp"
    15 #include "exprPow.hpp"
     14#include "CouenneRootQ.hpp"
     15#include "CouenneExprPow.hpp"
    1616#include "CouennePrecisions.hpp"
    1717#include "CouenneProblem.hpp"
    1818#include "CouenneCutGenerator.hpp"
    19 #include "funtriplets.hpp"
     19#include "CouenneFunTriplets.hpp"
    2020
    2121
  • trunk/Couenne/src/convex/operators/conv-exprPow-getBounds.cpp

    r139 r312  
    1212
    1313#include "CouenneTypes.hpp"
    14 #include "exprPow.hpp"
    15 #include "exprConst.hpp"
    16 #include "exprClone.hpp"
    17 #include "exprMax.hpp"
    18 #include "exprMin.hpp"
    19 #include "exprOpp.hpp"
     14#include "CouenneExprPow.hpp"
     15#include "CouenneExprConst.hpp"
     16#include "CouenneExprClone.hpp"
     17#include "CouenneExprMax.hpp"
     18#include "CouenneExprMin.hpp"
     19#include "CouenneExprOpp.hpp"
    2020#include "CouennePrecisions.hpp"
    2121#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprPow.cpp

    r307 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "rootQ.hpp"
    18 #include "exprPow.hpp"
    19 #include "exprExp.hpp"
    20 #include "exprConst.hpp"
    21 #include "exprClone.hpp"
    22 #include "exprMul.hpp"
    23 #include "exprSum.hpp"
    24 #include "exprLog.hpp"
     17#include "CouenneRootQ.hpp"
     18#include "CouenneExprPow.hpp"
     19#include "CouenneExprExp.hpp"
     20#include "CouenneExprConst.hpp"
     21#include "CouenneExprClone.hpp"
     22#include "CouenneExprMul.hpp"
     23#include "CouenneExprSum.hpp"
     24#include "CouenneExprLog.hpp"
    2525#include "CouennePrecisions.hpp"
    2626#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/conv-exprQuad.cpp

    r217 r312  
    1414#include "OsiCuts.hpp"
    1515
    16 #include "exprAux.hpp"
    17 #include "exprQuad.hpp"
    18 #include "exprBQuad.hpp"
     16#include "CouenneExprAux.hpp"
     17#include "CouenneExprQuad.hpp"
     18#include "CouenneExprBQuad.hpp"
    1919#include "CouenneCutGenerator.hpp"
    2020
  • trunk/Couenne/src/convex/operators/conv-exprSinCos.cpp

    r307 r312  
    2222#include "CouenneProblem.hpp"
    2323
    24 //#include "expression.hpp"
    25 
    26 #include "exprSin.hpp"
    27 #include "exprCos.hpp"
    28 #include "exprAux.hpp"
     24//#include "CouenneExpression.hpp"
     25
     26#include "CouenneExprSin.hpp"
     27#include "CouenneExprCos.hpp"
     28#include "CouenneExprAux.hpp"
    2929
    3030#define NEW_TRIG
  • trunk/Couenne/src/convex/operators/conv-exprSub.cpp

    r307 r312  
    1111#include "CouenneTypes.hpp"
    1212#include "CouenneCutGenerator.hpp"
    13 #include "exprSub.hpp"
    14 #include "exprOpp.hpp"
     13#include "CouenneExprSub.hpp"
     14#include "CouenneExprOpp.hpp"
    1515
    1616// generate equality between *this and *w
  • trunk/Couenne/src/convex/operators/conv-exprSum.cpp

    r307 r312  
    1111#include "CouenneTypes.hpp"
    1212
    13 #include "exprSum.hpp"
    14 #include "exprConst.hpp"
     13#include "CouenneExprSum.hpp"
     14#include "CouenneExprConst.hpp"
    1515
    1616#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/exprMul-upperHull.cpp

    r308 r312  
    99 */
    1010
    11 #include "exprMul.hpp"
     11#include "CouenneExprMul.hpp"
    1212#include "CouennePrecisions.hpp"
    1313#include "CouenneCutGenerator.hpp"
  • trunk/Couenne/src/convex/operators/powNewton.cpp

    r217 r312  
    1919
    2020#ifndef DEBUG_POWNEW
    21 #include "funtriplets.hpp"
     21#include "CouenneFunTriplets.hpp"
    2222#else
    2323#include <stdlib.h>
  • trunk/Couenne/src/convex/operators/quadCuts.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprQuad.hpp"
     11#include "CouenneExprQuad.hpp"
    1212
    1313#include "CouenneProblem.hpp"
  • trunk/Couenne/src/convex/operators/unifiedProdCuts.cpp

    r308 r312  
    1313#include "CouenneCutGenerator.hpp"
    1414#include "CouenneProblem.hpp"
    15 #include "exprDiv.hpp"
    16 #include "exprMul.hpp"
    17 #include "exprPow.hpp"
    18 #include "funtriplets.hpp"
     15#include "CouenneExprDiv.hpp"
     16#include "CouenneExprMul.hpp"
     17#include "CouenneExprPow.hpp"
     18#include "CouenneFunTriplets.hpp"
    1919
    2020
  • trunk/Couenne/src/expression/CouExpr.cpp

    r217 r312  
    99
    1010#include "CouExpr.hpp"
    11 #include "exprClone.hpp"
    12 #include "exprSum.hpp"
     11#include "CouenneExprClone.hpp"
     12#include "CouenneExprSum.hpp"
    1313
    1414
  • trunk/Couenne/src/expression/CouExpr.hpp

    r217 r312  
    88 */
    99
    10 #include "expression.hpp"
     10#include "CouenneExpression.hpp"
    1111
    1212class CouExpr {
  • trunk/Couenne/src/expression/CouenneExprAux.hpp

    r307 r312  
    1515#include <iostream>
    1616
    17 #include "exprVar.hpp"
     17#include "CouenneExprVar.hpp"
    1818
    1919class CouenneCutGenerator;
  • trunk/Couenne/src/expression/CouenneExprBound.hpp

    r306 r312  
    1616
    1717#include "CouenneTypes.hpp"
    18 #include "exprVar.hpp"
     18#include "CouenneExprVar.hpp"
    1919
    2020/// These are bound expression classes. They are used in the parametric
  • trunk/Couenne/src/expression/CouenneExprClone.hpp

    r306 r312  
    1616
    1717#include "CouenneTypes.hpp"
    18 #include "exprCopy.hpp"
     18#include "CouenneExprCopy.hpp"
    1919
    2020
  • trunk/Couenne/src/expression/CouenneExprConst.hpp

    r306 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "expression.hpp"
     17#include "CouenneExpression.hpp"
    1818
    1919
  • trunk/Couenne/src/expression/CouenneExprCopy.hpp

    r308 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "expression.hpp"
     17#include "CouenneExpression.hpp"
    1818
    1919class CouenneObject;
  • trunk/Couenne/src/expression/CouenneExprIVar.hpp

    r306 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "expression.hpp"
    18 #include "exprVar.hpp"
     17#include "CouenneExpression.hpp"
     18#include "CouenneExprVar.hpp"
    1919
    2020
  • trunk/Couenne/src/expression/CouenneExprOp.hpp

    r306 r312  
    1414#include <iostream>
    1515
    16 #include "expression.hpp"
     16#include "CouenneExpression.hpp"
    1717#include "CouenneTypes.hpp"
    1818
  • trunk/Couenne/src/expression/CouenneExprStore.hpp

    r306 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "exprCopy.hpp"
     17#include "CouenneExprCopy.hpp"
    1818
    1919
  • trunk/Couenne/src/expression/CouenneExprUnary.hpp

    r306 r312  
    1414#include <iostream>
    1515
    16 #include "expression.hpp"
     16#include "CouenneExpression.hpp"
    1717#include "CouenneTypes.hpp"
    1818
  • trunk/Couenne/src/expression/CouenneExprVar.hpp

    r307 r312  
    1717#include "CouenneJournalist.hpp"
    1818#include "CouenneTypes.hpp"
    19 #include "expression.hpp"
    20 #include "exprConst.hpp"
    21 #include "domain.hpp"
     19#include "CouenneExpression.hpp"
     20#include "CouenneExprConst.hpp"
     21#include "CouenneDomain.hpp"
    2222
    2323class CouenneCutGenerator;
  • trunk/Couenne/src/expression/domain.cpp

    r217 r312  
    1010
    1111#include "CoinHelperFunctions.hpp"
    12 #include "domain.hpp"
     12#include "CouenneDomain.hpp"
    1313#include "CouennePrecisions.hpp"
    1414
  • trunk/Couenne/src/expression/exprAux.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprAux.hpp"
    12 #include "exprBound.hpp"
    13 #include "exprMax.hpp"
    14 #include "exprMin.hpp"
     11#include "CouenneExprAux.hpp"
     12#include "CouenneExprBound.hpp"
     13#include "CouenneExprMax.hpp"
     14#include "CouenneExprMin.hpp"
    1515#include "CouenneCutGenerator.hpp"
    1616#include "CouenneComplObject.hpp"
  • trunk/Couenne/src/expression/exprOp.cpp

    r230 r312  
    99 */
    1010
    11 #include "expression.hpp"
    12 #include "exprAux.hpp"
    13 #include "exprClone.hpp"
    14 #include "exprOp.hpp"
    15 #include "exprGroup.hpp"
    16 #include "exprQuad.hpp"
     11#include "CouenneExpression.hpp"
     12#include "CouenneExprAux.hpp"
     13#include "CouenneExprClone.hpp"
     14#include "CouenneExprOp.hpp"
     15#include "CouenneExprGroup.hpp"
     16#include "CouenneExprQuad.hpp"
    1717
    1818#include <cstdio>
  • trunk/Couenne/src/expression/exprUnary.cpp

    r230 r312  
    1111#include "CouenneProblem.hpp"
    1212#include "CouenneTypes.hpp"
    13 #include "exprUnary.hpp"
    14 #include "exprVar.hpp"
    15 #include "exprClone.hpp"
     13#include "CouenneExprUnary.hpp"
     14#include "CouenneExprVar.hpp"
     15#include "CouenneExprClone.hpp"
    1616
    1717// print unary expression
  • trunk/Couenne/src/expression/exprVar.cpp

    r307 r312  
    1212#include "CouenneProblem.hpp"
    1313#include "CouenneObject.hpp"
    14 #include "exprAux.hpp"
    15 #include "exprVar.hpp"
    16 #include "exprBound.hpp"
    17 #include "depGraph.hpp"
     14#include "CouenneExprAux.hpp"
     15#include "CouenneExprVar.hpp"
     16#include "CouenneExprBound.hpp"
     17#include "CouenneDepGraph.hpp"
    1818
    1919
  • trunk/Couenne/src/expression/expression.cpp

    r217 r312  
    1313
    1414#include "CouenneTypes.hpp"
    15 #include "expression.hpp"
    16 #include "exprClone.hpp"
    17 #include "exprAux.hpp"
    18 #include "exprOp.hpp"
    19 #include "exprUnary.hpp"
    20 #include "exprStore.hpp"
     15#include "CouenneExpression.hpp"
     16#include "CouenneExprClone.hpp"
     17#include "CouenneExprAux.hpp"
     18#include "CouenneExprOp.hpp"
     19#include "CouenneExprUnary.hpp"
     20#include "CouenneExprStore.hpp"
    2121
    2222
  • trunk/Couenne/src/expression/operators/CouenneExprAbs.hpp

    r307 r312  
    1414#include <math.h>
    1515
    16 #include "exprUnary.hpp"
    17 #include "exprConst.hpp"
     16#include "CouenneExprUnary.hpp"
     17#include "CouenneExprConst.hpp"
    1818
    1919
  • trunk/Couenne/src/expression/operators/CouenneExprCos.hpp

    r307 r312  
    1212#define COUENNE_EXPRCOS_HPP
    1313
    14 #include "exprSin.hpp"
     14#include "CouenneExprSin.hpp"
    1515
    1616/// class cosine
  • trunk/Couenne/src/expression/operators/CouenneExprDiv.hpp

    r307 r312  
    1212#define COUENNE_EXPRDIV_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515#include "CouennePrecisions.hpp"
    1616
  • trunk/Couenne/src/expression/operators/CouenneExprExp.hpp

    r307 r312  
    1414#include <math.h>
    1515
    16 #include "exprUnary.hpp"
     16#include "CouenneExprUnary.hpp"
    1717
    1818/// class for the exponential
  • trunk/Couenne/src/expression/operators/CouenneExprGroup.hpp

    r306 r312  
    1414#include <vector>
    1515
    16 #include "exprSum.hpp"
    17 #include "exprVar.hpp"
     16#include "CouenneExprSum.hpp"
     17#include "CouenneExprVar.hpp"
    1818
    1919class Domain;
  • trunk/Couenne/src/expression/operators/CouenneExprIf.hpp

    r306 r312  
    1212#define EXPRIF_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515
    1616class exprIf: public exprOp {
  • trunk/Couenne/src/expression/operators/CouenneExprInv.hpp

    r307 r312  
    1212#define COUENNE_EXPRINV_H
    1313
    14 #include "exprUnary.hpp"
     14#include "CouenneExprUnary.hpp"
    1515
    1616
  • trunk/Couenne/src/expression/operators/CouenneExprLog.hpp

    r307 r312  
    1212#define COUENNE_EXPRLOG_HPP
    1313
    14 #include "exprInv.hpp"
    15 #include "expression.hpp"
     14#include "CouenneExprInv.hpp"
     15#include "CouenneExpression.hpp"
    1616
    1717
  • trunk/Couenne/src/expression/operators/CouenneExprMax.hpp

    r306 r312  
    1212#define COUENNE_EXPRMAX_H
    1313
    14 #include "exprOp.hpp"
    15 #include "exprCopy.hpp"
    16 #include "exprStore.hpp"
     14#include "CouenneExprOp.hpp"
     15#include "CouenneExprCopy.hpp"
     16#include "CouenneExprStore.hpp"
    1717
    1818
  • trunk/Couenne/src/expression/operators/CouenneExprMin.hpp

    r306 r312  
    1212#define COUENNE_EXPRMIN_H
    1313
    14 #include "exprOp.hpp"
    15 #include "exprCopy.hpp"
    16 #include "exprStore.hpp"
     14#include "CouenneExprOp.hpp"
     15#include "CouenneExprCopy.hpp"
     16#include "CouenneExprStore.hpp"
    1717
    1818
  • trunk/Couenne/src/expression/operators/CouenneExprMul.hpp

    r307 r312  
    1414#include <vector>
    1515
    16 #include "exprOp.hpp"
     16#include "CouenneExprOp.hpp"
    1717
    1818
  • trunk/Couenne/src/expression/operators/CouenneExprNorm.hpp

    r306 r312  
    1212#define EXPRNORM_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515
    1616class exprNorm: public exprOp {
  • trunk/Couenne/src/expression/operators/CouenneExprOpp.hpp

    r307 r312  
    1313
    1414#include "CouennePrecisions.hpp"
    15 #include "exprUnary.hpp"
     15#include "CouenneExprUnary.hpp"
    1616
    1717
  • trunk/Couenne/src/expression/operators/CouenneExprPWLinear.hpp

    r306 r312  
    1212#define EXPRPWLINEAR_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515
    1616class exprPWLinear: public exprOp {
  • trunk/Couenne/src/expression/operators/CouenneExprPow.hpp

    r307 r312  
    1414#include <math.h>
    1515
    16 #include "exprOp.hpp"
    17 #include "exprMul.hpp"
    18 #include "exprClone.hpp"
    19 #include "exprConst.hpp"
     16#include "CouenneExprOp.hpp"
     17#include "CouenneExprMul.hpp"
     18#include "CouenneExprClone.hpp"
     19#include "CouenneExprConst.hpp"
    2020
    2121class funtriplet;
  • trunk/Couenne/src/expression/operators/CouenneExprQuad.hpp

    r307 r312  
    1717
    1818#include "CoinPackedVector.hpp"
    19 #include "exprGroup.hpp"
     19#include "CouenneExprGroup.hpp"
    2020
    2121class quadElem;
  • trunk/Couenne/src/expression/operators/CouenneExprSin.hpp

    r307 r312  
    1515#include <assert.h>
    1616
    17 #include "exprUnary.hpp"
    18 #include "exprConst.hpp"
     17#include "CouenneExprUnary.hpp"
     18#include "CouenneExprConst.hpp"
    1919
    2020
  • trunk/Couenne/src/expression/operators/CouenneExprSub.hpp

    r307 r312  
    1212#define COUENNE_EXPRSUB_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515#include "CouennePrecisions.hpp"
    1616#include "CouenneProblem.hpp"
  • trunk/Couenne/src/expression/operators/CouenneExprSum.hpp

    r307 r312  
    1414#include <vector>
    1515
    16 #include "exprOp.hpp"
     16#include "CouenneExprOp.hpp"
    1717
    1818
  • trunk/Couenne/src/expression/operators/bounds/CouenneExprBCos.hpp

    r306 r312  
    1212#define COUENNE_EXPRBCOS_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515#include "CoinHelperFunctions.hpp"
    1616
  • trunk/Couenne/src/expression/operators/bounds/CouenneExprBDiv.hpp

    r306 r312  
    1212#define COUENNE_EXPRBDIV_H
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515
    1616
  • trunk/Couenne/src/expression/operators/bounds/CouenneExprBMul.hpp

    r306 r312  
    1212#define COUENNE_EXPRBMUL_H
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515#include "CoinHelperFunctions.hpp"
    1616
  • trunk/Couenne/src/expression/operators/bounds/CouenneExprBQuad.hpp

    r306 r312  
    1212#define COUENNE_EXPRBQUAD_H
    1313
    14 #include "exprOp.hpp"
    15 #include "exprQuad.hpp"
     14#include "CouenneExprOp.hpp"
     15#include "CouenneExprQuad.hpp"
    1616
    1717
  • trunk/Couenne/src/expression/operators/bounds/CouenneExprBSin.hpp

    r306 r312  
    1212#define COUENNE_EXPRBSIN_HPP
    1313
    14 #include "exprOp.hpp"
     14#include "CouenneExprOp.hpp"
    1515#include "CoinHelperFunctions.hpp"
    1616
  • trunk/Couenne/src/expression/operators/bounds/exprBQuad.cpp

    r141 r312  
    1010
    1111#include "CoinHelperFunctions.hpp"
    12 #include "exprBQuad.hpp"
     12#include "CouenneExprBQuad.hpp"
    1313
    1414//#define DEBUG
  • trunk/Couenne/src/expression/operators/compQuadFinBounds.cpp

    r141 r312  
    99 */
    1010
    11 #include "exprQuad.hpp"
     11#include "CouenneExprQuad.hpp"
    1212#include "CoinHelperFunctions.hpp"
    1313
  • trunk/Couenne/src/expression/operators/exprAbs.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprAbs.hpp"
    12 #include "exprClone.hpp"
    13 #include "exprMin.hpp"
    14 #include "exprMax.hpp"
    15 #include "exprOpp.hpp"
     11#include "CouenneExprAbs.hpp"
     12#include "CouenneExprClone.hpp"
     13#include "CouenneExprMin.hpp"
     14#include "CouenneExprMax.hpp"
     15#include "CouenneExprOpp.hpp"
    1616
    1717#include "CouenneProblem.hpp"
  • trunk/Couenne/src/expression/operators/exprCos.cpp

    r182 r312  
    1111#include <math.h>
    1212
    13 #include "exprCos.hpp"
    14 #include "exprSin.hpp"
    15 #include "exprBCos.hpp"
    16 #include "exprOpp.hpp"
    17 #include "exprMul.hpp"
    18 #include "exprClone.hpp"
     13#include "CouenneExprCos.hpp"
     14#include "CouenneExprSin.hpp"
     15#include "CouenneExprBCos.hpp"
     16#include "CouenneExprOpp.hpp"
     17#include "CouenneExprMul.hpp"
     18#include "CouenneExprClone.hpp"
    1919
    2020
  • trunk/Couenne/src/expression/operators/exprDiv.cpp

    r154 r312  
    99 */
    1010
    11 #include "exprDiv.hpp"
    12 #include "exprConst.hpp"
    13 #include "exprClone.hpp"
    14 #include "exprMul.hpp"
    15 #include "exprInv.hpp"
    16 #include "exprSub.hpp"
    17 #include "exprBDiv.hpp"
     11#include "CouenneExprDiv.hpp"
     12#include "CouenneExprConst.hpp"
     13#include "CouenneExprClone.hpp"
     14#include "CouenneExprMul.hpp"
     15#include "CouenneExprInv.hpp"
     16#include "CouenneExprSub.hpp"
     17#include "CouenneExprBDiv.hpp"
    1818
    1919#include "CouennePrecisions.hpp"
  • trunk/Couenne/src/expression/operators/exprExp.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprExp.hpp"
    12 #include "exprClone.hpp"
    13 #include "exprMul.hpp"
     11#include "CouenneExprExp.hpp"
     12#include "CouenneExprClone.hpp"
     13#include "CouenneExprMul.hpp"
    1414#include "CouenneProblem.hpp"
    1515
  • trunk/Couenne/src/expression/operators/exprGroup.cpp

    r223 r312  
    99 */
    1010
    11 #include "exprConst.hpp"
    12 #include "exprVar.hpp"
    13 #include "exprGroup.hpp"
    14 #include "exprClone.hpp"
    15 #include "exprMul.hpp"
    16 #include "depGraph.hpp"
     11#include "CouenneExprConst.hpp"
     12#include "CouenneExprVar.hpp"
     13#include "CouenneExprGroup.hpp"
     14#include "CouenneExprClone.hpp"
     15#include "CouenneExprMul.hpp"
     16#include "CouenneDepGraph.hpp"
    1717#include "CouenneProblem.hpp"
    1818
  • trunk/Couenne/src/expression/operators/exprInv.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprInv.hpp"
    12 #include "exprClone.hpp"
    13 #include "exprMul.hpp"
     11#include "CouenneExprInv.hpp"
     12#include "CouenneExprClone.hpp"
     13#include "CouenneExprMul.hpp"
    1414#include "CouenneProblem.hpp"
    15 #include "expression.hpp"
     15#include "CouenneExpression.hpp"
    1616
    1717// differentiation
  • trunk/Couenne/src/expression/operators/exprLog.cpp

    r307 r312  
    1313#include "CoinHelperFunctions.hpp"
    1414
    15 #include "exprLog.hpp"
    16 #include "exprConst.hpp"
    17 #include "exprClone.hpp"
    18 #include "exprMax.hpp"
    19 #include "exprMin.hpp"
    20 #include "exprDiv.hpp"
     15#include "CouenneExprLog.hpp"
     16#include "CouenneExprConst.hpp"
     17#include "CouenneExprClone.hpp"
     18#include "CouenneExprMax.hpp"
     19#include "CouenneExprMin.hpp"
     20#include "CouenneExprDiv.hpp"
    2121#include "CouenneProblem.hpp"
    2222
  • trunk/Couenne/src/expression/operators/exprMinMax.cpp

    r217 r312  
    1313#include "CouenneCutGenerator.hpp"
    1414#include "CouenneTypes.hpp"
    15 #include "exprMax.hpp"
    16 #include "exprMin.hpp"
    17 #include "exprConst.hpp"
     15#include "CouenneExprMax.hpp"
     16#include "CouenneExprMin.hpp"
     17#include "CouenneExprConst.hpp"
    1818
    1919
  • trunk/Couenne/src/expression/operators/exprMul.cpp

    r217 r312  
    1313
    1414#include "CoinHelperFunctions.hpp"
    15 #include "exprMul.hpp"
    16 #include "exprSum.hpp"
    17 #include "exprConst.hpp"
    18 #include "exprClone.hpp"
     15#include "CouenneExprMul.hpp"
     16#include "CouenneExprSum.hpp"
     17#include "CouenneExprConst.hpp"
     18#include "CouenneExprClone.hpp"
    1919#include "CouennePrecisions.hpp"
    2020
  • trunk/Couenne/src/expression/operators/exprOpp.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprOpp.hpp"
    12 #include "exprConst.hpp"
     11#include "CouenneExprOpp.hpp"
     12#include "CouenneExprConst.hpp"
    1313#include "CoinHelperFunctions.hpp"
    1414
  • trunk/Couenne/src/expression/operators/exprPow.cpp

    r308 r312  
    1515
    1616#include "CouennePrecisions.hpp"
    17 #include "exprPow.hpp"
    18 #include "exprSum.hpp"
    19 #include "exprMul.hpp"
    20 #include "exprDiv.hpp"
    21 #include "exprLog.hpp"
    22 //#include "exprOpp.hpp"
    23 #include "exprConst.hpp"
     17#include "CouenneExprPow.hpp"
     18#include "CouenneExprSum.hpp"
     19#include "CouenneExprMul.hpp"
     20#include "CouenneExprDiv.hpp"
     21#include "CouenneExprLog.hpp"
     22//#include "CouenneExprOpp.hpp"
     23#include "CouenneExprConst.hpp"
    2424#include "CouenneProblem.hpp"
    2525
  • trunk/Couenne/src/expression/operators/exprQuad.cpp

    r217 r312  
    1111#include "CoinHelperFunctions.hpp"
    1212#include "CouenneProblem.hpp"
    13 #include "exprConst.hpp"
    14 #include "exprQuad.hpp"
    15 #include "exprPow.hpp"
    16 #include "exprMul.hpp"
    17 #include "depGraph.hpp"
    18 #include "lqelems.hpp"
     13#include "CouenneExprConst.hpp"
     14#include "CouenneExprQuad.hpp"
     15#include "CouenneExprPow.hpp"
     16#include "CouenneExprMul.hpp"
     17#include "CouenneDepGraph.hpp"
     18#include "CouenneLQelems.hpp"
    1919
    2020class Domain;
  • trunk/Couenne/src/expression/operators/exprSin.cpp

    r182 r312  
    1111#include <math.h>
    1212
    13 #include "exprSin.hpp"
    14 #include "exprClone.hpp"
    15 #include "exprCos.hpp"
    16 #include "exprBSin.hpp"
    17 #include "exprMul.hpp"
     13#include "CouenneExprSin.hpp"
     14#include "CouenneExprClone.hpp"
     15#include "CouenneExprCos.hpp"
     16#include "CouenneExprBSin.hpp"
     17#include "CouenneExprMul.hpp"
    1818
    1919static const CouNumber
  • trunk/Couenne/src/expression/operators/exprSub.cpp

    r307 r312  
    99 */
    1010
    11 #include "exprSub.hpp"
    12 #include "exprOpp.hpp"
     11#include "CouenneExprSub.hpp"
     12#include "CouenneExprOpp.hpp"
    1313#include "CouennePrecisions.hpp"
    1414
  • trunk/Couenne/src/expression/operators/exprSum.cpp

    r217 r312  
    1111#include <stdlib.h>
    1212
    13 #include "exprSum.hpp"
    14 #include "exprCopy.hpp"
    15 #include "exprConst.hpp"
     13#include "CouenneExprSum.hpp"
     14#include "CouenneExprCopy.hpp"
     15#include "CouenneExprConst.hpp"
    1616
    1717
  • trunk/Couenne/src/expression/simplify/simplifiers.cpp

    r154 r312  
    99 */
    1010
    11 #include "exprOp.hpp"
    12 #include "exprConst.hpp"
     11#include "CouenneExprOp.hpp"
     12#include "CouenneExprConst.hpp"
    1313#include "CouennePrecisions.hpp"
    1414
  • trunk/Couenne/src/expression/simplify/simplify.cpp

    r308 r312  
    99 */
    1010
    11 #include "expression.hpp"
    12 #include "exprOp.hpp"
    13 #include "exprUnary.hpp"
    14 #include "exprConst.hpp"
     11#include "CouenneExpression.hpp"
     12#include "CouenneExprOp.hpp"
     13#include "CouenneExprUnary.hpp"
     14#include "CouenneExprConst.hpp"
    1515
    1616
  • trunk/Couenne/src/main/BonCouenne.cpp

    r311 r312  
    4141#define PRINTED_PRECISION 1e-5
    4242
    43 #include "exprVar.hpp"
    44 #include "exprConst.hpp"
    45 #include "exprSum.hpp"
    46 #include "exprClone.hpp"
     43#include "CouenneExprVar.hpp"
     44#include "CouenneExprConst.hpp"
     45#include "CouenneExprSum.hpp"
     46#include "CouenneExprClone.hpp"
    4747#include "CouenneProblemElem.hpp"
    4848#include "CouenneProblem.hpp"
  • trunk/Couenne/src/main/CouenneOSInterface.cpp

    r311 r312  
    1616#include "CouenneTypes.hpp"
    1717
    18 #include "exprSum.hpp"
    19 #include "exprMul.hpp"
    20 #include "exprClone.hpp"
    21 #include "exprGroup.hpp"
     18#include "CouenneExprSum.hpp"
     19#include "CouenneExprMul.hpp"
     20#include "CouenneExprClone.hpp"
     21#include "CouenneExprGroup.hpp"
    2222
    2323//#include "OSInstance.hpp"
  • trunk/Couenne/src/problem/CouenneLPtightenBoundsCLP-light.cpp

    r215 r312  
    1212#include "CouenneProblem.hpp"
    1313#include "CouenneCutGenerator.hpp"
    14 #include "exprVar.hpp"
     14#include "CouenneExprVar.hpp"
    1515
    1616// Tighten bounds - lightweight. Returns -1 if infeasible, otherwise
  • trunk/Couenne/src/problem/CouenneLPtightenBoundsCLP.cpp

    r215 r312  
    1212#include "CouenneProblem.hpp"
    1313#include "CouenneCutGenerator.hpp"
    14 #include "exprVar.hpp"
     14#include "CouenneExprVar.hpp"
    1515
    1616//#define COIN_DEVELOP 4
  • trunk/Couenne/src/problem/CouenneProblem.cpp

    r236 r312  
    1616#include "CouenneTypes.hpp"
    1717
    18 #include "expression.hpp"
    19 #include "exprConst.hpp"
    20 #include "exprQuad.hpp"
    21 #include "exprClone.hpp"
    22 #include "exprIVar.hpp"
    23 #include "exprAux.hpp"
    24 #include "exprOpp.hpp"
     18#include "CouenneExpression.hpp"
     19#include "CouenneExprConst.hpp"
     20#include "CouenneExprQuad.hpp"
     21#include "CouenneExprClone.hpp"
     22#include "CouenneExprIVar.hpp"
     23#include "CouenneExprAux.hpp"
     24#include "CouenneExprOpp.hpp"
    2525
    2626#include "CouenneProblem.hpp"
    2727#include "CouenneProblemElem.hpp"
    28 #include "depGraph.hpp"
    29 #include "lqelems.hpp"
     28#include "CouenneDepGraph.hpp"
     29#include "CouenneLQelems.hpp"
    3030
    3131
  • trunk/Couenne/src/problem/CouenneProblem.hpp

    r307 r312  
    1818
    1919#include "CouenneTypes.hpp"
    20 #include "expression.hpp"
    21 #include "exprAux.hpp"
     20#include "CouenneExpression.hpp"
     21#include "CouenneExprAux.hpp"
    2222#include "CouenneProblemElem.hpp"
    2323#include "CouenneObject.hpp"
    2424#include "CouenneJournalist.hpp"
    25 #include "domain.hpp"
     25#include "CouenneDomain.hpp"
    2626
    2727struct ASL;
  • trunk/Couenne/src/problem/CouenneProblemConstructors.cpp

    r308 r312  
    1616#include "CouenneTypes.hpp"
    1717
    18 #include "expression.hpp"
    19 #include "exprConst.hpp"
    20 #include "exprQuad.hpp"
    21 #include "exprClone.hpp"
    22 #include "exprIVar.hpp"
    23 #include "exprAux.hpp"
    24 #include "exprOpp.hpp"
     18#include "CouenneExpression.hpp"
     19#include "CouenneExprConst.hpp"
     20#include "CouenneExprQuad.hpp"
     21#include "CouenneExprClone.hpp"
     22#include "CouenneExprIVar.hpp"
     23#include "CouenneExprAux.hpp"
     24#include "CouenneExprOpp.hpp"
    2525
    2626#include "CouenneProblem.hpp"
    2727#include "CouenneProblemElem.hpp"
    28 #include "depGraph.hpp"
    29 #include "lqelems.hpp"
     28#include "CouenneDepGraph.hpp"
     29#include "CouenneLQelems.hpp"
    3030
    3131/// constructor
  • trunk/Couenne/src/problem/CouenneProblemElem.hpp

    r154 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "expression.hpp"
    18 #include "exprConst.hpp"
     17#include "CouenneExpression.hpp"
     18#include "CouenneExprConst.hpp"
    1919
    2020
  • trunk/Couenne/src/problem/CouenneSOS.cpp

    r215 r312  
    1212
    1313#include "CouenneProblem.hpp"
    14 #include "exprGroup.hpp"
     14#include "CouenneExprGroup.hpp"
    1515
    1616#include "CbcModel.hpp"
  • trunk/Couenne/src/problem/depGraph/CouenneDepGraph.hpp

    r306 r312  
    1616
    1717#include "CouenneTypes.hpp"
    18 #include "expression.hpp"
    19 #include "exprAux.hpp"
     18#include "CouenneExpression.hpp"
     19#include "CouenneExprAux.hpp"
    2020#include "CouenneProblemElem.hpp"
    2121
  • trunk/Couenne/src/problem/depGraph/checkCycles.cpp

    r154 r312  
    99 */
    1010
    11 #include "depGraph.hpp"
     11#include "CouenneDepGraph.hpp"
    1212
    1313//#define DEBUG
  • trunk/Couenne/src/problem/depGraph/depGraph.cpp

    r154 r312  
    1111#include <cstdlib>
    1212#include <cstdio>
    13 #include "depGraph.hpp"
     13#include "CouenneDepGraph.hpp"
    1414
    1515//#define DEBUG
  • trunk/Couenne/src/problem/problem.cpp

    r309 r312  
    1616#include "CouenneTypes.hpp"
    1717
    18 #include "expression.hpp"
    19 #include "exprConst.hpp"
    20 #include "exprGroup.hpp"
    21 #include "exprClone.hpp"
    22 #include "exprAux.hpp"
    23 #include "lqelems.hpp"
     18#include "CouenneExpression.hpp"
     19#include "CouenneExprConst.hpp"
     20#include "CouenneExprGroup.hpp"
     21#include "CouenneExprClone.hpp"
     22#include "CouenneExprAux.hpp"
    2423#include "CouenneProblem.hpp"
    2524#include "CouenneProblemElem.hpp"
    26 #include "lqelems.hpp"
     25#include "CouenneLQelems.hpp"
    2726
    2827// tricky... smaller values cut the optimum in OS unitTest
  • trunk/Couenne/src/problem/problemIO.cpp

    r307 r312  
    1414#include "CoinHelperFunctions.hpp"
    1515
    16 #include "expression.hpp"
    17 #include "exprAux.hpp"
     16#include "CouenneExpression.hpp"
     17#include "CouenneExprAux.hpp"
    1818#include "CouenneProblem.hpp"
    1919
  • trunk/Couenne/src/problem/reformulate.cpp

    r230 r312  
    1515#include "CouenneTypes.hpp"
    1616
    17 #include "exprVar.hpp"
     17#include "CouenneExprVar.hpp"
    1818
    1919#include "CouenneProblem.hpp"
    20 #include "depGraph.hpp"
    21 #include "lqelems.hpp"
     20#include "CouenneDepGraph.hpp"
     21#include "CouenneLQelems.hpp"
    2222
    2323
  • trunk/Couenne/src/readnl/CouenneAmplInterface.cpp

    r246 r312  
    3131#include "CouenneTypes.hpp"
    3232
    33 #include "exprClone.hpp"
    34 #include "exprGroup.hpp"
    35 #include "exprAbs.hpp"
    36 #include "exprSum.hpp"
    37 #include "exprSub.hpp"
    38 #include "exprMul.hpp"
    39 #include "exprDiv.hpp"
    40 #include "exprInv.hpp"
    41 #include "exprSin.hpp"
    42 #include "exprPow.hpp"
    43 #include "exprLog.hpp"
    44 #include "exprOpp.hpp"
    45 #include "exprCos.hpp"
    46 #include "exprExp.hpp"
     33#include "CouenneExprClone.hpp"
     34#include "CouenneExprGroup.hpp"
     35#include "CouenneExprAbs.hpp"
     36#include "CouenneExprSum.hpp"
     37#include "CouenneExprSub.hpp"
     38#include "CouenneExprMul.hpp"
     39#include "CouenneExprDiv.hpp"
     40#include "CouenneExprInv.hpp"
     41#include "CouenneExprSin.hpp"
     42#include "CouenneExprPow.hpp"
     43#include "CouenneExprLog.hpp"
     44#include "CouenneExprOpp.hpp"
     45#include "CouenneExprCos.hpp"
     46#include "CouenneExprExp.hpp"
    4747
    4848#include "asl.h"
  • trunk/Couenne/src/readnl/nl2e.cpp

    r308 r312  
    1111#include "CouenneTypes.hpp"
    1212
    13 #include "exprAbs.hpp"
    14 #include "exprSum.hpp"
    15 #include "exprSub.hpp"
    16 #include "exprMul.hpp"
    17 #include "exprDiv.hpp"
    18 #include "exprInv.hpp"
    19 #include "exprSin.hpp"
    20 #include "exprPow.hpp"
    21 #include "exprClone.hpp"
    22 #include "exprLog.hpp"
    23 #include "exprOpp.hpp"
    24 #include "exprCos.hpp"
    25 #include "exprExp.hpp"
     13#include "CouenneExprAbs.hpp"
     14#include "CouenneExprSum.hpp"
     15#include "CouenneExprSub.hpp"
     16#include "CouenneExprMul.hpp"
     17#include "CouenneExprDiv.hpp"
     18#include "CouenneExprInv.hpp"
     19#include "CouenneExprSin.hpp"
     20#include "CouenneExprPow.hpp"
     21#include "CouenneExprClone.hpp"
     22#include "CouenneExprLog.hpp"
     23#include "CouenneExprOpp.hpp"
     24#include "CouenneExprCos.hpp"
     25#include "CouenneExprExp.hpp"
    2626
    2727#include "asl.h"
  • trunk/Couenne/src/readnl/readnl.cpp

    r184 r312  
    1919#include "CouenneTypes.hpp"
    2020
    21 #include "exprSum.hpp"
    22 #include "exprMul.hpp"
    23 #include "exprClone.hpp"
    24 #include "exprGroup.hpp"
     21#include "CouenneExprSum.hpp"
     22#include "CouenneExprMul.hpp"
     23#include "CouenneExprClone.hpp"
     24#include "CouenneExprGroup.hpp"
    2525
    2626#include "asl.h"
  • trunk/Couenne/src/standardize/analyzeSparsity.cpp

    r268 r312  
    1515#include "CouenneTypes.hpp"
    1616#include "CouenneProblem.hpp"
    17 #include "exprQuad.hpp"
    18 #include "exprMul.hpp"
    19 #include "exprPow.hpp"
    20 #include "lqelems.hpp"
     17#include "CouenneExprQuad.hpp"
     18#include "CouenneExprMul.hpp"
     19#include "CouenneExprPow.hpp"
     20#include "CouenneLQelems.hpp"
    2121
    2222#define MIN_DENSITY 0.5
  • trunk/Couenne/src/standardize/auxiliarize.cpp

    r268 r312  
    1111
    1212#include "CouenneProblem.hpp"
    13 #include "exprClone.hpp"
     13#include "CouenneExprClone.hpp"
    1414
    1515//#define DEBUG
  • trunk/Couenne/src/standardize/constrStandardize.cpp

    r307 r312  
    1212#include "CouenneProblem.hpp"
    1313
    14 #include "expression.hpp"
    15 #include "exprAux.hpp"
    16 #include "exprIVar.hpp"
    17 #include "depGraph.hpp"
     14#include "CouenneExpression.hpp"
     15#include "CouenneExprAux.hpp"
     16#include "CouenneExprIVar.hpp"
     17#include "CouenneDepGraph.hpp"
    1818
    1919//#define DEBUG
  • trunk/Couenne/src/standardize/decomposeTerm.cpp

    r230 r312  
    1010
    1111#include "CouenneProblem.hpp"
    12 #include "exprMul.hpp"
    13 #include "exprPow.hpp"
    14 #include "exprQuad.hpp"
    15 #include "lqelems.hpp"
     12#include "CouenneExprMul.hpp"
     13#include "CouenneExprPow.hpp"
     14#include "CouenneExprQuad.hpp"
     15#include "CouenneLQelems.hpp"
    1616
    1717//#define DEBUG
  • trunk/Couenne/src/standardize/elementBreak.cpp

    r154 r312  
    99 */
    1010
    11 #include "expression.hpp"
     11#include "CouenneExpression.hpp"
    1212
    1313/// given an element of a sum, check if it is a variable (possibly
  • trunk/Couenne/src/standardize/linStandardize.cpp

    r307 r312  
    1010
    1111#include "CouenneProblem.hpp"
    12 #include "exprSum.hpp"
    13 #include "exprSub.hpp"
    14 #include "exprOpp.hpp"
    15 #include "exprMul.hpp"
    16 #include "exprPow.hpp"
    17 #include "exprGroup.hpp"
    18 #include "exprQuad.hpp"
    19 #include "lqelems.hpp"
     12#include "CouenneExprSum.hpp"
     13#include "CouenneExprSub.hpp"
     14#include "CouenneExprOpp.hpp"
     15#include "CouenneExprMul.hpp"
     16#include "CouenneExprPow.hpp"
     17#include "CouenneExprGroup.hpp"
     18#include "CouenneExprQuad.hpp"
     19#include "CouenneLQelems.hpp"
    2020
    2121//#define DEBUG
  • trunk/Couenne/src/standardize/splitAux.cpp

    r307 r312  
    1313#include "CoinHelperFunctions.hpp"
    1414
    15 #include "exprClone.hpp"
    16 #include "exprSum.hpp"
    17 #include "exprMul.hpp"
    18 #include "exprGroup.hpp"
    19 #include "exprQuad.hpp"
    20 #include "lqelems.hpp"
     15#include "CouenneExprClone.hpp"
     16#include "CouenneExprSum.hpp"
     17#include "CouenneExprMul.hpp"
     18#include "CouenneExprGroup.hpp"
     19#include "CouenneExprQuad.hpp"
     20#include "CouenneLQelems.hpp"
    2121
    2222//#define DEBUG
  • trunk/Couenne/src/standardize/standardize.cpp

    r307 r312  
    1515
    1616#include "CouenneTypes.hpp"
    17 #include "expression.hpp"
    18 #include "exprIVar.hpp"
    19 #include "exprClone.hpp"
     17#include "CouenneExpression.hpp"
     18#include "CouenneExprIVar.hpp"
     19#include "CouenneExprClone.hpp"
    2020#include "CouenneProblem.hpp"
    2121#include "CouenneProblemElem.hpp"
    22 #include "depGraph.hpp"
     22#include "CouenneDepGraph.hpp"
    2323
    2424//#define DEBUG
  • trunk/Couenne/src/standardize/sumStandardize.cpp

    r268 r312  
    99 */
    1010
    11 #include "exprSum.hpp"
    12 #include "exprSub.hpp"
    13 #include "exprOpp.hpp"
    14 #include "exprGroup.hpp"
    15 #include "exprQuad.hpp"
    16 #include "lqelems.hpp"
     11#include "CouenneExprSum.hpp"
     12#include "CouenneExprSub.hpp"
     13#include "CouenneExprOpp.hpp"
     14#include "CouenneExprGroup.hpp"
     15#include "CouenneExprQuad.hpp"
     16#include "CouenneLQelems.hpp"
    1717
    1818//#define DEBUG
  • trunk/Couenne/src/util/CouenneFunTriplets.hpp

    r306 r312  
    1414#include <math.h>
    1515
    16 #include "exprPow.hpp"
     16#include "CouenneExprPow.hpp"
    1717
    1818
  • trunk/Couenne/src/util/drawCuts.cpp

    r154 r312  
    1212#include "CouenneCutGenerator.hpp"
    1313#include "CouenneProblem.hpp"
    14 #include "exprAux.hpp"
     14#include "CouenneExprAux.hpp"
    1515
    1616
Note: See TracChangeset for help on using the changeset viewer.