Ignore:
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:
9 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/bound_tightening

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

    r795 r946  
    5252void CouenneAggrProbing::registerOptions(Ipopt::SmartPtr <Bonmin::RegisteredOptions> roptions) {
    5353  // Nothing for the moment, but will be added later as needed
    54 }
    55 
    56 void CouenneAggrProbing::generateCuts(const OsiSolverInterface& solver,
    57                                       OsiCuts& cuts,
    58                                       const CglTreeInfo info) const {
    59   // Empty for the moment (cannot be used automatically in Branch-and-Bound)
    6054}
    6155
  • stable/0.4/Couenne/src/bound_tightening/CouenneAggrProbing.hpp

    r490 r946  
    1515
    1616#include "BonOaDecBase.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "OsiColCut.hpp"
     
    5556    void generateCuts(const OsiSolverInterface & solver,
    5657                      OsiCuts& cuts,
    57                       const CglTreeInfo = CglTreeInfo ()) const;
     58                      const CglTreeInfo = CglTreeInfo ())
     59#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     60    const
     61#endif
     62    { }
    5863
    5964    /// Probe one variable (try to tigthen the lower or the upper
  • stable/0.4/Couenne/src/bound_tightening/CouenneFixPoint.hpp

    r490 r946  
    1515
    1616#include "BonOaDecBase.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "OsiRowCut.hpp"
     
    4647    void generateCuts (const OsiSolverInterface &,
    4748                       OsiCuts &,
    48                        const CglTreeInfo = CglTreeInfo ()) const;
     49                       const CglTreeInfo = CglTreeInfo ())
     50#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     51    const
     52#endif
     53    ;
    4954
    5055    /// Add list of options to be read from file
  • stable/0.4/Couenne/src/bound_tightening/FixPointGenCuts.cpp

    r694 r946  
    2828void CouenneFixPoint::generateCuts (const OsiSolverInterface &si,
    2929                                    OsiCuts &cs,
    30                                     const CglTreeInfo treeInfo) const {
     30                                    const CglTreeInfo treeInfo)
     31#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     32  const
     33#endif
     34  {
    3135
    3236  /// Only run this if the latest FBBT terminated on the iteration
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/CouenneTwoImplied.hpp

    r577 r946  
    1414#include "BonRegisteredOptions.hpp"
    1515
     16#include "CglConfig.h"
    1617#include "CglCutGenerator.hpp"
    1718#include "OsiRowCut.hpp"
     
    193194    void generateCuts (const OsiSolverInterface &,
    194195                       OsiCuts &,
    195                        const CglTreeInfo = CglTreeInfo ()) const;
     196                       const CglTreeInfo = CglTreeInfo ())
     197#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     198    const
     199#endif
     200    ;
    196201
    197202    /// Add list of options to be read from file
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/TwoImpliedGenCuts.cpp

    r732 r946  
    5959void CouenneTwoImplied::generateCuts (const OsiSolverInterface &si,
    6060                                      OsiCuts &cs,
    61                                       const CglTreeInfo info) const {
     61                                      const CglTreeInfo info)
     62#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     63  const
     64#endif
     65  {
    6266
    6367  // don't perform this is cs has been added an infeasible cut (a
Note: See TracChangeset for help on using the changeset viewer.