Changeset 73


Ignore:
Timestamp:
Mar 3, 2005 4:41:46 PM (16 years ago)
Author:
forrest
Message:

switch off heuristic

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcHeuristic.cpp

    r72 r73  
    109109
    110110  // See if to do
    111   if (!when()||(when()==1&&model_->phase()!=1))
     111  if (!when()||(when()%10==1&&model_->phase()!=1)||
     112      (when()%10==2&&model_->phase()!=2))
    112113    return 0; // switched off
    113114
     
    418419CbcRounding::validate()
    419420{
     421  if (model_&&when()<10) {
     422    if (model_->numberIntegers()!=
     423        model_->numberObjects())
     424      setWhen(0);
     425  }
    420426}
    421427
  • trunk/include/CbcHeuristic.hpp

    r72 r73  
    5757  virtual void validate() {};
    5858
    59   /// Sets "when" flag - 0 off, 1 at root, 2 other than root, 3 always
     59  /** Sets "when" flag - 0 off, 1 at root, 2 other than root, 3 always.
     60      If 10 added then don't worry if validate says there are funny objects
     61      as user knows it will be fine
     62  */
    6063  inline void setWhen(int value)
    6164  { when_=value;};
Note: See TracChangeset for help on using the changeset viewer.