diff -r c35afa9e89e7 -r ef88c0a30f85 lemon/clp.h --- a/lemon/clp.h Mon Jan 12 23:11:39 2009 +0100 +++ b/lemon/clp.h Thu Nov 05 15:48:01 2009 +0100 @@ -56,6 +56,11 @@ /// \e ~ClpLp(); + /// \e + virtual ClpLp* newSolver() const; + /// \e + virtual ClpLp* cloneSolver() const; + protected: mutable double* _primal_ray; @@ -66,13 +71,11 @@ protected: - virtual ClpLp* _newSolver() const; - virtual ClpLp* _cloneSolver() const; - virtual const char* _solverName() const; virtual int _addCol(); virtual int _addRow(); + virtual int _addRow(Value l, ExprIterator b, ExprIterator e, Value u); virtual void _eraseCol(int i); virtual void _eraseRow(int i); @@ -134,6 +137,8 @@ virtual void _clear(); + virtual void _messageLevel(MessageLevel); + public: ///Solves LP with primal simplex method. @@ -151,26 +156,6 @@ ///Returns the variable identifier understood by CLP. int clpCol(Col c) const { return cols(id(c)); } - ///Enum for \c messageLevel() parameter - enum MessageLevel { - /// no output (default value) - MESSAGE_NO_OUTPUT = 0, - /// print final solution - MESSAGE_FINAL_SOLUTION = 1, - /// print factorization - MESSAGE_FACTORIZATION = 2, - /// normal output - MESSAGE_NORMAL_OUTPUT = 3, - /// verbose output - MESSAGE_VERBOSE_OUTPUT = 4 - }; - ///Set the verbosity of the messages - - ///Set the verbosity of the messages - /// - ///\param m is the level of the messages output by the solver routines. - void messageLevel(MessageLevel m); - }; } //END OF NAMESPACE LEMON