Ignore:
Timestamp:
Apr 10, 2008 1:55:10 PM (13 years ago)
Author:
ladanyi
Message:

Incorporated changes from branches/heur

File:
1 edited

Legend:

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

    r765 r912  
    197197  virtual double branch();
    198198
     199#if 0
     200  // No need to override. Default works fine.
     201  /** Reset every information so that the branching object appears to point to
     202      the previous child. This method does not need to modify anything in any
     203      solver. */
     204  virtual void previousBranch();
     205#endif
     206
    199207  using CbcBranchingObject::print ;
    200208  /** \brief Print something about branch - only if log level high
    201209  */
    202210  virtual void print();
     211
     212  /** Return the type (an integer identifier) of \c this */
     213  virtual int type() const { return 300; }
     214
     215  // LL: compareOriginalObject can be inherited from the CbcBranchingObject
     216  // since variable_ uniquely defines the lot sizing object.
     217
     218  /** Compare the \c this with \c brObj. \c this and \c brObj must be os the
     219      same type and must have the same original object, but they may have
     220      different feasible regions.
     221      Return the appropriate CbcRangeCompare value (first argument being the
     222      sub/superset if that's the case). In case of overlap (and if \c
     223      replaceIfOverlap is true) replace the current branching object with one
     224      whose feasible region is the overlap.
     225   */
     226  virtual CbcRangeCompare compareBranchingObject
     227  (const CbcBranchingObject* brObj, const bool replaceIfOverlap = false);
    203228
    204229protected:
Note: See TracChangeset for help on using the changeset viewer.