Changeset 282


Ignore:
Timestamp:
Mar 20, 2006 9:49:04 AM (14 years ago)
Author:
forrest
Message:

for Pierre

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r278 r282  
    11491149      }
    11501150      else
    1151       { deleteNode = true ; }
     1151      { deleteNode = true ;
     1152      if (!nodeInfo->numberBranchesLeft())
     1153        nodeInfo->allBranchesGone(); // can clean up
     1154      }
    11521155
    11531156      if ((specialOptions_&1)!=0) {
     
    34503453    objectiveValue= node->objectiveValue();
    34513454  int returnCode = resolve(node ? node->nodeInfo() : NULL,1);
     3455  if (node&&!node->nodeInfo()->numberBranchesLeft())
     3456    node->nodeInfo()->allBranchesGone(); // can clean up
    34523457  feasible = returnCode  != 0 ;
    34533458  if (returnCode<0)
  • trunk/include/CbcNode.hpp

    r222 r282  
    112112  /// Clone
    113113  virtual CbcNodeInfo * clone() const = 0;
     114  /// Called when number branches left down to zero
     115  virtual void allBranchesGone() {};
    114116
    115117  /// Increment number of references
Note: See TracChangeset for help on using the changeset viewer.