Ignore:
Timestamp:
Nov 28, 2009 6:09:56 AM (10 years ago)
Author:
forrest
Message:

final changes before cleaning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcCompareDefault.hpp

    r1314 r1315  
    2525class CbcCompareDefault  : public CbcCompareBase {
    2626public:
    27     // Default Constructor
     27    /// Default Constructor
    2828    CbcCompareDefault () ;
    29     // Constructor with weight
     29    /// Constructor with weight
    3030    CbcCompareDefault (double weight);
    3131
    32     // Copy constructor
     32    /// Copy constructor
    3333    CbcCompareDefault ( const CbcCompareDefault &rhs);
    3434
    35     // Assignment operator
     35    /// Assignment operator
    3636    CbcCompareDefault & operator=( const CbcCompareDefault& rhs);
    3737
     
    4747
    4848    using CbcCompareBase::newSolution ;
    49     // This allows method to change behavior as it is called
    50     // after each solution
     49    /// This allows method to change behavior as it is called
     50    /// after each solution
    5151    virtual void newSolution(CbcModel * model,
    5252                             double objectiveAtContinuous,
    5353                             int numberInfeasibilitiesAtContinuous) ;
    54     // This allows method to change behavior
    55     // Return true if want tree re-sorted
     54    /// This allows method to change behavior
     55    /// Return true if want tree re-sorted
    5656    virtual bool every1000Nodes(CbcModel * model, int numberNodes);
    5757
     
    8080        bestPossible_ = bestPossible;
    8181    }
    82     // Depth above which want to explore first
     82    /// Depth above which want to explore first
    8383    inline void setBreadthDepth(int value) {
    8484        breadthDepth_ = value;
    8585    }
     86    /// Start dive
     87    void startDive(CbcModel * model);
     88    /// Clean up diving (i.e. switch off or prepare)
     89    void cleanDive();
    8690protected:
    87     // Weight for each infeasibility
     91    /// Weight for each infeasibility
    8892    double weight_;
    89     // Weight for each infeasibility - computed from solution
     93    /// Weight for each infeasibility - computed from solution
    9094    double saveWeight_;
    9195    /// Cutoff
     
    9397    /// Best possible solution
    9498    double bestPossible_;
    95     // Number of solutions
     99    /// Number of solutions
    96100    int numberSolutions_;
    97     // Tree size (at last check)
     101    /// Tree size (at last check)
    98102    int treeSize_;
    99     // Depth above which want to explore first
     103    /// Depth above which want to explore first
    100104    int breadthDepth_;
     105    /// Chosen node from estimated (-1 is off)
     106    int startNodeNumber_;
     107    /// Node number when dive started
     108    int afterNodeNumber_;
    101109};
    102110
Note: See TracChangeset for help on using the changeset viewer.