Ignore:
Timestamp:
May 12, 2005 9:33:59 AM (16 years ago)
Author:
forrest
Message:

make createBranch non const

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/CbcBranchActual.hpp

    r122 r129  
    4343  virtual void feasibleRegion();
    4444  /// Creates a branching object
    45   virtual CbcBranchingObject * createBranch(int way) const;
     45  virtual CbcBranchingObject * createBranch(int way) ;
    4646  /// Number of members
    4747  inline int numberMembers() const
     
    126126  virtual void feasibleRegion();
    127127  /// Creates a branching object
    128   virtual CbcBranchingObject * createBranch(int way) const;
     128  virtual CbcBranchingObject * createBranch(int way) ;
    129129
    130130  /// Number of members
     
    196196
    197197  /// Creates a branching object
    198   virtual CbcBranchingObject * createBranch(int way) const;
     198  virtual CbcBranchingObject * createBranch(int way) ;
    199199
    200200  /** \brief Given a valid solution (with reduced costs, etc.),
     
    376376
    377377  /// Creates a branching object
    378   virtual CbcBranchingObject * createBranch(int way) const;
     378  virtual CbcBranchingObject * createBranch(int way) ;
    379379
    380380  /// Down pseudo cost
     
    673673   
    674674    This routine is used only after strong branching.
    675     This is reccommended version as it can be more sophisticated
    676675  */
    677676
     
    686685  CbcBranchDefaultDecision & operator=(const CbcBranchDefaultDecision& rhs);
    687686
     687  /// data
     688
     689  /// "best" so far
     690  double bestCriterion_;
     691
     692  /// Change up for best
     693  double bestChangeUp_;
     694
     695  /// Number of infeasibilities for up
     696  int bestNumberUp_;
     697
     698  /// Change down for best
     699  double bestChangeDown_;
     700
     701  /// Number of infeasibilities for down
     702  int bestNumberDown_;
     703
     704  /// Pointer to best branching object
     705  CbcBranchingObject * bestObject_;
     706
    688707};
    689708
     
    728747  virtual void feasibleRegion();
    729748  /// Creates a branching object
    730   virtual CbcBranchingObject * createBranch(int way) const;
     749  virtual CbcBranchingObject * createBranch(int way) ;
    731750  /// As some computation is needed in more than one place - returns row
    732751  virtual int gutsOfFollowOn(int & otherRow, int & preferredWay) const;
Note: See TracChangeset for help on using the changeset viewer.