Changeset 1661 for trunk/Cbc


Ignore:
Timestamp:
Jun 9, 2011 10:07:40 AM (8 years ago)
Author:
stefan
Message:

class members should not depend on internal cbc configuration

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1656 r1661  
    44684468        heuristic_(NULL),
    44694469        lastHeuristic_(NULL),
    4470 # ifdef COIN_HAS_CLP
    44714470        fastNodeDepth_(-1),
    4472 #endif
    44734471        eventHandler_(NULL),
    44744472        numberObjects_(0),
     
    46274625        heuristic_(NULL),
    46284626        lastHeuristic_(NULL),
    4629 # ifdef COIN_HAS_CLP
    46304627        fastNodeDepth_(-1),
    4631 #endif
    46324628        eventHandler_(NULL),
    46334629        numberObjects_(0),
     
    48784874        problemType_(rhs.problemType_),
    48794875        printFrequency_(rhs.printFrequency_),
    4880 # ifdef COIN_HAS_CLP
    48814876        fastNodeDepth_(rhs.fastNodeDepth_),
    4882 #endif
    48834877        howOftenGlobalScan_(rhs.howOftenGlobalScan_),
    48844878        numberGlobalViolations_(rhs.numberGlobalViolations_),
     
    53325326            eventHandler_ = NULL ;
    53335327        }
    5334 # ifdef COIN_HAS_CLP
    53355328        fastNodeDepth_ = rhs.fastNodeDepth_;
    5336 #endif
    53375329        if (ownObjects_) {
    53385330            for (i = 0; i < numberObjects_; i++)
     
    56425634    numberPenalties_ = rhs.numberPenalties_;
    56435635    printFrequency_ = rhs.printFrequency_;
    5644 # ifdef COIN_HAS_CLP
    56455636    fastNodeDepth_ = rhs.fastNodeDepth_;
    5646 #endif
    56475637    howOftenGlobalScan_ = rhs.howOftenGlobalScan_;
    56485638    maximumCutPassesAtRoot_ = rhs.maximumCutPassesAtRoot_;
  • trunk/Cbc/src/CbcModel.hpp

    r1656 r1661  
    25602560    /// Pointer to heuristic solver which found last solution (or NULL)
    25612561    CbcHeuristic * lastHeuristic_;
    2562 # ifdef COIN_HAS_CLP
    25632562    /// Depth for fast nodes
    25642563    int fastNodeDepth_;
    2565 #endif
    25662564    /*! Pointer to the event handler */
    25672565# ifdef CBC_ONLY_CLP
Note: See TracChangeset for help on using the changeset viewer.