Changeset 946


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:
18 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
  • stable/0.4/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/convex/CouenneCutGenerator.hpp

    r772 r946  
    1515
    1616#include "BonOaDecBase.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "OsiRowCut.hpp"
     
    155156  void generateCuts (const OsiSolverInterface &,
    156157                     OsiCuts &,
    157                      const CglTreeInfo = CglTreeInfo ()) const;
     158                     const CglTreeInfo = CglTreeInfo ())
     159#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     160   const
     161#endif
     162  ;
    158163
    159164  /// create cut and check violation. Insert and return status
  • stable/0.4/Couenne/src/convex/generateCuts.cpp

    r808 r946  
    9292void CouenneCutGenerator::generateCuts (const OsiSolverInterface &si,
    9393                                        OsiCuts &cs,
    94                                         const CglTreeInfo info) const {
     94                                        const CglTreeInfo info)
     95#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     96  const
     97#endif
     98  {
    9599
    96100  // check if out of time or if an infeasibility cut (iis of type 0)
  • stable/0.4/Couenne/src/cut/crossconv/CouenneCrossConv.hpp

    r605 r946  
    1414#include "BonRegisteredOptions.hpp"
    1515
     16#include "CglConfig.h"
    1617#include "CglCutGenerator.hpp"
    1718#include "OsiRowCut.hpp"
     
    158159    virtual void generateCuts (const OsiSolverInterface &,
    159160                       OsiCuts &,
    160                        const CglTreeInfo = CglTreeInfo ()) const;
     161                       const CglTreeInfo = CglTreeInfo ())
     162#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     163    const
     164#endif
     165    ;
    161166
    162167    /// Add list of options to be read from file
  • stable/0.4/Couenne/src/cut/crossconv/CrossConvGenCuts.cpp

    r490 r946  
    1717void CouenneCrossConv::generateCuts (const OsiSolverInterface &,
    1818                                     OsiCuts &,
    19                                      const CglTreeInfo) const {
     19                                     const CglTreeInfo)
     20#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     21   const
     22#endif
     23{
    2024
    2125}
  • stable/0.4/Couenne/src/disjunctive/CouenneDisjCuts.hpp

    r490 r946  
    1515
    1616#include "OsiSolverInterface.hpp"
     17#include "CglConfig.h"
    1718#include "CglCutGenerator.hpp"
    1819#include "BonOsiTMINLPInterface.hpp"
     
    118119  void generateCuts (const OsiSolverInterface &,
    119120                     OsiCuts &,
    120                      const CglTreeInfo = CglTreeInfo ()) const;
     121                     const CglTreeInfo = CglTreeInfo ())
     122#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     123  const
     124#endif
     125  ;
    121126
    122127  /// Add list of options to be read from file
  • stable/0.4/Couenne/src/disjunctive/generateDisjCuts.cpp

    r694 r946  
    2323void CouenneDisjCuts::generateCuts (const OsiSolverInterface &si,
    2424                                    OsiCuts &cs,
    25                                     const CglTreeInfo info) const {
     25                                    const CglTreeInfo info)
     26#if CGL_VERSION_MAJOR == 0 && CGL_VERSION_MINOR <= 57
     27  const
     28#endif
     29{
    2630
    2731  // Check if cs contains only one cut and if it is of the form 1 <=
  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/heuristics/BonNlpHeuristic.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.