Ignore:
Timestamp:
Aug 20, 2007 12:03:23 AM (12 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcBranchActual.hpp

    r720 r765  
    3737  ~CbcClique ();
    3838 
     39  using CbcObject::infeasibility ;
    3940  /// Infeasibility - large is 0.5
    4041  virtual double infeasibility(int & preferredWay) const;
    4142
     43  using CbcObject::feasibleRegion ;
    4244  /// This looks at solution and sets bounds to contain solution
    4345  virtual void feasibleRegion();
     46
     47  using CbcObject::createBranch ;
    4448  /// Creates a branching object
    4549  virtual CbcBranchingObject * createBranch(int way) ;
     
    122126  ~CbcSOS ();
    123127 
     128  using CbcObject::infeasibility ;
    124129  /// Infeasibility - large is 0.5
    125130  virtual double infeasibility(int & preferredWay) const;
    126131
     132  using CbcObject::feasibleRegion ;
    127133  /// This looks at solution and sets bounds to contain solution
    128134  virtual void feasibleRegion();
     135
     136  using CbcObject::createBranch ;
    129137  /// Creates a branching object
    130138  virtual CbcBranchingObject * createBranch(int way) ;
    131139
     140  using CbcObject::solverBranch ;
    132141  /** Create an OsiSolverBranch object
    133142
     
    220229  /// Construct an OsiSimpleInteger object
    221230  OsiSimpleInteger * osiObject() const;
     231  using CbcObject::infeasibility ;
    222232  /// Infeasibility - large is 0.5
    223233  virtual double infeasibility(const OsiSolverInterface * solver,
    224234                               const OsiBranchingInformation * info, int & preferredWay) const;
    225235
     236  using CbcObject::feasibleRegion ;
    226237  /** Set bounds to fix the variable at the current (integer) value.
    227238
     
    231242  virtual double feasibleRegion(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
    232243
     244  using CbcObject::createBranch ;
    233245  /** Create a branching object and indicate which way to branch first.
    234246     
     
    238250  virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
    239251                                            const OsiBranchingInformation * info, int way) ;
     252
     253  using CbcObject::solverBranch ;
    240254  /** Create an OsiSolverBranch object
    241255
     
    343357  void applyConsequence(int iSequence, int state) const;
    344358 
     359  using CbcObject::infeasibility ;
    345360  /// Infeasibility - large is 0.5 (and 0.5 will give this)
    346361  virtual double infeasibility(int & preferredWay) const;
    347362
     363  using CbcObject::feasibleRegion ;
    348364  /// This looks at solution and sets bounds to contain solution
    349365  virtual void feasibleRegion();
     366
     367  using CbcObject::createBranch ;
    350368  /// Creates a branching object
    351369  virtual CbcBranchingObject * createBranch(int way) ;
     370
    352371  /// Number of members
    353372  inline int numberMembers() const
     
    420439  virtual ~CbcIntegerBranchingObject ();
    421440 
     441  using CbcBranchingObject::branch ;
    422442  /** \brief Sets the bounds for the variable according to the current arm
    423443             of the branch and advances the object state to the next arm.
     
    426446  virtual double branch();
    427447
     448  using CbcBranchingObject::print ;
    428449  /** \brief Print something about branch - only if log level high
    429450  */
     
    470491  ~CbcSimpleIntegerPseudoCost ();
    471492 
     493  using CbcObject::infeasibility ;
    472494  /// Infeasibility - large is 0.5
    473495  virtual double infeasibility(int & preferredWay) const;
    474496
     497  using CbcObject::createBranch ;
    475498  /// Creates a branching object
    476499  virtual CbcBranchingObject * createBranch(int way) ;
     
    580603  virtual ~CbcIntegerPseudoCostBranchingObject ();
    581604 
     605  using CbcBranchingObject::branch ;
    582606  /** \brief Sets the bounds for the variable according to the current arm
    583607             of the branch and advances the object state to the next arm.
     
    631655  virtual ~CbcCliqueBranchingObject ();
    632656 
     657  using CbcBranchingObject::branch ;
    633658  /// Does next branch and updates state
    634659  virtual double branch();
    635660
     661  using CbcBranchingObject::print ;
    636662  /** \brief Print something about branch - only if log level high
    637663  */
     
    676702  virtual ~CbcLongCliqueBranchingObject ();
    677703 
     704  using CbcBranchingObject::branch ;
    678705  /// Does next branch and updates state
    679706  virtual double branch();
    680707
     708  using CbcBranchingObject::print ;
    681709  /** \brief Print something about branch - only if log level high
    682710  */
     
    720748  virtual ~CbcSOSBranchingObject ();
    721749 
     750  using CbcBranchingObject::branch ;
    722751  /// Does next branch and updates state
    723752  virtual double branch();
    724753
     754  using CbcBranchingObject::print ;
    725755  /** \brief Print something about branch - only if log level high
    726756  */
     
    762792  virtual ~CbcNWayBranchingObject ();
    763793 
     794  using CbcBranchingObject::branch ;
    764795  /// Does next branch and updates state
    765796  virtual double branch();
    766797
     798  using CbcBranchingObject::print ;
    767799  /** \brief Print something about branch - only if log level high
    768800  */
     
    905937  ~CbcFollowOn ();
    906938 
     939  using CbcObject::infeasibility ;
    907940  /// Infeasibility - large is 0.5
    908941  virtual double infeasibility(int & preferredWay) const;
    909942
     943  using CbcObject::feasibleRegion ;
    910944  /// This looks at solution and sets bounds to contain solution
    911945  virtual void feasibleRegion();
     946
     947  using CbcObject::createBranch ;
    912948  /// Creates a branching object
    913949  virtual CbcBranchingObject * createBranch(int way) ;
     
    952988  virtual ~CbcFixingBranchingObject ();
    953989 
     990  using CbcBranchingObject::branch ;
    954991  /// Does next branch and updates state
    955992  virtual double branch();
    956993
     994  using CbcBranchingObject::print ;
    957995  /** \brief Print something about branch - only if log level high
    958996  */
     
    10471085  virtual ~CbcDummyBranchingObject ();
    10481086 
     1087  using CbcBranchingObject::branch ;
    10491088  /** \brief Dummy branch
    10501089  */
    10511090  virtual double branch();
    10521091
     1092  using CbcBranchingObject::print ;
    10531093  /** \brief Print something about branch - only if log level high
    10541094  */
Note: See TracChangeset for help on using the changeset viewer.