Changes in lemon/cplex.h [623:745e182d0139:485:9b082b3fb33f] in lemon

File:

• lemon/cplex.h (modified) (8 diffs)

lemon/cplex.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2009
+ * Copyright (C) 2003-2008
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).
@@ -79 +79 @@
   ///
   /// This class implements the common interface of the CPLEX LP and
-  /// MIP solvers.
+  /// MIP solvers.  
   /// \ingroup lp_group
   class CplexBase : virtual public LpBase {
@@ -145 +145 @@
     virtual void _clear();
 
-    virtual void _messageLevel(MessageLevel level);
-    void _applyMessageLevel();
-
-    bool _message_enabled;
-
   public:
 
     /// Returns the used \c CplexEnv instance
     const CplexEnv& env() const { return _env; }
-
-    /// \brief Returns the const cpxenv pointer
     ///
-    /// \note The cpxenv might be destructed with the solver.
     const cpxenv* cplexEnv() const { return _env.cplexEnv(); }
 
-    /// \brief Returns the const cpxenv pointer
-    ///
-    /// \note The cpxenv might be destructed with the solver.
-    cpxenv* cplexEnv() { return _env.cplexEnv(); }
-
-    /// Returns the cplex problem object
     cpxlp* cplexLp() { return _prob; }
-    /// Returns the cplex problem object
     const cpxlp* cplexLp() const { return _prob; }
 
@@ -176 +161 @@
   /// This class implements an interface for the CPLEX LP solver.
   ///\ingroup lp_group
-  class CplexLp : public LpSolver, public CplexBase {
+  class CplexLp : public CplexBase, public LpSolver {
   public:
     /// \e
@@ -186 +171 @@
     /// \e
     virtual ~CplexLp();
-
-    /// \e
-    virtual CplexLp* cloneSolver() const;
-    /// \e
-    virtual CplexLp* newSolver() const;
 
   private:
@@ -206 +186 @@
 
   protected:
+
+    virtual CplexLp* _cloneSolver() const;
+    virtual CplexLp* _newSolver() const;
 
     virtual const char* _solverName() const;
@@ -240 +223 @@
   /// This class implements an interface for the CPLEX MIP solver.
   ///\ingroup lp_group
-  class CplexMip : public MipSolver, public CplexBase {
+  class CplexMip : public CplexBase, public MipSolver {
   public:
     /// \e
@@ -251 +234 @@
     virtual ~CplexMip();
 
-    /// \e
-    virtual CplexMip* cloneSolver() const;
-    /// \e
-    virtual CplexMip* newSolver() const;
-
-  protected:
-
+  protected:
+
+    virtual CplexMip* _cloneSolver() const;
+    virtual CplexMip* _newSolver() const;
 
     virtual const char* _solverName() const;