Ignore:
Timestamp:
Mar 13, 2009 6:39:24 AM (12 years ago)
Author:
stefan
Message:

merge changeset 70 from trunk into stable: compile Couenne library without ASL

Location:
stable/0.1/Couenne
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.1/Couenne

  • stable/0.1/Couenne/src/main/BonCouenneInterface.hpp

    r1 r77  
    1111#ifndef CouenneInterface_H
    1212#define CouenneInterface_H
    13 #include "BonAmplInterface.hpp"
     13
    1414#include "CouenneCutGenerator.hpp"
    1515
     16#ifdef COIN_HAS_ASL
     17#include "BonAmplInterface.hpp"
    1618
    1719struct ASL;
    18 
    1920struct ASL *readASLfg (char **);
    20 
     21#else
     22#define AmplInterface OsiTMINLPInterface
     23#endif
    2124
    2225namespace Bonmin {
     
    3639  virtual ~CouenneInterface();
    3740
    38    
     41#ifdef COIN_HAS_ASL   
    3942  /** read ampl file using inputed options, journalist....*/
    4043  virtual void readAmplNlFile(char **& argv, Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions,
    4144                              Ipopt::SmartPtr<Ipopt::OptionsList> options,
    4245                              Ipopt::SmartPtr<Ipopt::Journalist> journalist);
    43  
     46#endif
    4447  /** \name Overloaded methods to build outer approximations */
    4548  //@{
Note: See TracChangeset for help on using the changeset viewer.