Changeset 945 for trunk/Couenne/src/bound_tightening

Timestamp:

Apr 6, 2013 4:25:21 PM (8 years ago)

Author:

stefan

Message:

generateCuts in Cgl >= 0.58 will not be const anymore

Location:

trunk/Couenne/src/bound_tightening

Files:

• CouenneAggrProbing.cpp (modified) (1 diff)
• CouenneAggrProbing.hpp (modified) (2 diffs)
• CouenneFixPoint.hpp (modified) (2 diffs)
• FixPointGenCuts.cpp (modified) (1 diff)
• twoImpliedBT/CouenneTwoImplied.hpp (modified) (2 diffs)
• twoImpliedBT/TwoImpliedGenCuts.cpp (modified) (1 diff)

trunk/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)
 }
 

trunk/Couenne/src/bound_tightening/CouenneAggrProbing.hpp

@@ -15 +15 @@
 
 #include "BonOaDecBase.hpp"
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "OsiColCut.hpp"
@@ -55 +56 @@
     void generateCuts(const OsiSolverInterface & solver,
                       OsiCuts& cuts, 
-                      const CglTreeInfo = CglTreeInfo ()) const;
+                      const CglTreeInfo = CglTreeInfo ())
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+    const
+#endif
+    { }
 
     /// Probe one variable (try to tigthen the lower or the upper

trunk/Couenne/src/bound_tightening/CouenneFixPoint.hpp

@@ -15 +15 @@
 
 #include "BonOaDecBase.hpp"
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "OsiRowCut.hpp"
@@ -48 +49 @@
     void generateCuts (const OsiSolverInterface &, 
                        OsiCuts &, 
-                       const CglTreeInfo = CglTreeInfo ()) const;
+                       const CglTreeInfo = CglTreeInfo ())
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+    const
+#endif
+    ;
 
     /// Add list of options to be read from file

trunk/Couenne/src/bound_tightening/FixPointGenCuts.cpp

@@ -28 +28 @@
 void CouenneFixPoint::generateCuts (const OsiSolverInterface &si,
                                     OsiCuts &cs,
-                                    const CglTreeInfo treeInfo) const {
+                                    const CglTreeInfo treeInfo)
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+  const
+#endif
+  {
 
   /// Only run this if the latest FBBT terminated on the iteration

trunk/Couenne/src/bound_tightening/twoImpliedBT/CouenneTwoImplied.hpp

@@ -14 +14 @@
 #include "BonRegisteredOptions.hpp"
 
+#include "CglConfig.h"
 #include "CglCutGenerator.hpp"
 #include "OsiRowCut.hpp"
@@ -193 +194 @@
     void generateCuts (const OsiSolverInterface &, 
                        OsiCuts &, 
-                       const CglTreeInfo = CglTreeInfo ()) const;
+                       const CglTreeInfo = CglTreeInfo ())
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+    const
+#endif
+    ;
 
     /// Add list of options to be read from file

trunk/Couenne/src/bound_tightening/twoImpliedBT/TwoImpliedGenCuts.cpp

@@ -59 +59 @@
 void CouenneTwoImplied::generateCuts (const OsiSolverInterface &si, 
                                       OsiCuts &cs, 
-                                      const CglTreeInfo info) const {
+                                      const CglTreeInfo info)
+#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
+  const
+#endif
+  {
 
   // don't perform this is cs has been added an infeasible cut (a