Ignore:
Timestamp:
Oct 24, 2006 4:28:25 PM (13 years ago)
Author:
forrest
Message:

for nonlinear

Location:
branches/devel/Cbc/examples
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/examples/CbcBranchUser.cpp

    r440 r466  
    416416// Creates a branching object
    417417CbcBranchingObject *
    418 CbcSimpleIntegerFixed::createBranch(int way)
    419 {
    420   OsiSolverInterface * solver = model_->solver();
     418CbcSimpleIntegerFixed::createBranch(OsiSolverInterface * solver,
     419                                            const OsiBranchingInformation * info, int way) 
     420{
    421421  const double * solution = model_->testSolution();
    422422  const double * lower = solver->getColLower();
  • branches/devel/Cbc/examples/CbcBranchUser.hpp

    r440 r466  
    9191    The preferred direction is set by \p way, -1 for down, +1 for up.
    9292  */
    93   virtual CbcBranchingObject * createBranch(int way) ;
     93  //virtual CbcBranchingObject * createBranch(int way) ;
     94  /** Create a branching object and indicate which way to branch first.
     95     
     96      The branching object has to know how to create branches (fix
     97      variables, etc.)
     98  */
     99  virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
     100                                            const OsiBranchingInformation * info, int way) ;
    94101
    95102protected:
Note: See TracChangeset for help on using the changeset viewer.