Changeset 946 for stable/0.4/Couenne/src/bound_tightening/CouenneAggrProbing.cpp

Timestamp:

Apr 15, 2013 6:20:38 PM (8 years ago)

Author:

stefan

Message:

merge r945 from trunk: allow compiling against Cgl 0.58

Location:

stable/0.4/Couenne

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/bound_tightening (modified) (1 prop)
• src/bound_tightening/CouenneAggrProbing.cpp (modified) (1 diff)

stable/0.4/Couenne/src/bound_tightening/CouenneAggrProbing.cpp

@@ -52 +52 @@
 void CouenneAggrProbing::registerOptions(Ipopt::SmartPtr <Bonmin::RegisteredOptions> roptions) {
   // Nothing for the moment, but will be added later as needed
-}
-
-void CouenneAggrProbing::generateCuts(const OsiSolverInterface& solver,
-                                      OsiCuts& cuts, 
-                                      const CglTreeInfo info) const {
-  // Empty for the moment (cannot be used automatically in Branch-and-Bound)
 }