Changeset 969


Ignore:
Timestamp:
Jun 9, 2008 2:32:02 PM (11 years ago)
Author:
jpgoncal
Message:

Added variables to store children of a node.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dynamicbranching/dynamicbranching.cpp

    r967 r969  
    5757  // Parent
    5858  int parent_;
     59  // Left child
     60  int child1_;
     61  // Right child
     62  int child2_;
    5963  // Previous in chain
    6064  int previous_;
     
    7781  descendants_(-1),
    7882  parent_(-1),
     83  child1_(-1),
     84  child2_(-1),
    7985  previous_(-1),
    8086  next_(-1),
     
    99105  descendants_ = 0;
    100106  parent_ = -1;
     107  child1_ = -1;
     108  child2_ = -1;
    101109  previous_ = -1;
    102110  next_ = -1;
     
    360368  descendants_ = rhs.descendants_;
    361369  parent_ = rhs.parent_;
     370  child1_ = rhs.child1_;
     371  child2_ = rhs.child2_;
    362372  previous_ = rhs.previous_;
    363373  next_ = rhs.next_;
     
    387397    descendants_ = rhs.descendants_;
    388398    parent_ = rhs.parent_;
     399    child1_ = rhs.child1_;
     400    child2_ = rhs.child2_;
    389401    previous_ = rhs.previous_;
    390402    next_ = rhs.next_;
     
    652664}
    653665#endif
     666
     667void moveNodes(OsiSolverInterface & model,
     668               DBVectorNode & branchingTree,
     669               DBNodeSimple & node)
     670{
     671
     672
     673
     674
     675}
     676
    654677// Invoke solver's built-in enumeration algorithm
    655678void
     
    10041027              // push on stack
    10051028              branchingTree.push_back(newNode);
     1029              if(branchingTree.nodes_[kNode].child1_ < 0)
     1030                branchingTree.nodes_[kNode].child1_ = branchingTree.last_;
     1031              else
     1032                branchingTree.nodes_[kNode].child2_ = branchingTree.last_;
    10061033#if 0
    10071034              } else {
Note: See TracChangeset for help on using the changeset viewer.