Ignore:
Timestamp:
May 31, 2010 4:36:37 PM (10 years ago)
Author:
pbelotti
Message:

Added Couenne namespace. Committed old code for Feas Pump. Added code for ellipsoid cuts. Added (empty) CouenneMINLPInterface that might replace AMPL interface to Ipopt. Fixed a few warnings. Solved a few namespace problems due to ambiguity in Bonmin and AMPL. Added (empty) code for sdp cuts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenneInfo.cpp

    r154 r349  
    1111#include "BonCouenneInfo.hpp"
    1212
    13 namespace Bonmin
     13using namespace Couenne;
     14
     15
     16/** Default constructor.*/
     17CouenneInfo::CouenneInfo(int type):
     18  BabInfo(type)
     19{}
     20
     21/** Constructor from OsiBabSolver.*/
     22CouenneInfo::CouenneInfo(const OsiBabSolver &other):
     23  BabInfo(other)
     24{}
     25
     26/** Copy constructor.*/
     27CouenneInfo::CouenneInfo(const CouenneInfo &other):
     28  BabInfo(other)
     29{}
     30
     31/** Destructor.*/
     32CouenneInfo::~CouenneInfo()
     33{}
     34
     35/** Virtual copy constructor.*/
     36OsiAuxInfo *
     37CouenneInfo::clone() const
    1438{
    15   /** Default constructor.*/
    16   CouenneInfo::CouenneInfo(int type):
    17       BabInfo(type)
    18   {}
     39  return new CouenneInfo(*this);
     40}
    1941
    20   /** Constructor from OsiBabSolver.*/
    21   CouenneInfo::CouenneInfo(const OsiBabSolver &other):
    22       BabInfo(other)
    23   {}
     42CouenneInfo::NlpSolution::NlpSolution(int n, const double* sol, double objval)
     43  :
     44  n_(n),
     45  objVal_(objval)
     46{
     47  sol_ = new double[n];
     48  CoinCopyN(sol, n, sol_);
     49}
    2450
    25   /** Copy constructor.*/
    26   CouenneInfo::CouenneInfo(const CouenneInfo &other):
    27       BabInfo(other)
    28   {}
    29 
    30   /** Destructor.*/
    31   CouenneInfo::~CouenneInfo()
    32   {}
    33 
    34   /** Virtual copy constructor.*/
    35   OsiAuxInfo *
    36   CouenneInfo::clone() const
    37   {
    38     return new CouenneInfo(*this);
    39   }
    40 
    41   CouenneInfo::NlpSolution::NlpSolution(int n, const double* sol, double objval)
    42     :
    43     n_(n),
    44     objVal_(objval)
    45   {
    46     sol_ = new double[n];
    47     CoinCopyN(sol, n, sol_);
    48   }
    49 
    50   CouenneInfo::NlpSolution::~NlpSolution()
    51   {
    52     delete [] sol_;
    53   }
    54 }/* end namespace Bonmin*/
    55 
     51CouenneInfo::NlpSolution::~NlpSolution()
     52{
     53  delete [] sol_;
     54}
Note: See TracChangeset for help on using the changeset viewer.