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/CbcBranchCut.hpp

    r765 r912  
    139139  virtual double branch();
    140140
     141#if 0
     142  // No need to override. Default works fine.
     143  /** Reset every information so that the branching object appears to point to
     144      the previous child. This method does not need to modify anything in any
     145      solver. */
     146  virtual void previousBranch();
     147#endif
     148
    141149  using CbcBranchingObject::print ;
    142150  /** \brief Print something about branch - only if log level high
     
    147155  */
    148156  virtual bool boundBranch() const;
     157
     158  /** Return the type (an integer identifier) of \c this */
     159  virtual int type() const { return 200; }
     160
     161  /** Compare the original object of \c this with the original object of \c
     162      brObj. Assumes that there is an ordering of the original objects.
     163      This method should be invoked only if \c this and brObj are of the same
     164      type.
     165      Return negative/0/positive depending on whether \c this is
     166      smaller/same/larger than the argument.
     167  */
     168  virtual int compareOriginalObject(const CbcBranchingObject* brObj) const;
     169
     170  /** Compare the \c this with \c brObj. \c this and \c brObj must be os the
     171      same type and must have the same original object, but they may have
     172      different feasible regions.
     173      Return the appropriate CbcRangeCompare value (first argument being the
     174      sub/superset if that's the case). In case of overlap (and if \c
     175      replaceIfOverlap is true) replace the current branching object with one
     176      whose feasible region is the overlap.
     177   */
     178  virtual CbcRangeCompare compareBranchingObject
     179  (const CbcBranchingObject* brObj, const bool replaceIfOverlap = false);
    149180
    150181protected:
Note: See TracChangeset for help on using the changeset viewer.