diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 678752ff7..ea5935c8f 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -54,6 +54,7 @@ jobs: ADD_BUILD_ARGS=() ADD_BUILD_ARGS+=( --tests main --enable-relocatable ) ADD_BUILD_ARGS+=( --verbosity 2 ) + [[ ${{ matrix.os }} == ubuntu* ]] && ADD_ARGS+=( --with-nauty-incdir=/usr/include/x86_64-linux-gnu/nauty --with-nauty-lib="-L/usr/lib/ -lnauty" ) [[ ${{ matrix.build_static }} == "true" ]] && \ ADD_BUILD_ARGS+=( --static --with-lapack='-llapack -lblas -lgfortran -lquadmath -lm' ) bash coinbrew/coinbrew fetch ${{ github.event.repository.name }} --skip-update \ diff --git a/Cbc/src/CbcModel.cpp b/Cbc/src/CbcModel.cpp index 1a181e700..e49c8699a 100644 --- a/Cbc/src/CbcModel.cpp +++ b/Cbc/src/CbcModel.cpp @@ -5870,10 +5870,8 @@ CbcModel::CbcModel() , lastHeuristic_(NULL) , fastNodeDepth_(-1) , eventHandler_(NULL) -#ifdef COIN_HAS_NTY , symmetryInfo_(NULL) , rootSymmetryInfo_(NULL) -#endif , numberObjects_(0) , object_(NULL) , ownObjects_(true) @@ -6043,10 +6041,8 @@ CbcModel::CbcModel(const OsiSolverInterface &rhs) , lastHeuristic_(NULL) , fastNodeDepth_(-1) , eventHandler_(NULL) -#ifdef COIN_HAS_NTY , symmetryInfo_(NULL) , rootSymmetryInfo_(NULL) -#endif , numberObjects_(0) , object_(NULL) , ownObjects_(true) diff --git a/Cbc/src/CbcModel.hpp b/Cbc/src/CbcModel.hpp index ed811bc98..96e6ead6d 100644 --- a/Cbc/src/CbcModel.hpp +++ b/Cbc/src/CbcModel.hpp @@ -2609,7 +2609,7 @@ class CbcModel { { maximumNumberIterations_ = value; } -#ifdef COIN_HAS_NTY + /// Symmetry information inline CbcSymmetry *symmetryInfo() const { @@ -2627,9 +2627,6 @@ class CbcModel { { return rootSymmetryInfo_; } - /// get rid of all - void zapRootSymmetry(); -#endif /// Set depth for fast nodes inline void setFastNodeDepth(int value) { @@ -3115,12 +3112,10 @@ class CbcModel { #else CbcEventHandler *eventHandler_; #endif -#ifdef COIN_HAS_NTY /// Symmetry information CbcSymmetry *symmetryInfo_; /// Root symmetry information CbcSymmetry *rootSymmetryInfo_; -#endif /// Total number of objects int numberObjects_;