Changeset 217


Ignore:
Timestamp:
Jul 8, 2009 1:02:07 PM (12 years ago)
Author:
pbelotti
Message:

eliminated useless OsiSolverInterface? parameter in all expr*::generateCuts

Location:
trunk
Files:
70 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools https://projects.coin-or.org/svn/BuildTools/trunk
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
        4 ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/trunk
        5 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
        6 ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/trunk
        7 CoinUtils https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        8 Cbc https://projects.coin-or.org/svn/Cbc/trunk/Cbc
        9 Cgl https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        10 Clp https://projects.coin-or.org/svn/Clp/trunk/Clp
        11 Ipopt https://projects.coin-or.org/svn/Ipopt/trunk/Ipopt
        12 Osi https://projects.coin-or.org/svn/Osi/trunk/Osi
        13 Bonmin https://projects.coin-or.org/svn/Bonmin/trunk/Bonmin
         1BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
         3ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         4ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         5ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.1
         6ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         7ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.1
         8Cbc https://projects.coin-or.org/svn/Cbc/stable/2.3/Cbc
         9Cgl https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
         10Clp https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
         11Osi https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
         12Ipopt https://projects.coin-or.org/svn/Ipopt/stable/3.6/Ipopt
         13Bonmin https://projects.coin-or.org/svn/Bonmin/stable/1.1/Bonmin
  • trunk/Couenne/src/convex/genRowCuts.cpp

    r215 r217  
    5151          (var -> Type () == AUX)) {
    5252
    53         var -> generateCuts (si, cs, this, chg);
     53        var -> generateCuts (/*si,*/ cs, this, chg);
    5454      }
    5555    }
     
    9999          break;
    100100
    101         var -> generateCuts (si, cs, this, chg);
     101        var -> generateCuts (/*si,*/ cs, this, chg);
    102102      }
    103103    }
  • trunk/Couenne/src/convex/operators/alphaConvexify.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    alphaConvexify.cpp
    44 * Author:  Stefan Vigerske
     
    3939 */
    4040
    41 bool exprQuad::alphaConvexify (const CouenneProblem *p,
    42                                const OsiSolverInterface &si) {
     41bool exprQuad::alphaConvexify (const CouenneProblem *p) {
     42  //const OsiSolverInterface &si) {
    4343
    4444  if (matrix_.size () == 0)
     
    5050  int k=0,
    5151     nDiag    = bounds_.size (),
    52     *indexmap = new int [si.getNumCols ()],
     52    *indexmap = new int [p -> nVars ()],
    5353    *indices  = new int [nDiag];
    5454
    55   CoinFillN (indexmap, si.getNumCols (), -1);
     55  //CoinFillN (indexmap, si.getNumCols (), -1);
     56  CoinFillN (indexmap, p -> nVars (), -1);
    5657
    5758  // box diameter
  • trunk/Couenne/src/convex/operators/conv-exprAbs.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprAbs.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification methods for |f(x)|
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1818// generate convexification cut for constraint w = |x|
    1919
    20 void exprAbs::generateCuts (expression *w, const OsiSolverInterface &si,
     20void exprAbs::generateCuts (expression *w, //const OsiSolverInterface &si,
    2121                            OsiCuts &cs, const CouenneCutGenerator *cg,
    2222                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprDiv.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprDiv.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: standardization and convexification methods for divisions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    2929
    3030// generate convexification cut for constraint w = x/y
    31 void exprDiv::generateCuts (expression *w, const OsiSolverInterface &si,
     31void exprDiv::generateCuts (expression *w, //const OsiSolverInterface &si,
    3232                            OsiCuts &cs, const CouenneCutGenerator *cg,
    3333                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprExp.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprExp.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification and bounding methods for the exponential operator
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    2121// generate convexification cut for constraint w = this
    2222
    23 void exprExp::generateCuts (expression *aux, const OsiSolverInterface &si,
     23void exprExp::generateCuts (expression *aux, //const OsiSolverInterface &si,
    2424                            OsiCuts &cs,  const CouenneCutGenerator *cg,
    2525                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprGroup.cpp

    r191 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprGroup.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: implementation of convexification methods for exprGroup
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    191191
    192192// generate equality between *this and *w
    193 void exprGroup::generateCuts (expression *w, const OsiSolverInterface &si,
     193void exprGroup::generateCuts (expression *w, //const OsiSolverInterface &si,
    194194                              OsiCuts &cs, const CouenneCutGenerator *cg,
    195195                              t_chg_bounds *chg,
  • trunk/Couenne/src/convex/operators/conv-exprInv.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprInv.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification and bounding methods for the inverse operator
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    6969// generate convexification cut for constraint w = 1/x
    7070
    71 void exprInv::generateCuts (expression *aux, const OsiSolverInterface &si,
     71void exprInv::generateCuts (expression *aux, //const OsiSolverInterface &si,
    7272                            OsiCuts &cs, const CouenneCutGenerator *cg,
    7373                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprLog.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprLog.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification and bounding methods for the logarithm operator
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    2323// generate convexification cut for constraint w = this
    2424
    25 void exprLog::generateCuts (expression *aux, const OsiSolverInterface &si,
     25void exprLog::generateCuts (expression *aux, //const OsiSolverInterface &si,
    2626                            OsiCuts &cs, const CouenneCutGenerator *cg,
    2727                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprMul-genCuts.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprMul-genCuts.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: method to convexify multiplications
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1616/// generate convexification cut for constraint w = x*y
    1717
    18 void exprMul::generateCuts (expression *w, const OsiSolverInterface &si,
     18void exprMul::generateCuts (expression *w, //const OsiSolverInterface &si,
    1919                            OsiCuts &cs, const CouenneCutGenerator *cg,
    2020                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprMul.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprMul.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/convex/operators/conv-exprOpp.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprOpp.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: methods to convexify opposite of expressions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1818
    1919// generate equality between *this and *w
    20 void exprOpp::generateCuts (expression *w, const OsiSolverInterface &si,
     20void exprOpp::generateCuts (expression *w, //const OsiSolverInterface &si,
    2121                            OsiCuts &cs, const CouenneCutGenerator *cg,
    2222                            t_chg_bounds *chg,
  • trunk/Couenne/src/convex/operators/conv-exprPow-envelope.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprPow-envelope.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/convex/operators/conv-exprPow.cpp

    r151 r217  
    55 * Purpose: methods to convexify an expression x^k, k constant
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    9999// generate convexification cut for constraint w = x^k
    100100
    101 void exprPow::generateCuts (expression *aux, const OsiSolverInterface &si,
     101void exprPow::generateCuts (expression *aux, //const OsiSolverInterface &si,
    102102                            OsiCuts &cs, const CouenneCutGenerator *cg,
    103103                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprQuad.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprQuad.cpp
    44 * Authors: Pierre Bonami
     
    77 * Purpose: implementation of convexification methods for exprQuad
    88 *
    9  * (C) Carnegie-Mellon University, 2006-08.
     9 * (C) Carnegie-Mellon University, 2006-09.
    1010 * This file is licensed under the Common Public License (CPL)
    1111 */
     
    3939
    4040// generate equality between *this and *w
    41 void exprQuad::generateCuts (expression *w, const OsiSolverInterface &si,
     41void exprQuad::generateCuts (expression *w, //const OsiSolverInterface &si,
    4242                             OsiCuts &cs, const CouenneCutGenerator *cg,
    4343                             t_chg_bounds *chg,
     
    4646  if ((!(cg -> isFirst ())) &&                    // unless a convexification was never created,
    4747      (fabs ((*this) () - (*w) ()) < COUENNE_EPS) // do we really need a convexification cut?
    48       || !alphaConvexify (cg -> Problem (), si))  // ... or a new alpha-convexification?
     48      || !alphaConvexify (cg -> Problem ()))  // ... or a new alpha-convexification?
    4949    return;
    5050
  • trunk/Couenne/src/convex/operators/conv-exprSinCos.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprSinCos.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification methods for sines and cosines
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    4242/// generate convexification cut for constraint w = sin (this)
    4343
    44 void exprSin::generateCuts (expression *w, const OsiSolverInterface &si,
     44void exprSin::generateCuts (expression *w, //const OsiSolverInterface &si,
    4545                            OsiCuts &cs, const CouenneCutGenerator *cg,
    4646                            t_chg_bounds *chg, int wind,
     
    6767/// generate convexification cut for constraint w = cos (this)
    6868
    69 void exprCos::generateCuts (expression *w, const OsiSolverInterface &si,
     69void exprCos::generateCuts (expression *w, //const OsiSolverInterface &si,
    7070                            OsiCuts &cs, const CouenneCutGenerator *cg,
    7171                            t_chg_bounds *chg, int wind,
  • trunk/Couenne/src/convex/operators/conv-exprSub.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSub.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: convexification methods for the Subtraction class
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1515
    1616// generate equality between *this and *w
    17 void exprSub::generateCuts (expression *w, const OsiSolverInterface &si,
     17void exprSub::generateCuts (expression *w, //const OsiSolverInterface &si,
    1818                            OsiCuts &cs, const CouenneCutGenerator *cg,
    1919                            t_chg_bounds *chg,
  • trunk/Couenne/src/convex/operators/conv-exprSum.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    conv-exprSum.cpp
    44 * Author:  Pietro Belotti
    55 * Purpose: methods to standardize/convexify sum expressions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1919
    2020// generate equality between *this and *w
    21 void exprSum::generateCuts (expression *w, const OsiSolverInterface &si,
     21void exprSum::generateCuts (expression *w, //const OsiSolverInterface &si,
    2222                            OsiCuts &cs, const CouenneCutGenerator *cg,
    2323                            t_chg_bounds *chg,
  • trunk/Couenne/src/convex/operators/powNewton.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    powNewton.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/convex/operators/quadCuts.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    quadCuts.cpp
    44 * Author:  Pierre Bonami
  • trunk/Couenne/src/convex/operators/trigNewton.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    trigNewton.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/convex/operators/unifiedProdCuts.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    unifiedProdCuts.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/CouExpr.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    CouExpr.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/CouExpr.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    CouExpr.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/CouennePrecisions.hpp

    r158 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    CouennePrecisions.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/CouenneTypes.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    CouenneTypes.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/domain.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    domain.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/domain.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    domain.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprAux.cpp

    r215 r217  
    177177// generate cuts for expression associated with this auxiliary
    178178
    179 void exprAux::generateCuts (const OsiSolverInterface &si,
     179void exprAux::generateCuts (//const OsiSolverInterface &si,
    180180                            OsiCuts &cs, const CouenneCutGenerator *cg,
    181181                            t_chg_bounds *chg, int,
     
    194194  else
    195195  */
    196   image_ -> generateCuts (this, si, cs, cg, chg);
     196  image_ -> generateCuts (this, /*si,*/ cs, cg, chg);
    197197
    198198  // check if cuts have coefficients, rhs too large or too small
  • trunk/Couenne/src/expression/exprAux.hpp

    r215 r217  
    126126
    127127  /// generate cuts for expression associated with this auxiliary
    128   void generateCuts (const OsiSolverInterface &,
     128  void generateCuts (//const OsiSolverInterface &,
    129129                     OsiCuts &, const CouenneCutGenerator *,
    130130                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/exprBound.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprBound.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprClone.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprClone.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprConst.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprConst.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of the class exprConst
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    8181
    8282  /// generate convexification cut for constraint w = this
    83   void generateCuts (expression *, const OsiSolverInterface &,
     83  void generateCuts (expression *, //const OsiSolverInterface &,
    8484                     OsiCuts &, const CouenneCutGenerator *,
    8585                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/exprCopy.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprCopy.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of the class exprCopy
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    158158
    159159  /// generate convexification cut for constraint w = this
    160   inline void generateCuts (expression *w, const OsiSolverInterface &si,
     160  inline void generateCuts (expression *w, //const OsiSolverInterface &si,
    161161                            OsiCuts &cs, const CouenneCutGenerator *cg,
    162162                            t_chg_bounds *chg = NULL, int wind= -1,
     
    164164                            CouNumber ub =  COUENNE_INFINITY)
    165165
    166   {copy_ -> generateCuts (w, si, cs, cg, chg, wind, lb, ub);}
     166  {copy_ -> generateCuts (w, /*si,*/ cs, cg, chg, wind, lb, ub);}
    167167
    168168  /// code for comparisons
  • trunk/Couenne/src/expression/exprIVar.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprIVar.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprOp.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprOp.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprOp.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprOp.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprStore.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprStore.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprUnary.cpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprUnary.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprUnary.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprUnary.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/exprVar.cpp

    r215 r217  
    1 /* $Id$ 
     1/* $Id$
    22 *
    33 * Name:    exprVar.cpp
     
    55 * Purpose: methods of the class for defining variables
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    3434
    3535// generate convexification cut for constraint w = this
    36 void exprVar::generateCuts (expression *w, const OsiSolverInterface &si,
     36void exprVar::generateCuts (expression *w, //const OsiSolverInterface &si,
    3737                            OsiCuts &cs, const CouenneCutGenerator *cg,
    3838                            t_chg_bounds *chg, int,
  • trunk/Couenne/src/expression/exprVar.hpp

    r215 r217  
    55 * Purpose: definition of the class exprVar for variables
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    139139
    140140  /// generate cuts for expression associated with this auxiliary
    141   virtual void generateCuts (const OsiSolverInterface &,
     141  virtual void generateCuts (//const OsiSolverInterface &,
    142142                             OsiCuts &, const CouenneCutGenerator *,
    143143                             t_chg_bounds * = NULL, int = -1,
     
    147147  /// generate convexification cut for constraint w = this
    148148  virtual void generateCuts (expression *w,
    149                              const OsiSolverInterface &si,
     149                             //const OsiSolverInterface &si,
    150150                             OsiCuts &cs, const CouenneCutGenerator *cg,
    151151                             t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/expression.cpp

    r155 r217  
    55 * Purpose: methods of the expression class
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    4949
    5050// generate one cut for a constant
    51 void exprConst::generateCuts (expression *w, const OsiSolverInterface &si,
     51void exprConst::generateCuts (expression *w, //const OsiSolverInterface &si,
    5252                              OsiCuts &cs, const CouenneCutGenerator *cg,
    5353                              t_chg_bounds *chg, int,
  • trunk/Couenne/src/expression/expression.hpp

    r154 r217  
    55 * Purpose: definition of the class expression
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-08-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    176176
    177177  /// generate convexification cut for constraint w = this
    178   virtual void generateCuts (expression *w, const OsiSolverInterface &si,
     178  virtual void generateCuts (expression *w, //const OsiSolverInterface &si,
    179179                             OsiCuts &cs, const CouenneCutGenerator *cg,
    180180                             t_chg_bounds *chg = NULL, int wind = -1,
  • trunk/Couenne/src/expression/operators/exprAbs.hpp

    r141 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprAbs.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of the absolute value of a function
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    5353
    5454  /// generate equality between *this and *w
    55   void generateCuts (expression *w, const OsiSolverInterface &si,
     55  void generateCuts (expression *w, //const OsiSolverInterface &si,
    5656                     OsiCuts &cs, const CouenneCutGenerator *cg,
    5757                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprCos.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprCos.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of cosine
    66 *
    7  * (C) Carnegie-Mellon University, 2006-07.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    5252
    5353  /// generate equality between *this and *w
    54   void generateCuts (expression *w, const OsiSolverInterface &si,
     54  void generateCuts (expression *w, //const OsiSolverInterface &si,
    5555                     OsiCuts &cs, const CouenneCutGenerator *cg,
    5656                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprDiv.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprDiv.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of divisions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    7272
    7373  /// Generate equality between *this and *w
    74   void generateCuts (expression *w, const OsiSolverInterface &si,
     74  void generateCuts (expression *w, //const OsiSolverInterface &si,
    7575                     OsiCuts &cs, const CouenneCutGenerator *cg,
    7676                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprExp.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprExp.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of the exponential of a function
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    5151
    5252  /// Generate convexification cuts for this expression
    53   void generateCuts (expression *w, const OsiSolverInterface &si,
     53  void generateCuts (expression *w, //const OsiSolverInterface &si,
    5454                     OsiCuts &cs, const CouenneCutGenerator *cg,
    5555                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprGroup.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprGroup.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of mixed sum expressions (constant+linear+nonlinear)
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    9292
    9393  /// special version for linear constraints
    94   virtual void generateCuts (expression *, const OsiSolverInterface &,
     94  virtual void generateCuts (expression *, //const OsiSolverInterface &,
    9595                             OsiCuts &, const CouenneCutGenerator *,
    9696                             t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprIf.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprIf.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprInv.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprInv.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of inverse of a function (1/f(x))
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    6969
    7070  /// generate equality between *this and *w
    71   void generateCuts (expression *w, const OsiSolverInterface &si,
     71  void generateCuts (expression *w, //const OsiSolverInterface &si,
    7272                     OsiCuts &cs, const CouenneCutGenerator *cg,
    7373                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprLog.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprLog.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of logarithm
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    5050
    5151  /// generate equality between *this and *w
    52   void generateCuts (expression *w, const OsiSolverInterface &si,
     52  void generateCuts (expression *w, //const OsiSolverInterface &si,
    5353                     OsiCuts &cs, const CouenneCutGenerator *cg,
    5454                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprMax.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprMax.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of $\f(x_{\argmax_{i\in I} y_i})$
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    7070
    7171  /// generate equality between *this and *w
    72   void generateCuts (expression *w, const OsiSolverInterface &si,
     72  void generateCuts (expression *w, //const OsiSolverInterface &si,
    7373                     OsiCuts &cs, const CouenneCutGenerator *cg,
    7474                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprMin.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprMin.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of $\f(x_{\argmin_{i\in I} y_i})$
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    7070
    7171  /// Generate equality between *this and *w
    72   void generateCuts (expression *w, const OsiSolverInterface &si,
     72  void generateCuts (expression *w, //const OsiSolverInterface &si,
    7373                     OsiCuts &cs, const CouenneCutGenerator *cg,
    7474                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprMinMax.cpp

    r154 r217  
    3232
    3333
    34 void exprMin::generateCuts (expression *w, const OsiSolverInterface &si,
     34void exprMin::generateCuts (expression *w, //const OsiSolverInterface &si,
    3535                            OsiCuts &cs, const CouenneCutGenerator *cg,
    3636                            t_chg_bounds *chg, int,
     
    3939
    4040
    41 void exprMax::generateCuts (expression *w, const OsiSolverInterface &si,
     41void exprMax::generateCuts (expression *w, //const OsiSolverInterface &si,
    4242                            OsiCuts &cs, const CouenneCutGenerator *cg,
    4343                            t_chg_bounds *chg, int,
  • trunk/Couenne/src/expression/operators/exprMul.cpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprMul.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprMul.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprMul.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of multiplications
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    6363
    6464  /// generate equality between *this and *w
    65   void generateCuts (expression *w, const OsiSolverInterface &si,
     65  void generateCuts (expression *w, //const OsiSolverInterface &si,
    6666                     OsiCuts &cs, const CouenneCutGenerator *cg,
    6767                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprNorm.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprNorm.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprOpp.cpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprOpp.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprOpp.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprOpp.hpp
    44 * Author:  Pietro Belotti
     
    6565
    6666  /// special version for linear constraints
    67   virtual void generateCuts (expression *, const OsiSolverInterface &,
     67  virtual void generateCuts (expression *, //const OsiSolverInterface &,
    6868                             OsiCuts &, const CouenneCutGenerator *,
    6969                             t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprPWLinear.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprPWLinear.hpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprPow.cpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprPow.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprPow.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprPow.hpp
    44 * Author:  Pietro Belotti
     
    7373
    7474  /// generate equality between *this and *w
    75   void generateCuts (expression *w, const OsiSolverInterface &si,
     75  void generateCuts (expression *w, //const OsiSolverInterface &si,
    7676                     OsiCuts &cs, const CouenneCutGenerator *cg,
    7777                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprQuad.cpp

    r158 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprQuad.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprQuad.hpp

    r158 r217  
    1 /* $Id$ */
    2 /**
     1/* $Id$
     2 *
    33 * Name:    exprQuad.hpp
    44 * Author:  Pietro Belotti
     
    66 *          quadratic = constant + linear + [nonlinear] + quadratic)
    77 *
    8  * (C) Carnegie-Mellon University, 2006.
     8 * (C) Carnegie-Mellon University, 2006-09.
    99 * This file is licensed under the Common Public License (CPL)
    1010 */
     
    136136  /// hyperplanes of the concave upper envelope and the convex lower
    137137  /// envelope.
    138   virtual void generateCuts (expression *w, const OsiSolverInterface &si,
     138  virtual void generateCuts (expression *w, //const OsiSolverInterface &si,
    139139                             OsiCuts &cs, const CouenneCutGenerator *cg,
    140140                             t_chg_bounds * = NULL, int = -1,
     
    144144  /// Compute data for \f$\alpha\f$-convexification of a quadratic form
    145145  /// (fills in dCoeff_ and dIndex_ for the convex underestimator)
    146   virtual bool alphaConvexify (const CouenneProblem *, const OsiSolverInterface &);
     146  virtual bool alphaConvexify (const CouenneProblem *);
    147147
    148148  /** method exprQuad::quadCuts
  • trunk/Couenne/src/expression/operators/exprSin.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSin.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of the sine of a function
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    8080
    8181  /// generate equality between *this and *w
    82   void generateCuts (expression *w, const OsiSolverInterface &si,
     82  void generateCuts (expression *w, //const OsiSolverInterface &si,
    8383                     OsiCuts &cs, const CouenneCutGenerator *cg,
    8484                     t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprSub.cpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSub.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprSub.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSub.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of subtractions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    6868
    6969  /// Special version for linear constraints
    70   virtual void generateCuts (expression *, const OsiSolverInterface &,
     70  virtual void generateCuts (expression *, //const OsiSolverInterface &,
    7171                             OsiCuts &, const CouenneCutGenerator *,
    7272                             t_chg_bounds * = NULL, int = -1,
  • trunk/Couenne/src/expression/operators/exprSum.cpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSum.cpp
    44 * Author:  Pietro Belotti
  • trunk/Couenne/src/expression/operators/exprSum.hpp

    r154 r217  
    1 /* $Id$ */
    2 /*
     1/* $Id$
     2 *
    33 * Name:    exprSum.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: definition of sum expressions
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    6363
    6464  /// Special version for linear constraints
    65   virtual void generateCuts (expression *, const OsiSolverInterface &,
     65  virtual void generateCuts (expression *, //const OsiSolverInterface &,
    6666                             OsiCuts &, const CouenneCutGenerator *,
    6767                             t_chg_bounds * = NULL, int = -1,
Note: See TracChangeset for help on using the changeset viewer.