Ignore:
Timestamp:
Sep 29, 2006 4:48:36 PM (13 years ago)
Author:
pbonami
Message:

astyled the devel branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/BonminAmplInterface/BonAmplInterface.hpp

    r57 r62  
    44#include "BonAmplTMINLP.hpp"
    55
    6 namespace Bonmin {
    7 /** Class for providing an Osi interface to Ipopt with an ampl nl file as input. */
    8 class AmplInterface: public IpoptInterface
     6namespace Bonmin
    97{
     8  /** Class for providing an Osi interface to Ipopt with an ampl nl file as input. */
     9  class AmplInterface: public IpoptInterface
     10  {
    1011  public:
    11   /** Default constructor */
    12   AmplInterface();
    13   /** Constructor with inputed ampl command line (reads model from nl file)*/
    14   AmplInterface(char **& amplArgs);
    15   /** Copy constructor */
    16   AmplInterface(const AmplInterface &other);
    17   /// Clone
    18   virtual AmplInterface * clone(bool CopyData = true);
     12    /** Default constructor */
     13    AmplInterface();
     14    /** Constructor with inputed ampl command line (reads model from nl file)*/
     15    AmplInterface(char **& amplArgs);
     16    /** Copy constructor */
     17    AmplInterface(const AmplInterface &other);
     18    /// Clone
     19    virtual AmplInterface * clone(bool CopyData = true);
    1920
    20   ///Destructor
    21   virtual ~AmplInterface();
     21    ///Destructor
     22    virtual ~AmplInterface();
    2223
    23    /**@name Methods to input a problem */
    24   //@{
    25   /** Read an ampl . nl file from the given filename */
    26   virtual void readAmplNlFile(char**& filename,
    27       std::string* ipopt_file_content =NULL,
    28       std::string* nl_file_content = NULL);
    29   /** write ampl solution file */
    30   void writeAmplSolFile(std::string message,const double * primalSol = NULL,const double * dualSol = NULL);
    31   //@}
     24    /**@name Methods to input a problem */
     25    //@{
     26    /** Read an ampl . nl file from the given filename */
     27    virtual void readAmplNlFile(char**& filename,
     28        std::string* ipopt_file_content =NULL,
     29        std::string* nl_file_content = NULL);
     30    /** write ampl solution file */
     31    void writeAmplSolFile(std::string message,const double * primalSol = NULL,const double * dualSol = NULL);
     32    //@}
    3233
    33   /** Fast access to AmplTMINLP */
    34    const AmplTMINLP * amplModel() const
    35   {
    36     return GetRawPtr(amplTminlp_);
    37   }
    38  
     34    /** Fast access to AmplTMINLP */
     35    const AmplTMINLP * amplModel() const
     36    {
     37      return GetRawPtr(amplTminlp_);
     38    }
     39
    3940  protected:
    40    /** TMINLP problem (the original problem usually an AmplTMINLP).*/
    41   Ipopt::SmartPtr<Bonmin::AmplTMINLP> amplTminlp_;
    42 };
     41    /** TMINLP problem (the original problem usually an AmplTMINLP).*/
     42    Ipopt::SmartPtr<Bonmin::AmplTMINLP> amplTminlp_;
     43  };
    4344}
    4445#endif
Note: See TracChangeset for help on using the changeset viewer.