1.1 --- a/lemon/clp.h	Mon Jan 12 23:11:39 2009 +0100
     1.2 +++ b/lemon/clp.h	Thu Nov 05 15:48:01 2009 +0100
     1.3 @@ -56,6 +56,11 @@
     1.4      /// \e
     1.5      ~ClpLp();
     1.6  
     1.7 +    /// \e
     1.8 +    virtual ClpLp* newSolver() const;
     1.9 +    /// \e
    1.10 +    virtual ClpLp* cloneSolver() const;
    1.11 +
    1.12    protected:
    1.13  
    1.14      mutable double* _primal_ray;
    1.15 @@ -66,13 +71,11 @@
    1.16  
    1.17    protected:
    1.18  
    1.19 -    virtual ClpLp* _newSolver() const;
    1.20 -    virtual ClpLp* _cloneSolver() const;
    1.21 -
    1.22      virtual const char* _solverName() const;
    1.23  
    1.24      virtual int _addCol();
    1.25      virtual int _addRow();
    1.26 +    virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u);
    1.27  
    1.28      virtual void _eraseCol(int i);
    1.29      virtual void _eraseRow(int i);
    1.30 @@ -134,6 +137,8 @@
    1.31  
    1.32      virtual void _clear();
    1.33  
    1.34 +    virtual void _messageLevel(MessageLevel);
    1.35 +    
    1.36    public:
    1.37  
    1.38      ///Solves LP with primal simplex method.
    1.39 @@ -151,26 +156,6 @@
    1.40      ///Returns the variable identifier understood by CLP.
    1.41      int clpCol(Col c) const { return cols(id(c)); }
    1.42  
    1.43 -    ///Enum for \c messageLevel() parameter
    1.44 -    enum MessageLevel {
    1.45 -      /// no output (default value)
    1.46 -      MESSAGE_NO_OUTPUT = 0,
    1.47 -      /// print final solution
    1.48 -      MESSAGE_FINAL_SOLUTION = 1,
    1.49 -      /// print factorization
    1.50 -      MESSAGE_FACTORIZATION = 2,
    1.51 -      /// normal output
    1.52 -      MESSAGE_NORMAL_OUTPUT = 3,
    1.53 -      /// verbose output
    1.54 -      MESSAGE_VERBOSE_OUTPUT = 4
    1.55 -    };
    1.56 -    ///Set the verbosity of the messages
    1.57 -
    1.58 -    ///Set the verbosity of the messages
    1.59 -    ///
    1.60 -    ///\param m is the level of the messages output by the solver routines.
    1.61 -    void messageLevel(MessageLevel m);
    1.62 -
    1.63    };
    1.64  
    1.65  } //END OF NAMESPACE LEMON