Structure updated and intqpipopt files added

1 files changed, 0 insertions, 116 deletions

diff --git a/build/Bonmin/include/coin/BonOaNlpOptim.hpp b/build/Bonmin/include/coin/BonOaNlpOptim.hpp
deleted file mode 100644
index c157b66..0000000
--- a/build/Bonmin/include/coin/BonOaNlpOptim.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// (C) Copyright Carnegie Mellon University 2005, 2006
-// All Rights Reserved.
-// This code is published under the Eclipse Public License.
-//
-// Authors :
-// P. Bonami, Carnegie Mellon University
-//
-// Date :  05/26/2005
-
-#ifndef BonOaNlpOptim_HPP
-#define BonOaNlpOptim_HPP
-#include "CglCutGenerator.hpp"
-#include "BonOsiTMINLPInterface.hpp"
-#include "BonOAMessages.hpp"
-#include "BonBabSetupBase.hpp"
-namespace Bonmin
-{
-  /** Generate cuts for the nlp corresponding to continuous relaxation at a node.*/
-  class OaNlpOptim : public CglCutGenerator
-  {
-  public:
-    /// Default constructor
-    OaNlpOptim(OsiTMINLPInterface * si = NULL,
-        int maxDepth = 10, bool addOnlyViolated = false,
-        bool globalCuts = true);
-
-    /// Constructor with basic setup
-    OaNlpOptim(BabSetupBase &b);
-    /// Copy constructor
-    OaNlpOptim(const OaNlpOptim &copy)
-        :
-        CglCutGenerator(copy),
-        nlp_(copy.nlp_),
-        maxDepth_(copy.maxDepth_),
-        nSolve_(0),
-        addOnlyViolated_(copy.addOnlyViolated_),
-        global_(copy.global_),
-	solves_per_level_(copy.solves_per_level_)
-    {
-      handler_ = new CoinMessageHandler();
-      handler_ -> setLogLevel(copy.handler_->logLevel());
-      messages_ = OaMessages();
-    }
-    void passInMessageHandler(const CoinMessageHandler * handler)
-    {
-      delete handler_;
-      handler_ = handler->clone();
-    }
-    ///Abstract constructor
-    virtual CglCutGenerator * clone() const
-    {
-      return new OaNlpOptim(*this);
-    }
-
-    /** Desctructor */
-    virtual ~OaNlpOptim()
-    {
-      if (handler_)
-        delete handler_;
-    }
-
-    /// Assign an OsiTMINLPInterface
-    void assignInterface(OsiTMINLPInterface * si);
-    /// cut generation method
-    virtual void generateCuts( const OsiSolverInterface & si, OsiCuts & cs,
-        const CglTreeInfo info);
-
-
-
-    inline void setMaxDepth(int value)
-    {
-      maxDepth_ = value;
-    }
-    inline void setAddOnlyViolated(bool yesno)
-    {
-      addOnlyViolated_ = yesno;
-    }
-    inline void setGlobalCuts(bool yesno)
-    {
-      global_ = yesno;
-    }
-    inline int getNSolve()
-    {
-      return nSolve_;
-    }
-    /**set log level */
-    void setLogLevel(int value)
-    {
-      handler_->setLogLevel(value);
-    }
-
-    /** Register OaNlpOptim options.*/
-    static void registerOptions(Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions);
-
-  private:
-    /// Pointer to the Ipopt interface
-    OsiTMINLPInterface * nlp_;
-
-    /** maximum depth at which generate cuts*/
-    int maxDepth_;
-
-    ///Number of NLP resolution done
-    mutable int nSolve_;
-    /** messages handler. */
-    CoinMessageHandler * handler_;
-    /** handler */
-    CoinMessages messages_;
-    /** Add only violated cuts?*/
-    bool addOnlyViolated_;
-    /** Add cuts as global?*/
-    bool global_;
-    /** Average number of nodes per level in tree */
-    double solves_per_level_;
-  };
-}
-#endif