Changeset 1889 for trunk/Cbc


Ignore:
Timestamp:
Apr 7, 2013 9:46:46 AM (6 years ago)
Author:
stefan
Message:

for users that have a Cbc with Clp, but do not have COIN_HAS_CLP defined; i doubt that Cbc could be compiled without Clp anyway

Location:
trunk/Cbc/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcFathom.hpp

    r1573 r1889  
    7676
    7777};
    78 #ifdef COIN_HAS_CLP
     78
    7979#include "OsiClpSolverInterface.hpp"
    8080
     
    136136};
    137137#endif
    138 #endif
    139 
  • trunk/Cbc/src/CbcModel.cpp

    r1886 r1889  
    1631116311    }
    1631216312}
     16313#else
     16314CbcModel::goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod)
     16315{
     16316   printf("Need Clp to go to Dantzig\n");
     16317   abort();
     16318}
    1631316319#endif
    1631416320// Below this is deprecated or at least fairly deprecated
  • trunk/Cbc/src/CbcModel.hpp

    r1880 r1889  
    3939class CbcEventHandler ;
    4040class CglPreProcess;
    41 # ifdef COIN_HAS_CLP
    4241class OsiClpSolverInterface;
    4342class ClpNodeStuff;
    44 #endif
     43
    4544// #define CBC_CHECK_BASIS 1
    4645
     
    18601859    { temporaryPointer_=pointer;}
    18611860    /// Go to dantzig pivot selection if easy problem (clp only)
    1862 #ifdef COIN_HAS_CLP
    18631861    void goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod);
    1864 #endif
    18651862    /// Now we may not own objects - just point to solver's objects
    18661863    inline bool ownObjects() const {
     
    22722269        maximumNumberIterations_ = value;
    22732270    }
    2274 # ifdef COIN_HAS_CLP
    22752271    /// Set depth for fast nodes
    22762272    inline void setFastNodeDepth(int value) {
     
    22932289        numberExtraIterations_ += iterations;
    22942290    }
    2295 #endif
    22962291    /// Number of extra iterations
    22972292    inline int numberExtraIterations() const {
Note: See TracChangeset for help on using the changeset viewer.