Ignore:
Timestamp:
Oct 8, 2006 7:33:47 PM (13 years ago)
Author:
forrest
Message:

towards common use with other solvers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcBranchDynamic.hpp

    r424 r439  
    2424  CbcSimpleIntegerDynamicPseudoCost ();
    2525
    26   // Useful constructor - passed integer index and model index
    27   CbcSimpleIntegerDynamicPseudoCost (CbcModel * model, int sequence, int iColumn, double breakEven=0.5);
    28  
    29   // Useful constructor - passed integer index and model index and pseudo costs
    30   CbcSimpleIntegerDynamicPseudoCost (CbcModel * model, int sequence, int iColumn,
     26  // Useful constructor - passed  model index
     27  CbcSimpleIntegerDynamicPseudoCost (CbcModel * model,  int iColumn, double breakEven=0.5);
     28 
     29  // Useful constructor - passed  model index and pseudo costs
     30  CbcSimpleIntegerDynamicPseudoCost (CbcModel * model, int iColumn,
     31                              double downDynamicPseudoCost, double upDynamicPseudoCost);
     32 
     33  // Useful constructor - passed  model index and pseudo costs
     34  CbcSimpleIntegerDynamicPseudoCost (CbcModel * model, int dummy, int iColumn,
    3135                              double downDynamicPseudoCost, double upDynamicPseudoCost);
    3236 
     
    4852  /// Creates a branching object
    4953  virtual CbcBranchingObject * createBranch(int way) ;
     54  /// Infeasibility - large is 0.5
     55  virtual double infeasibility(const OsiSolverInterface * solver,
     56                               const OsiBranchingInformation * info, int & preferredWay) const;
     57
     58
     59  /** Create a branching object and indicate which way to branch first.
     60     
     61      The branching object has to know how to create branches (fix
     62      variables, etc.)
     63  */
     64  virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
     65                                            const OsiBranchingInformation * info, int way) ;
    5066
    5167  /** Create an OsiSolverBranch object
     
    322338             This version also changes guessed objective value
    323339  */
    324   virtual double branch(bool normalBranch=false);
     340  virtual double branch();
    325341  /** Some branchingObjects may claim to be able to skip
    326342      strong branching.  If so they have to fill in CbcStrongInfo.
     
    399415  /** Saves a clone of current branching object.  Can be used to update
    400416      information on object causing branch - after branch */
    401   virtual void saveBranchingObject(CbcBranchingObject * object) ;
     417  virtual void saveBranchingObject(OsiBranchingObject * object) ;
    402418  /** Pass in information on branch just done.
    403419      assumes object can get information from solver */
Note: See TracChangeset for help on using the changeset viewer.