Changeset 2204 for trunk/Cbc/src


Ignore:
Timestamp:
Jul 4, 2015 9:30:54 AM (5 years ago)
Author:
stefan
Message:

have configure flags to enable nauty use (CbcSymmetry?); disable NAUTY_MAX_LEVEL for now: neither Cbc nor nauty seem to define the nauty_maxalllevel symbol

Location:
trunk/Cbc/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcSymmetry.cpp

    r2092 r2204  
    1010 */
    1111//#define PRINT_MORE 1
     12
     13#include "CbcConfig.h"
     14
     15#ifdef COIN_HAS_NTY
     16
     17extern "C" {
     18#include "nauty.h"
     19#include "nausparse.h"
     20#ifdef NTY_TRACES
     21#include "traces.h"
     22#endif
     23}
     24
    1225#include <stdio.h>
    13 
    14 #ifdef COIN_HAS_NTY
    15 
    1626#include <cassert>
    1727#include <vector>
     
    2333#include "CbcBranchingObject.hpp"
    2434#include "CoinTime.hpp"
    25 #define NAUTY_MAX_LEVEL 2000
     35#define NAUTY_MAX_LEVEL 0
    2636#if NAUTY_MAX_LEVEL
    2737extern int nauty_maxalllevel;
  • trunk/Cbc/src/Makefile.am

    r2148 r2204  
    119119bin_PROGRAMS =
    120120AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) $(ASL_CFLAGS)
     121
     122if COIN_HAS_NTY
     123AM_CPPFLAGS += -I$(NTYINCDIR)
     124endif
    121125
    122126########################################################################
  • trunk/Cbc/src/Makefile.in

    r2167 r2204  
    4646host_triplet = @host@
    4747bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
     48@COIN_HAS_NTY_TRUE@am__append_1 = -I$(NTYINCDIR)
    4849
    4950########################################################################
     
    5354# Name of the executable compiled in this directory.  We want it to be
    5455# installed in the 'bin' directory
    55 @COIN_HAS_CLP_TRUE@am__append_1 = cbc
     56@COIN_HAS_CLP_TRUE@am__append_2 = cbc
    5657
    5758########################################################################
     
    6162# Name of the executable compiled in this directory.  We want it to be
    6263# installed in the 'bin' directory
    63 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_2 = cbc-generic
     64@CBC_BUILD_CBC_GENERIC_TRUE@am__append_3 = cbc-generic
    6465
    6566# List all additionally required solver and Osi libraries
    6667# the linker flags for all available LP solvers should already be included in $CBCGENERIC_LIBS,
    6768# so just add compiler flags here (all we can think of)
    68 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_3 = $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
     69@CBC_BUILD_CBC_GENERIC_TRUE@am__append_4 = $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    6970subdir = src
    7071DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    265266COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    266267COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     268COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     269COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    267270COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    268271COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     
    371374NETLIB_LIBS = @NETLIB_LIBS@
    372375NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     376NTYINCDIR = @NTYINCDIR@
     377NTYLIB = @NTYLIB@
    373378OBJEXT = @OBJEXT@
    374379OPT_CFLAGS = @OPT_CFLAGS@
     
    618623# List additional defines
    619624AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) \
    620         $(ASL_CFLAGS) $(am__append_3) -DCOIN_NO_CLP_MESSAGE \
    621         -DUSE_CBCCONFIG
     625        $(ASL_CFLAGS) $(am__append_1) $(am__append_4) \
     626        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    622627
    623628# List all source files for this executable, including headers
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r2167 r2204  
    191191COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    192192COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     193COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     194COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    193195COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    194196COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     
    297299NETLIB_LIBS = @NETLIB_LIBS@
    298300NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     301NTYINCDIR = @NTYINCDIR@
     302NTYLIB = @NTYLIB@
    299303OBJEXT = @OBJEXT@
    300304OPT_CFLAGS = @OPT_CFLAGS@
  • trunk/Cbc/src/config.h.in

    r1899 r2204  
    5858/* Define to 1 if the Netlib package is available */
    5959#undef COIN_HAS_NETLIB
     60
     61/* Define to 1 if the Nauty package is available */
     62#undef COIN_HAS_NTY
    6063
    6164/* Define to 1 if the OsiTests package is available */
Note: See TracChangeset for help on using the changeset viewer.