Changeset 1213
 Timestamp:
 Aug 21, 2009 12:21:05 PM (11 years ago)
 Location:
 trunk/Cbc/examples
 Files:

 6 edited
Legend:
 Unmodified
 Added
 Removed

trunk/Cbc/examples/CbcBranchFollow2.cpp
r1173 r1213 301 301 // Infeasibility  large is 0.5 302 302 double 303 CbcFollowOn2::infeasibility(int & preferredWay) const 303 CbcFollowOn2::infeasibility(const OsiBranchingInformation * info, 304 int & preferredWay) const 304 305 { 305 306 int otherRow=0; … … 323 324 // Creates a branching object 324 325 CbcBranchingObject * 325 CbcFollowOn2::create Branch(int way)326 CbcFollowOn2::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) 326 327 { 327 328 int otherRow=0; … … 343 344 const CoinBigIndex * rowStart = matrixByRow_.getVectorStarts(); 344 345 const int * rowLength = matrixByRow_.getVectorLengths(); 345 OsiSolverInterface * solver = model_>solver();346 //OsiSolverInterface * solver = model_>solver(); 346 347 const double * columnLower = solver>getColLower(); 347 348 const double * columnUpper = solver>getColUpper(); 
trunk/Cbc/examples/CbcBranchFollow2.hpp
r1173 r1213 46 46 47 47 /// Infeasibility  large is 0.5 48 virtual double infeasibility(int & preferredWay) const; 48 virtual double infeasibility(const OsiBranchingInformation * info, 49 int & preferredWay) const; 49 50 50 51 /// This looks at solution and sets bounds to contain solution 51 52 virtual void feasibleRegion(); 52 53 /// Creates a branching object 53 virtual CbcBranchingObject * create Branch(int way) ;54 virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) ; 54 55 /** As some computation is needed in more than one place  returns row. 55 56 Also returns other row and effective rhs (so we can know if cut) 
trunk/Cbc/examples/CbcBranchLink.cpp
r1173 r1213 151 151 // Infeasibility  large is 0.5 152 152 double 153 CbcLink::infeasibility(int & preferredWay) const 153 CbcLink::infeasibility(const OsiBranchingInformation * info, 154 int & preferredWay) const 154 155 { 155 156 int j; … … 465 466 // Creates a branching object 466 467 CbcBranchingObject * 467 CbcLink::create Branch(int way)468 CbcLink::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) 468 469 { 469 470 int j; … … 471 472 double integerTolerance = 472 473 model_>getDblParam(CbcModel::CbcIntegerTolerance); 473 OsiSolverInterface * solver = model_>solver();474 //OsiSolverInterface * solver = model_>solver(); 474 475 const double * upper = solver>getColUpper(); 475 476 int firstNonFixed=1; 
trunk/Cbc/examples/CbcBranchLink.hpp
r1173 r1213 51 51 52 52 /// Infeasibility  large is 0.5 53 virtual double infeasibility(int & preferredWay) const; 53 virtual double infeasibility(const OsiBranchingInformation * info, 54 int & preferredWay) const; 54 55 55 56 /// This looks at solution and sets bounds to contain solution 56 57 virtual void feasibleRegion(); 57 58 /// Creates a branching object 58 virtual CbcBranchingObject * create Branch(int way) ;59 virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info,int way) ; 59 60 60 61 /// Number of members 
trunk/Cbc/examples/CbcBranchUser.cpp
r1173 r1213 379 379 // Infeasibility  large is 0.5 380 380 double 381 CbcSimpleIntegerFixed::infeasibility(int & preferredWay) const 381 CbcSimpleIntegerFixed::infeasibility(const OsiBranchingInformation * info, 382 int & preferredWay) const 382 383 { 383 384 OsiSolverInterface * solver = model_>solver(); … … 417 418 // Creates a branching object 418 419 CbcBranchingObject * 419 CbcSimpleIntegerFixed::create Branch(OsiSolverInterface * solver,420 const OsiBranchingInformation * info,int way)420 CbcSimpleIntegerFixed::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, 421 int way) 421 422 { 422 423 const double * solution = model_>testSolution(); 
trunk/Cbc/examples/CbcBranchUser.hpp
r1173 r1213 86 86 87 87 /// Infeasibility  large is 0.5 88 virtual double infeasibility(int & preferredWay) const; 88 virtual double infeasibility(const OsiBranchingInformation * info, 89 int & preferredWay) const; 89 90 90 91 /** Creates a branching object … … 98 99 variables, etc.) 99 100 */ 100 virtual CbcBranchingObject * create Branch(OsiSolverInterface * solver,101 virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver, 101 102 const OsiBranchingInformation * info, int way) ; 102 103
Note: See TracChangeset
for help on using the changeset viewer.