Changeset 1213


Ignore:
Timestamp:
Aug 21, 2009 12:21:05 PM (10 years ago)
Author:
forrest
Message:

fixes

Location:
trunk/Cbc/examples
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/examples/CbcBranchFollow2.cpp

    r1173 r1213  
    301301// Infeasibility - large is 0.5
    302302double
    303 CbcFollowOn2::infeasibility(int & preferredWay) const
     303CbcFollowOn2::infeasibility(const OsiBranchingInformation * info,
     304                            int & preferredWay) const
    304305{
    305306  int otherRow=0;
     
    323324// Creates a branching object
    324325CbcBranchingObject *
    325 CbcFollowOn2::createBranch(int way)
     326CbcFollowOn2::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way)
    326327{
    327328  int otherRow=0;
     
    343344  const CoinBigIndex * rowStart = matrixByRow_.getVectorStarts();
    344345  const int * rowLength = matrixByRow_.getVectorLengths();
    345   OsiSolverInterface * solver = model_->solver();
     346  //OsiSolverInterface * solver = model_->solver();
    346347  const double * columnLower = solver->getColLower();
    347348  const double * columnUpper = solver->getColUpper();
  • trunk/Cbc/examples/CbcBranchFollow2.hpp

    r1173 r1213  
    4646 
    4747  /// Infeasibility - large is 0.5
    48   virtual double infeasibility(int & preferredWay) const;
     48  virtual double infeasibility(const OsiBranchingInformation * info,
     49                               int & preferredWay) const;
    4950
    5051  /// This looks at solution and sets bounds to contain solution
    5152  virtual void feasibleRegion();
    5253  /// Creates a branching object
    53   virtual CbcBranchingObject * createBranch(int way) ;
     54  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) ;
    5455  /** As some computation is needed in more than one place - returns row.
    5556      Also returns other row and effective rhs (so we can know if cut)
  • trunk/Cbc/examples/CbcBranchLink.cpp

    r1173 r1213  
    151151// Infeasibility - large is 0.5
    152152double
    153 CbcLink::infeasibility(int & preferredWay) const
     153CbcLink::infeasibility(const OsiBranchingInformation * info,
     154                       int & preferredWay) const
    154155{
    155156  int j;
     
    465466// Creates a branching object
    466467CbcBranchingObject *
    467 CbcLink::createBranch(int way)
     468CbcLink::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way)
    468469{
    469470  int j;
     
    471472  double integerTolerance =
    472473      model_->getDblParam(CbcModel::CbcIntegerTolerance);
    473   OsiSolverInterface * solver = model_->solver();
     474  //OsiSolverInterface * solver = model_->solver();
    474475  const double * upper = solver->getColUpper();
    475476  int firstNonFixed=-1;
  • trunk/Cbc/examples/CbcBranchLink.hpp

    r1173 r1213  
    5151 
    5252  /// Infeasibility - large is 0.5
    53   virtual double infeasibility(int & preferredWay) const;
     53  virtual double infeasibility(const OsiBranchingInformation * info,
     54int & preferredWay) const;
    5455
    5556  /// This looks at solution and sets bounds to contain solution
    5657  virtual void feasibleRegion();
    5758  /// Creates a branching object
    58   virtual CbcBranchingObject * createBranch(int way) ;
     59  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) ;
    5960
    6061  /// Number of members
  • trunk/Cbc/examples/CbcBranchUser.cpp

    r1173 r1213  
    379379// Infeasibility - large is 0.5
    380380double
    381 CbcSimpleIntegerFixed::infeasibility(int & preferredWay) const
     381CbcSimpleIntegerFixed::infeasibility(const OsiBranchingInformation * info,
     382                                     int & preferredWay) const
    382383{
    383384  OsiSolverInterface * solver = model_->solver();
     
    417418// Creates a branching object
    418419CbcBranchingObject *
    419 CbcSimpleIntegerFixed::createBranch(OsiSolverInterface * solver,
    420                                             const OsiBranchingInformation * info, int way) 
     420CbcSimpleIntegerFixed::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,
     421                                            int way) 
    421422{
    422423  const double * solution = model_->testSolution();
  • trunk/Cbc/examples/CbcBranchUser.hpp

    r1173 r1213  
    8686 
    8787  /// Infeasibility - large is 0.5
    88   virtual double infeasibility(int & preferredWay) const;
     88  virtual double infeasibility(const OsiBranchingInformation * info,
     89                               int & preferredWay) const;
    8990
    9091  /** Creates a branching object
     
    9899      variables, etc.)
    99100  */
    100   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
     101  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,
    101102                                            const OsiBranchingInformation * info, int way) ;
    102103
Note: See TracChangeset for help on using the changeset viewer.