Changeset 898 for branches


Ignore:
Timestamp:
Mar 12, 2008 11:12:50 PM (11 years ago)
Author:
ladanyi
Message:

fixed previousBranch() for a couple of branching object types. still to be done: NWay, Cut, Lotsize

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/heur/Cbc/src/CbcBranchActual.hpp

    r886 r898  
    449449  */
    450450  virtual double branch();
     451
     452#if 0
     453  // No need to override. Default works fine.
     454  /** Reset every information so that the branching object appears to point to
     455      the previous child. This method does not need to modify anything in any
     456      solver. */
     457  virtual void previousBranch();
     458#endif
    451459
    452460  using CbcBranchingObject::print ;
     
    733741  virtual double branch();
    734742
     743#if 0
     744  // No need to override. Default works fine.
     745  /** Reset every information so that the branching object appears to point to
     746      the previous child. This method does not need to modify anything in any
     747      solver. */
     748  virtual void previousBranch();
     749#endif
     750
    735751  using CbcBranchingObject::print ;
    736752  /** \brief Print something about branch - only if log level high
     
    804820  virtual double branch();
    805821
     822#if 0
     823  // No need to override. Default works fine.
     824  /** Reset every information so that the branching object appears to point to
     825      the previous child. This method does not need to modify anything in any
     826      solver. */
     827  virtual void previousBranch();
     828#endif
     829
    806830  using CbcBranchingObject::print ;
    807831  /** \brief Print something about branch - only if log level high
     
    873897  /// Does next branch and updates state
    874898  virtual double branch();
     899
     900  /** Reset every information so that the branching object appears to point to
     901      the previous child. This method does not need to modify anything in any
     902      solver. */
     903  virtual void previousBranch() {
     904    CbcBranchingObject::previousBranch();
     905    computeNonzeroRange();
     906  }
    875907
    876908  using CbcBranchingObject::print ;
     
    952984  virtual double branch();
    953985
     986#if 0
     987  // FIXME: what do we need to do here?
     988  /** Reset every information so that the branching object appears to point to
     989      the previous child. This method does not need to modify anything in any
     990      solver. */
     991  virtual void previousBranch();
     992#endif
     993
    954994  using CbcBranchingObject::print ;
    955995  /** \brief Print something about branch - only if log level high
     
    11711211  /// Does next branch and updates state
    11721212  virtual double branch();
     1213
     1214#if 0
     1215  // No need to override. Default works fine.
     1216  /** Reset every information so that the branching object appears to point to
     1217      the previous child. This method does not need to modify anything in any
     1218      solver. */
     1219  virtual void previousBranch();
     1220#endif
    11731221
    11741222  using CbcBranchingObject::print ;
     
    12941342  virtual double branch();
    12951343
     1344#if 0
     1345  // No need to override. Default works fine.
     1346  /** Reset every information so that the branching object appears to point to
     1347      the previous child. This method does not need to modify anything in any
     1348      solver. */
     1349  virtual void previousBranch();
     1350#endif
     1351
    12961352  using CbcBranchingObject::print ;
    12971353  /** \brief Print something about branch - only if log level high
Note: See TracChangeset for help on using the changeset viewer.