Changeset 466

Timestamp:

Oct 24, 2006 4:28:25 PM (14 years ago)

Author:

forrest

Message:

for nonlinear

Location:

branches/devel/Cbc/examples

Files:

• CbcBranchUser.cpp (modified) (1 diff)
• CbcBranchUser.hpp (modified) (1 diff)
• CbcSolverLink.cpp (added)
• CbcSolverLink.hpp (added)

branches/devel/Cbc/examples/CbcBranchUser.cpp

@@ -416 +416 @@
 // Creates a branching object
 CbcBranchingObject * 
-CbcSimpleIntegerFixed::createBranch(int way) 
-{
-  OsiSolverInterface * solver = model_->solver();
+CbcSimpleIntegerFixed::createBranch(OsiSolverInterface * solver,
+                                            const OsiBranchingInformation * info, int way)  
+{
   const double * solution = model_->testSolution();
   const double * lower = solver->getColLower();

branches/devel/Cbc/examples/CbcBranchUser.hpp

@@ -91 +91 @@
     The preferred direction is set by \p way, -1 for down, +1 for up.
   */
-  virtual CbcBranchingObject * createBranch(int way) ;
+  //virtual CbcBranchingObject * createBranch(int way) ;
+  /** Create a branching object and indicate which way to branch first.
+      
+      The branching object has to know how to create branches (fix
+      variables, etc.)
+  */
+  virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
+                                            const OsiBranchingInformation * info, int way) ;
 
 protected: