Ignore:
Timestamp:
Jan 26, 2013 9:00:13 PM (8 years ago)
Author:
stefan
Message:
  • add configure option --enable-aboca={1,2,3,4,yes,no}
  • compile Aboca source only if --enable-aboca set (instead of compiling empty source files)
  • fix svn properties
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:externals

      •  

        old new  
        77Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        88Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        9 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         9CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi

  • trunk/Clp/src/ClpSimplex.hpp

    r1879 r1910  
    2828class ClpDisasterHandler;
    2929class ClpConstraint;
    30 #if CLP_HAS_ABC
    3130#include "AbcCommon.hpp"
     31#ifdef CLP_HAS_ABC
    3232class AbcTolerancesEtc;
    3333class AbcSimplex;
    … …  
    16451645#define CLP_ABC_WANTED_PARALLEL 2
    16461646#define CLP_ABC_FULL_DONE 8
    1647 #define CLP_ABC_BEEN_FEASIBLE 65536
    16481647  // bits 256,512,1024 for crash
    16491648#endif
     1649#define CLP_ABC_BEEN_FEASIBLE 65536
    16501650  int abcState_;
    16511651public:
Note: See TracChangeset for help on using the changeset viewer.