Changeset 1333


Ignore:
Timestamp:
Mar 24, 2020 1:20:08 PM (8 days ago)
Author:
stefan
Message:

rename defines to be project specific; rerun autotools

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r1332 r1333  
    32463246#define COUENNE_VERSION_RELEASE 9999
    32473247_ACEOF
    3248 
    3249 
    32503248
    32513249
     
    1720517203  if test $coin_has_bonmin = yes ; then
    1720617204
    17207 $as_echo "#define COIN_HAS_BONMIN 1" >>confdefs.h
     17205$as_echo "#define COUENNE_HAS_BONMIN 1" >>confdefs.h
    1720817206
    1720917207    if test -n "$bonmin_pcfiles" ; then COUENNELIB_PCFILES="$bonmin_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1746317461  if test $coin_has_asl = yes ; then
    1746417462
    17465 $as_echo "#define COIN_HAS_ASL 1" >>confdefs.h
     17463$as_echo "#define COUENNE_HAS_ASL 1" >>confdefs.h
    1746617464
    1746717465    if test -n "$asl_pcfiles" ; then COUENNELIB_PCFILES="$asl_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1772617724  if test $coin_has_osicpx = yes ; then
    1772717725
    17728 $as_echo "#define COIN_HAS_OSICPX 1" >>confdefs.h
     17726$as_echo "#define COUENNE_HAS_OSICPX 1" >>confdefs.h
    1772917727
    1773017728    if test -n "$osicpx_pcfiles" ; then COUENNELIB_PCFILES="$osicpx_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1798017978  if test $coin_has_osigrb = yes ; then
    1798117979
    17982 $as_echo "#define COIN_HAS_OSIGRB 1" >>confdefs.h
     17980$as_echo "#define COUENNE_HAS_OSIGRB 1" >>confdefs.h
    1798317981
    1798417982    if test -n "$osigrb_pcfiles" ; then COUENNELIB_PCFILES="$osigrb_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1823418232  if test $coin_has_osimsk = yes ; then
    1823518233
    18236 $as_echo "#define COIN_HAS_OSIMSK 1" >>confdefs.h
     18234$as_echo "#define COUENNE_HAS_OSIMSK 1" >>confdefs.h
    1823718235
    1823818236    if test -n "$osimsk_pcfiles" ; then COUENNELIB_PCFILES="$osimsk_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1848818486  if test $coin_has_osispx = yes ; then
    1848918487
    18490 $as_echo "#define COIN_HAS_OSISPX 1" >>confdefs.h
     18488$as_echo "#define COUENNE_HAS_OSISPX 1" >>confdefs.h
    1849118489
    1849218490    if test -n "$osispx_pcfiles" ; then COUENNELIB_PCFILES="$osispx_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1874218740  if test $coin_has_osixpr = yes ; then
    1874318741
    18744 $as_echo "#define COIN_HAS_OSIXPR 1" >>confdefs.h
     18742$as_echo "#define COUENNE_HAS_OSIXPR 1" >>confdefs.h
    1874518743
    1874618744    if test -n "$osixpr_pcfiles" ; then COUENNELIB_PCFILES="$osixpr_pcfiles $COUENNELIB_PCFILES" ; fi
     
    1901519013  if test $coin_has_nauty = yes ; then
    1901619014
    19017 $as_echo "#define COIN_HAS_NAUTY 1" >>confdefs.h
     19015$as_echo "#define COUENNE_HAS_NAUTY 1" >>confdefs.h
    1901819016
    1901919017    COUENNELIB_LFLAGS="$nauty_lflags $COUENNELIB_LFLAGS"
     
    1927719275  if test $coin_has_scip = yes ; then
    1927819276
    19279 $as_echo "#define COIN_HAS_SCIP 1" >>confdefs.h
     19277$as_echo "#define COUENNE_HAS_SCIP 1" >>confdefs.h
    1928019278
    1928119279    COUENNELIB_LFLAGS="$scip_lflags $COUENNELIB_LFLAGS"
     
    1953919537  if test $coin_has_cplex = yes ; then
    1954019538
    19541 $as_echo "#define COIN_HAS_CPLEX 1" >>confdefs.h
     19539$as_echo "#define COUENNE_HAS_CPLEX 1" >>confdefs.h
    1954219540
    1954319541    COUENNELIB_LFLAGS="$cplex_lflags $COUENNELIB_LFLAGS"
     
    2035120349    coin_has_lapack=yes
    2035220350         lapack_pcfiles="lapack blas"
    20353     else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
     20351    else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: lapack.pc and blas.pc present, but could not find dsyev when trying to link with it." >&5
     20352$as_echo "$as_me: WARNING: lapack.pc and blas.pc present, but could not find dsyev when trying to link with it." >&2;}
    2035420353  fi
    2035520354
     
    2045520454  if test $coin_has_lapack = yes ; then
    2045620455
    20457 $as_echo "#define COIN_HAS_LAPACK 1" >>confdefs.h
     20456$as_echo "#define COUENNE_HAS_LAPACK 1" >>confdefs.h
    2045820457
    2045920458
     
    2046220461  case "${dsyev_namemangling}" in
    2046320462   "lower case, no underscore, no extra underscore")
    20464       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    20465 
    20466       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
     20463      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     20464
     20465      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
    2046720466 ;;
    2046820467   "lower case, no underscore, extra underscore")
    20469       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    20470 
    20471       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     20468      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     20469
     20470      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    2047220471 ;;
    2047320472   "lower case, underscore, no extra underscore")
    20474       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    20475 
    20476       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     20473      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     20474
     20475      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    2047720476 ;;
    2047820477   "lower case, underscore, extra underscore")
    20479       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    20480 
    20481       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
     20478      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     20479
     20480      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
    2048220481 ;;
    2048320482   "upper case, no underscore, no extra underscore")
    20484       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    20485 
    20486       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
     20483      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     20484
     20485      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
    2048720486 ;;
    2048820487   "upper case, no underscore, extra underscore")
    20489       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    20490 
    20491       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     20488      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     20489
     20490      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    2049220491 ;;
    2049320492   "upper case, underscore, no extra underscore")
    20494       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    20495 
    20496       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     20493      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     20494
     20495      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    2049720496 ;;
    2049820497   "upper case, underscore, extra underscore")
    20499       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    20500 
    20501       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
     20498      $as_echo "#define COUENNE_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     20499
     20500      $as_echo "#define COUENNE_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
    2050220501 ;;
    2050320502   *)
  • trunk/configure.ac

    r1326 r1333  
    3131
    3232# Do some initialization work (version numbers, change prefix default, ...)
    33 AC_COIN_INITIALIZE(Couenne)
     33AC_COIN_INITIALIZE
    3434
    3535# Get the name of the C++ compiler and appropriate compiler options
  • trunk/src/bound_tightening/twoImpliedBT/Makefile.in

    r1332 r1333  
    1515@SET_MAKE@
    1616
    17 # $Id: Makefile.am 1331 2020-03-19 19:25:05Z stefan $
     17# $Id: Makefile.am 1332 2020-03-21 10:41:28Z stefan $
    1818#
    1919# Copyright (C) 2006 International Business Machines and others.
  • trunk/src/branch/BranchCore.cpp

    r1313 r1333  
    3939    chg_bds = new t_chg_bounds [problem_ -> nVars ()];
    4040
    41 #ifdef COIN_HAS_NAUTY
     41#ifdef COUENNE_HAS_NAUTY
    4242
    4343  if (problem_ -> orbitalBranching ()) {
  • trunk/src/branch/CouenneChooseStrong.cpp

    r1313 r1333  
    3636const CouNumber estProdEps = 1e-6;
    3737
    38 #ifdef COIN_HAS_NAUTY
     38#ifdef COUENNE_HAS_NAUTY
    3939#include "CouenneNauty.hpp"
    4040#endif
  • trunk/src/branch/CouenneChooseVariable.cpp

    r1313 r1333  
    2121#include "CouenneObject.hpp"
    2222
    23 #ifdef COIN_HAS_NAUTY
     23#ifdef COUENNE_HAS_NAUTY
    2424#include "CouenneNauty.hpp"
    2525#endif
  • trunk/src/branch/StrongBranchingSetupList.cpp

    r1313 r1333  
    3131const CouNumber estProdEps = 1e-6;
    3232
    33 #ifdef COIN_HAS_NAUTY
     33#ifdef COUENNE_HAS_NAUTY
    3434#include "CouenneNauty.hpp"
    3535#endif
     
    221221    // branching rules on these two variables are equivalent.
    222222
    223 #ifdef COIN_HAS_NAUTY
     223#ifdef COUENNE_HAS_NAUTY
    224224
    225225    bool useOrbitalBranching = problem_ -> orbitalBranching ();
     
    889889    }
    890890
    891 #ifdef COIN_HAS_NAUTY
     891#ifdef COUENNE_HAS_NAUTY
    892892    // if (useOrbitalBranching &&
    893893    //  (objectOrig != object))
  • trunk/src/branch/doStrongBranching.cpp

    r1313 r1333  
    351351      } else if (status0==1 || status1==1) {
    352352
    353 #ifdef COIN_HAS_NAUTY
     353#ifdef COUENNE_HAS_NAUTY
    354354        if (problem_ -> orbitalBranching () &&
    355355            (Object -> columnNumber () >= 0) &&
  • trunk/src/config.h.in

    r1313 r1333  
    11/* src/config.h.in.  Generated from configure.ac by autoheader.  */
    2 
    3 /* Define to 1 if ASL is available. */
    4 #undef COIN_HAS_ASL
    5 
    6 /* Define to 1 if Bonmin is available. */
    7 #undef COIN_HAS_BONMIN
    8 
    9 /* Define to 1 if the Cplex package is available */
    10 #undef COIN_HAS_CPLEX
    11 
    12 /* Define to 1 if the LAPACK package is available */
    13 #undef COIN_HAS_LAPACK
    14 
    15 /* Define to 1 if the Nauty package is available */
    16 #undef COIN_HAS_NAUTY
    17 
    18 /* Define to 1 if OsiCpx is available. */
    19 #undef COIN_HAS_OSICPX
    20 
    21 /* Define to 1 if OsiGrb is available. */
    22 #undef COIN_HAS_OSIGRB
    23 
    24 /* Define to 1 if OsiMsk is available. */
    25 #undef COIN_HAS_OSIMSK
    26 
    27 /* Define to 1 if OsiSpx is available. */
    28 #undef COIN_HAS_OSISPX
    29 
    30 /* Define to 1 if OsiXpr is available. */
    31 #undef COIN_HAS_OSIXPR
    32 
    33 /* Define to 1 if the SCIP package is available */
    34 #undef COIN_HAS_SCIP
    35 
    36 /* Define to a macro mangling the given C identifier (in lower and upper
    37    case). */
    38 #undef COIN_LAPACK_FUNC
    39 
    40 /* As COIN_LAPACK_FUNC, but for C identifiers containing underscores. */
    41 #undef COIN_LAPACK_FUNC_
    422
    433/* whether CouenneInterface is derived from Bonmins AmplInterface */
     
    466/* Library Visibility Attribute */
    477#undef COUENNELIB_EXPORT
     8
     9/* Define to 1 if ASL is available. */
     10#undef COUENNE_HAS_ASL
     11
     12/* Define to 1 if Bonmin is available. */
     13#undef COUENNE_HAS_BONMIN
     14
     15/* Define to 1 if the Cplex package is available */
     16#undef COUENNE_HAS_CPLEX
     17
     18/* Define to 1 if the LAPACK package is available */
     19#undef COUENNE_HAS_LAPACK
     20
     21/* Define to 1 if the Nauty package is available */
     22#undef COUENNE_HAS_NAUTY
     23
     24/* Define to 1 if OsiCpx is available. */
     25#undef COUENNE_HAS_OSICPX
     26
     27/* Define to 1 if OsiGrb is available. */
     28#undef COUENNE_HAS_OSIGRB
     29
     30/* Define to 1 if OsiMsk is available. */
     31#undef COUENNE_HAS_OSIMSK
     32
     33/* Define to 1 if OsiSpx is available. */
     34#undef COUENNE_HAS_OSISPX
     35
     36/* Define to 1 if OsiXpr is available. */
     37#undef COUENNE_HAS_OSIXPR
     38
     39/* Define to 1 if the SCIP package is available */
     40#undef COUENNE_HAS_SCIP
     41
     42/* Define to a macro mangling the given C identifier (in lower and upper
     43   case). */
     44#undef COUENNE_LAPACK_FUNC
     45
     46/* As COUENNE_LAPACK_FUNC, but for C identifiers containing underscores. */
     47#undef COUENNE_LAPACK_FUNC_
    4848
    4949/* Version number of project */
  • trunk/src/convex/generateCuts.cpp

    r1313 r1333  
    2323//#define FM_PRINT_INFO
    2424
    25 #ifdef COIN_HAS_NAUTY
     25#ifdef COUENNE_HAS_NAUTY
    2626#include "CouenneNauty.hpp"
    2727#endif
     
    398398    // information.
    399399
    400 // #ifdef COIN_HAS_NAUTY
     400// #ifdef COUENNE_HAS_NAUTY
    401401//     //    ChangeBounds (psi -> getColLower (), 
    402402//     //                 psi -> getColUpper (),
     
    452452    // Use orbit info to tighten bounds
    453453
    454 #ifdef COIN_HAS_NAUTY
     454#ifdef COUENNE_HAS_NAUTY
    455455
    456456    // TODO: when independent bound tightener, can get original bounds
  • trunk/src/cut/sdpcuts/dsyevx_wrapper.cpp

    r1313 r1333  
    2020extern "C" {
    2121  /* Lapack routine to compute orthonormal eigenvalues/eigenvectors (in Fortran) */
    22   void COIN_LAPACK_FUNC(dsyevx,DSYEVX) (
     22  void COUENNE_LAPACK_FUNC(dsyevx,DSYEVX) (
    2323                                  char   *,
    2424                                  char   *,
     
    5252                      int lastidx) {
    5353
    54 #ifdef COIN_HAS_LAPACK
     54#ifdef COUENNE_HAS_LAPACK
    5555#ifdef DEBUG
    5656
     
    9494  // Ipopt::IpLapackDsyev (true, n, A, lda, w, info);
    9595
    96   COIN_LAPACK_FUNC
     96  COUENNE_LAPACK_FUNC
    9797    (dsyevx,DSYEVX)
    9898    (&jobz, &range, &uplo, &n,
  • trunk/src/heuristics/CouenneFPFindSolution.cpp

    r1071 r1333  
    1818#include "cons_rowcuts.h"
    1919
    20 #ifdef COIN_HAS_SCIP
     20#ifdef COUENNE_HAS_SCIP
    2121#include "scip/scip.h"
    2222#endif
     
    6666  }
    6767
    68 #ifdef COIN_HAS_SCIP
     68#ifdef COUENNE_HAS_SCIP
    6969
    7070  if (useSCIP_ && problem_ -> nIntVars () > 0) { // if LP, use Clp below
  • trunk/src/heuristics/CouenneFPSolveMILP.cpp

    r1071 r1333  
    2020#include "CouenneFPpool.hpp"
    2121
    22 #ifdef COIN_HAS_SCIP
     22#ifdef COUENNE_HAS_SCIP
    2323/* general SCIP includes */
    2424#include "scip/scip.h"
     
    3131#define NUMERICS_THRES 1e19
    3232
    33 #ifdef COIN_HAS_SCIP
     33#ifdef COUENNE_HAS_SCIP
    3434void CouenneFeasPump::checkInfinity(SCIP *scip, SCIP_Real val, double infinity){
    3535  if( SCIPisInfinity(scip, val) && val < infinity)
  • trunk/src/heuristics/CouenneFPphaseMILP.cpp

    r1058 r1333  
    2222#include "CouenneRecordBestSol.hpp"
    2323
    24 #ifdef COIN_HAS_SCIP
     24#ifdef COUENNE_HAS_SCIP
    2525/* general SCIP includes */
    2626#include "scip/scip.h"
  • trunk/src/heuristics/CouenneFPphaseNLP.cpp

    r1058 r1333  
    2222#include "CouenneRecordBestSol.hpp"
    2323
    24 #ifdef COIN_HAS_SCIP
     24#ifdef COUENNE_HAS_SCIP
    2525/* general SCIP includes */
    2626#include "scip/scip.h"
  • trunk/src/heuristics/CouenneFPscipSolve.cpp

    r1075 r1333  
    1616using namespace Couenne;
    1717
    18 #ifdef COIN_HAS_SCIP
     18#ifdef COUENNE_HAS_SCIP
    1919
    2020/* general SCIP includes */
  • trunk/src/heuristics/CouenneFeasPump.cpp

    r1073 r1333  
    2323#include "CouenneRecordBestSol.hpp"
    2424
    25 #ifdef COIN_HAS_SCIP
     25#ifdef COUENNE_HAS_SCIP
    2626/* general SCIP includes */
    2727#include "scip/scip.h"
  • trunk/src/heuristics/CouenneFeasPump.hpp

    r1313 r1333  
    2121#include "IpOptionsList.hpp"
    2222
    23 #ifdef COIN_HAS_SCIP
     23#ifdef COUENNE_HAS_SCIP
    2424#include "scip/scip.h"
    2525#endif
     
    9797    {numberSolvePerLevel_ = value;}
    9898
    99 #ifdef COIN_HAS_SCIP
     99#ifdef COUENNE_HAS_SCIP
    100100    /// checks if val is above a threshold for finiteness
    101101    void checkInfinity (struct Scip *scip, double val, double infinity);
     
    166166    int nlpPhase (double *iSol, double *nSol);
    167167
    168 #ifdef COIN_HAS_SCIP
     168#ifdef COUENNE_HAS_SCIP
    169169    SCIP_RETCODE ScipSolve (const double *nSol, double* &sol, int niter, int* nsuciter, CouNumber &obj);
    170170#endif
  • trunk/src/heuristics/CouenneFeasPumpConstructors.cpp

    r1094 r1333  
    136136    options -> GetStringValue  ("feas_pump_usescip", s, "couenne.");
    137137
    138 #ifdef COIN_HAS_SCIP
     138#ifdef COUENNE_HAS_SCIP
    139139    useSCIP_ = (s == "yes");
    140140    if (milpMethod_ < 0)
     
    564564    ("feas_pump_usescip",
    565565     "Should SCIP be used to solve the MILPs?",
    566 #ifdef COIN_HAS_SCIP
     566#ifdef COUENNE_HAS_SCIP
    567567     "yes", // we want it by default if SCIP is available
    568568#else
  • trunk/src/heuristics/CouenneIterativeRounding.cpp

    r1313 r1333  
    1515
    1616// if we use OsiCpx, then we need to have cplex.h, too
    17 #if defined(COIN_HAS_OSICPX) && !defined(COIN_HAS_CPLEX)
    18 #undef COIN_HAS_OSICPX
     17#if defined(COUENNE_HAS_OSICPX) && !defined(COUENNE_HAS_CPLEX)
     18#undef COUENNE_HAS_OSICPX
    1919#endif
    2020
    21 #ifdef COIN_HAS_OSICPX
     21#ifdef COUENNE_HAS_OSICPX
    2222#include "OsiCpxSolverInterface.hpp"
    2323#include "cplex.h"
     
    101101    }
    102102    if(milp_ != NULL)
    103 #ifdef COIN_HAS_OSICPX
     103#ifdef COUENNE_HAS_OSICPX
    104104      milp_ =  dynamic_cast<OsiCpxSolverInterface*>(other.milp_->clone());
    105105#else
     
    231231    int n = milp->getNumCols();
    232232
    233 #ifdef COIN_HAS_OSICPX
     233#ifdef COUENNE_HAS_OSICPX
    234234    milp_ = new OsiCpxSolverInterface();
    235235    milp_->loadProblem(*(milp->getMatrixByRow()), milp->getColLower(),
     
    296296    milp_->setDblParam(OsiDualTolerance, COUENNE_EPS_INT);
    297297
    298 #ifdef COIN_HAS_OSICPX
     298#ifdef COUENNE_HAS_OSICPX
    299299    // Set options if we have Cplex
    300300    CPXsetintparam(milp_->getEnvironmentPtr(), CPX_PARAM_MIPEMPHASIS, CPX_MIPEMPHASIS_HIDDENFEAS);
     
    10831083                                      double maxTime){
    10841084    double start = CoinCpuTime();
    1085 #ifdef COIN_HAS_OSICPX
     1085#ifdef COUENNE_HAS_OSICPX
    10861086    OsiCpxSolverInterface * solver = dynamic_cast<OsiCpxSolverInterface*>(milp);
    10871087    CPXENVptr env = solver->getEnvironmentPtr();
  • trunk/src/heuristics/CouenneIterativeRounding.hpp

    r1313 r1333  
    1515#include "BonOsiTMINLPInterface.hpp"
    1616
    17 #if defined(COIN_HAS_OSICPX) && defined(COIN_HAS_CPLEX)
     17#if defined(COUENNE_HAS_OSICPX) && defined(COUENNE_HAS_CPLEX)
    1818#include "OsiCpxSolverInterface.hpp"
    1919#else
     
    133133    OsiSolverInterface * cinlp_;
    134134    /** Pointer to a milp solver interface.*/
    135 #if defined(COIN_HAS_OSICPX) && defined(COIN_HAS_CPLEX)
     135#if defined(COUENNE_HAS_OSICPX) && defined(COUENNE_HAS_CPLEX)
    136136    OsiCpxSolverInterface * milp_;
    137137#else
     
    160160    double* colLowerNlp_;
    161161    double* colUpperNlp_;
    162 #if !defined(COIN_HAS_OSICPX) || !defined(COIN_HAS_CPLEX)
     162#if !defined(COUENNE_HAS_OSICPX) || !defined(COUENNE_HAS_CPLEX)
    163163    /** Heuristics for the MILP */
    164164    CbcHeuristic** heuristics_;
  • trunk/src/heuristics/cons_rowcuts.cpp

    r1222 r1333  
    1717
    1818#include "CouenneConfig.h"
    19 #ifdef COIN_HAS_SCIP
     19#ifdef COUENNE_HAS_SCIP
    2020
    2121#include "cons_rowcuts.h"
  • trunk/src/heuristics/cons_rowcuts.h

    r688 r1333  
    1717#include "OsiSolverInterface.hpp"
    1818
    19 #ifdef COIN_HAS_SCIP
     19#ifdef COUENNE_HAS_SCIP
    2020
    2121#include "scip/scip.h"
  • trunk/src/interfaces/CouenneMINLPInterface.cpp

    r530 r1333  
    4040#include "Ipopt/BonIpoptWarmStart.hpp"
    4141
    42 #ifdef COIN_HAS_FILTERSQP
     42#ifdef COUENNE_HAS_FILTERSQP
    4343#include "Filter/BonFilterSolver.hpp"
    4444#include "Filter/BonFilterWarmStart.hpp"
     
    235235    register_general_options(roptions);
    236236    register_OA_options(roptions);
    237 #ifdef COIN_HAS_FILTERSQP
     237#ifdef COUENNE_HAS_FILTERSQP
    238238    FilterSolver::RegisterOptions(roptions);
    239239#endif
    240 #ifdef COIN_HAS_IPOPT
     240#ifdef COUENNE_HAS_IPOPT
    241241    IpoptSolver::RegisterOptions(roptions);
    242242#endif
     
    408408  if(s == EFilterSQP){
    409409    testOthers_ = false;;
    410 #ifdef COIN_HAS_FILTERSQP
     410#ifdef COUENNE_HAS_FILTERSQP
    411411    app_ = new Bonmin::FilterSolver(roptions, options, journalist);
    412412#else
     
    417417  else if(s == EIpopt){
    418418    testOthers_ = false;
    419 #ifdef COIN_HAS_IPOPT
     419#ifdef COUENNE_HAS_IPOPT
    420420    app_ = new IpoptSolver(roptions, options, journalist);
    421421#else
     
    425425  }
    426426  else if(s == EAll){
    427 #ifdef COIN_HAS_FILTERSQP
     427#ifdef COUENNE_HAS_FILTERSQP
    428428    app_ = new Bonmin::FilterSolver(roptions, options, journalist);
    429429#else
     
    431431                      "Bonmin not configured to run with Ipopt.");
    432432#endif
    433 #ifdef COIN_HAS_IPOPT
     433#ifdef COUENNE_HAS_IPOPT
    434434    debug_apps_.push_back(new IpoptSolver(roptions, options, journalist));
    435435#endif
     
    27462746    messageHandler()->setLogLevel(logLevel);
    27472747
    2748 #ifdef COIN_HAS_FILTERSQP
     2748#ifdef COUENNE_HAS_FILTERSQP
    27492749    FilterSolver * filter = dynamic_cast<FilterSolver *>(GetRawPtr(app_));
    27502750
     
    27532753      app_->options()->GetNumericValue("max_random_point_radius",maxRandomRadius_,"bonmin.");
    27542754
    2755 #ifdef COIN_HAS_FILTERSQP
     2755#ifdef COUENNE_HAS_FILTERSQP
    27562756    if(filter && !is_given){
    27572757      // overwriting default for filter
  • trunk/src/main/BonCouenne.cpp

    r1313 r1333  
    4646#include "CouenneJournalist.hpp"
    4747
    48 #ifdef COIN_HAS_NAUTY
     48#ifdef COUENNE_HAS_NAUTY
    4949#include "CouenneNauty.hpp"
    5050#include "CouenneBranchingObject.hpp"
     
    5252
    5353// this is only for SCIP build via ThirdParty/SCIP, which we no longer expect to be used
    54 //#ifdef COIN_HAS_SCIP
     54//#ifdef COUENNE_HAS_SCIP
    5555//#include "lpiswitch.h"
    5656//#endif
     
    9898  using namespace Ipopt;
    9999
    100 //#ifdef COIN_HAS_SCIP
     100//#ifdef COUENNE_HAS_SCIP
    101101//  //SCIPlpiSwitchSetDefaultSolver();
    102102//  SCIPlpiSwitchSetSolver(SCIP_LPISW_CLP);
     
    206206    //////////////////////////////////
    207207
    208 #ifdef COIN_HAS_NAUTY
     208#ifdef COUENNE_HAS_NAUTY
    209209    double symmGroupSize = prob -> orbitalBranching () ? prob -> getNtyInfo () -> getGroupSize () : -1;
    210210#endif
     
    275275    }
    276276
    277 #ifdef COIN_HAS_NAUTY
     277#ifdef COUENNE_HAS_NAUTY
    278278    if (CouenneBranchingObject::nOrbBr)
    279279      printf ("%d orbital nontrivial branchings\n", CouenneBranchingObject::nOrbBr);
     
    578578        printf ("Stats: %-15s %4d [var] %4d [int] %4d [con] %4d [aux] "
    579579                "%6d [root] %8d [tot] %6g [sep] %8g [time] %8g [bb] "
    580 #ifdef COIN_HAS_NAUTY
     580#ifdef COUENNE_HAS_NAUTY
    581581                "%20e [lower] %20e [upper] %7d [nodes] %.0g [sg] %d [sgc]\n",
    582582#else
     
    597597                //bb.bestObj (),
    598598                infeasible ? 0 : bb.numNodes ()
    599 #ifdef COIN_HAS_NAUTY
     599#ifdef COUENNE_HAS_NAUTY
    600600                ,symmGroupSize
    601601                ,CouenneBranchingObject::nSGcomputations
  • trunk/src/main/BonCouenneSetup.cpp

    r1313 r1333  
    1717#include "OsiClpSolverInterface.hpp"
    1818
    19 #ifdef COIN_HAS_OSICPX
     19#ifdef COUENNE_HAS_OSICPX
    2020#include "OsiCpxSolverInterface.hpp"
    2121#endif
    22 #ifdef COIN_HAS_OSIGRB
     22#ifdef COUENNE_HAS_OSIGRB
    2323#include "OsiGrbSolverInterface.hpp"
    2424#endif
    25 #ifdef COIN_HAS_OSISPX
     25#ifdef COUENNE_HAS_OSISPX
    2626#include "OsiSpxSolverInterface.hpp"
    2727#endif
    28 #ifdef COIN_HAS_OSIXPR
     28#ifdef COUENNE_HAS_OSIXPR
    2929#include "OsiXprSolverInterface.hpp"
    3030#endif
     
    8686// which is used as variablename in Clp
    8787// (similar bad as windows.h, which defines "small")
    88 #ifdef COIN_HAS_ASL
     88#ifdef COUENNE_HAS_ASL
    8989#include "asl.h"
    9090#include "getstub.h"
     
    9898    delete couenneProb_;
    9999
    100 #ifdef COIN_HAS_ASL
     100#ifdef COUENNE_HAS_ASL
    101101  // free (aslfg_ -> asl); // triggers segfault -- apparently freed in ancestor class
    102102#endif
     
    143143
    144144    if (!couenneProb_ && argv) {
    145 #ifdef COIN_HAS_ASL
     145#ifdef COUENNE_HAS_ASL
    146146      /* Read the model in various places. */
    147147      ci -> readAmplNlFile (argv, roptions (), options (), journalist ());
     
    209209  } else if (s == "cplex") {
    210210
    211 #ifdef COIN_HAS_OSICPX
     211#ifdef COUENNE_HAS_OSICPX
    212212    CouenneSolverInterface <OsiCpxSolverInterface> *CSI = new CouenneSolverInterface <OsiCpxSolverInterface>;
    213213    continuousSolver_ = CSI;
     
    219219  } else if (s == "xpress-mp") {
    220220
    221 #ifdef COIN_HAS_OSIXPR
     221#ifdef COUENNE_HAS_OSIXPR
    222222    CouenneSolverInterface <OsiXprSolverInterface> *CSI = new CouenneSolverInterface <OsiXprSolverInterface>;
    223223    continuousSolver_ = CSI;
     
    229229  } else if (s == "gurobi") {
    230230
    231 #ifdef COIN_HAS_OSIGRB
     231#ifdef COUENNE_HAS_OSIGRB
    232232    CouenneSolverInterface <OsiGrbSolverInterface> *CSI = new CouenneSolverInterface <OsiGrbSolverInterface>;
    233233    continuousSolver_ = CSI;
     
    239239  } else if (s == "soplex") {
    240240
    241 #ifdef COIN_HAS_OSISPX
     241#ifdef COUENNE_HAS_OSISPX
    242242    CouenneSolverInterface <OsiSpxSolverInterface> *CSI = new CouenneSolverInterface <OsiSpxSolverInterface>;
    243243    continuousSolver_ = CSI;
     
    441441  // }
    442442
    443 #ifdef COIN_HAS_NAUTY
     443#ifdef COUENNE_HAS_NAUTY
    444444  if (couenneProb_ -> orbitalBranching ()) {
    445445
  • trunk/src/main/Couenne.cpp

    r959 r1333  
    2020
    2121#include "CouenneUserInterface.hpp"
    22 #ifdef COIN_HAS_ASL
     22#ifdef COUENNE_HAS_ASL
    2323#include "CouenneAmplInterface.hpp"
    2424#endif
    25 #ifdef COIN_HAS_OS
     25#ifdef COUENNE_HAS_OS
    2626#include "CouenneOSInterface.hpp"
    2727#endif
     
    3838#include "CouenneProblem.hpp"
    3939
    40 #ifdef COIN_HAS_SCIP
     40#ifdef COUENNE_HAS_SCIP
    4141#include "lpiswitch.h"
    4242#endif
     
    8383  WindowsErrorPopupBlocker();
    8484
    85 #ifdef COIN_HAS_SCIP
     85#ifdef COUENNE_HAS_SCIP
    8686  SCIPlpiSwitchSetDefaultSolver();
    8787#endif
     
    9292  SmartPtr<Bonmin::RegisteredOptions> roptions = new Bonmin::RegisteredOptions();
    9393  Couenne::CouenneSetup::registerAllOptions(roptions);
    94 #ifdef COIN_HAS_ASL
     94#ifdef COUENNE_HAS_ASL
    9595  CouenneAmplInterface::registerOptions(roptions);
    9696#endif
    97 #ifdef COIN_HAS_OS
     97#ifdef COUENNE_HAS_OS
    9898  CouenneOSInterface::registerOptions(roptions);
    9999#endif
     
    111111       
    112112  std::string dummy;
    113 #ifdef COIN_HAS_ASL
     113#ifdef COUENNE_HAS_ASL
    114114  if (!userinterface && options->GetStringValue("nlfile", dummy, "")) {
    115115    userinterface = new CouenneAmplInterface(options, jnlst);
     
    117117  }
    118118#endif
    119 #ifdef COIN_HAS_OS
     119#ifdef COUENNE_HAS_OS
    120120  if (!userinterface && options->GetStringValue("osilfile", dummy, "")) {
    121121    userinterface = new CouenneOSInterface();
  • trunk/src/main/CouenneSolver.cpp

    r530 r1333  
    2020
    2121#include "CouenneUserInterface.hpp"
    22 #ifdef COIN_HAS_ASL
     22#ifdef COUENNE_HAS_ASL
    2323#include "CouenneAmplInterface.hpp"
    2424#endif
    25 #ifdef COIN_HAS_OS
     25#ifdef COUENNE_HAS_OS
    2626#include "CouenneOSInterface.hpp"
    2727#endif
     
    6767        SmartPtr<Bonmin::RegisteredOptions> roptions = new Bonmin::RegisteredOptions();
    6868        Bonmin::CouenneSetup::registerAllOptions(roptions);
    69 #ifdef COIN_HAS_ASL
     69#ifdef COUENNE_HAS_ASL
    7070        CouenneAmplInterface::registerOptions(roptions);
    7171#endif
    72 #ifdef COIN_HAS_OS
     72#ifdef COUENNE_HAS_OS
    7373        CouenneOSInterface::registerOptions(roptions);
    7474#endif
     
    8686       
    8787        std::string dummy;
    88 #ifdef COIN_HAS_ASL
     88#ifdef COUENNE_HAS_ASL
    8989        if (!userinterface && options->GetStringValue("nlfile", dummy, "")) {
    9090                userinterface = new CouenneAmplInterface(options, jnlst);
     
    9292        }
    9393#endif
    94 #ifdef COIN_HAS_OS
     94#ifdef COUENNE_HAS_OS
    9595        if (!userinterface && options->GetStringValue("osilfile", dummy, "")) {
    9696                userinterface = new CouenneOSInterface();
  • trunk/src/main/SmartAslDestr.cpp

    r488 r1333  
    1515#include "BonCouenneSetup.hpp"
    1616
    17 #ifdef COIN_HAS_ASL
     17#ifdef COUENNE_HAS_ASL
    1818#include "asl.h"
    1919#include "getstub.h"
     
    2323 
    2424SmartAsl::~SmartAsl(){
    25 #ifdef COIN_HAS_ASL
     25#ifdef COUENNE_HAS_ASL
    2626  //Code from Ipopt::AmplTNLP to free asl
    2727  if(asl != NULL){
  • trunk/src/problem/CouenneProblem.hpp

    r1313 r1333  
    491491  void print (std::ostream & = std::cout);
    492492
    493 #ifdef COIN_HAS_ASL
     493#ifdef COUENNE_HAS_ASL
    494494  /// Read problem from .nl file using the Ampl Solver Library (ASL)
    495495  int readnl (const struct ASL *);
  • trunk/src/problem/CouenneProblemConstructors.cpp

    r1313 r1333  
    3838#include "CouenneSdpCuts.hpp"
    3939
    40 #ifdef COIN_HAS_NAUTY
     40#ifdef COUENNE_HAS_NAUTY
    4141#include "CouenneNauty.hpp"
    4242#endif
     
    7777  maxCpuTime_  (COIN_DBL_MAX),
    7878  bonBase_     (base),
    79 #ifdef COIN_HAS_ASL
     79#ifdef COUENNE_HAS_ASL
    8080  asl_         (asl),
    8181#endif
     
    9595
    9696  if (asl) {
    97 #ifdef COIN_HAS_ASL
     97#ifdef COUENNE_HAS_ASL
    9898    // read problem from AMPL structure
    9999    readnl (asl);
     
    157157  maxCpuTime_   (p.maxCpuTime_),
    158158  bonBase_      (p.bonBase_),
    159 #ifdef COIN_HAS_ASL
     159#ifdef COUENNE_HAS_ASL
    160160  asl_          (p.asl_),
    161161#endif
     
    270270    delete (*i);
    271271
    272 #ifdef COIN_HAS_NAUTY
     272#ifdef COUENNE_HAS_NAUTY
    273273  if (nauty_info)
    274274    delete nauty_info;
  • trunk/src/problem/CouenneSymmetry.cpp

    r1313 r1333  
    1616using namespace Couenne;
    1717
    18 #ifdef COIN_HAS_NAUTY
     18#ifdef COUENNE_HAS_NAUTY
    1919
    2020#include <cassert>
     
    452452void CouenneProblem::setupSymmetry () {
    453453
    454 #ifdef COIN_HAS_NAUTY
     454#ifdef COUENNE_HAS_NAUTY
    455455  sym_setup ();
    456456  Compute_Symmetry ();
Note: See TracChangeset for help on using the changeset viewer.