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

    r854 r912  
    7474  CbcNodeInfo ( const CbcNodeInfo &);
    7575   
    76 
     76#if 0
    7777  /** Construct with parent
    7878
     
    8181  */
    8282  CbcNodeInfo (CbcNodeInfo * parent);
     83#endif
    8384   
    8485  /** Construct with parent and owner
     
    229230  inline void unmark()
    230231  { active_ &= ~8;}
     232
     233  /// Branching object for the parent
     234  inline const CbcBranchingObject * parentBranch() const
     235  { return parentBranch_;}
    231236protected:
    232237
     
    243248  CbcNodeInfo * parent_;
    244249
     250  /// Copy of the branching object of the parent when the node is created
     251  CbcBranchingObject * parentBranch_;
     252     
    245253  /// Owner
    246254  CbcNode * owner_;
     
    272280  */
    273281  int active_;
    274      
     282
    275283private:
    276284 
    277285  /// Illegal Assignment operator
    278286  CbcNodeInfo & operator=(const CbcNodeInfo& rhs);
    279  
     287
     288  /// routine common to constructors
     289  void setParentBasedData();
    280290};
    281291
     
    635645  inline void setBranchingObject(OsiBranchingObject * branchingObject)
    636646  { branch_ = branchingObject;}
    637   /// The node number
     647  /// The node number 
    638648  inline int nodeNumber() const
    639649  { return nodeNumber_;}
Note: See TracChangeset for help on using the changeset viewer.