1.1 --- a/lemon/glpk.h	Sat Apr 18 21:54:30 2009 +0200
     1.2 +++ b/lemon/glpk.h	Tue Apr 21 10:34:49 2009 +0100
     1.3 @@ -100,6 +100,8 @@
     1.4  
     1.5      virtual void _clear();
     1.6  
     1.7 +    virtual void _messageLevel(MessageLevel level);
     1.8 +
     1.9    private:
    1.10  
    1.11      static void freeEnv();
    1.12 @@ -111,6 +113,10 @@
    1.13      };
    1.14      
    1.15      static FreeEnvHelper freeEnvHelper;
    1.16 +
    1.17 +  protected:
    1.18 +    
    1.19 +    int _message_level;
    1.20      
    1.21    public:
    1.22  
    1.23 @@ -191,30 +197,6 @@
    1.24      ///The presolver is off by default.
    1.25      void presolver(bool presolve);
    1.26  
    1.27 -    ///Enum for \c messageLevel() parameter
    1.28 -    enum MessageLevel {
    1.29 -      /// no output (default value)
    1.30 -      MESSAGE_NO_OUTPUT = 0,
    1.31 -      /// error messages only
    1.32 -      MESSAGE_ERROR_MESSAGE = 1,
    1.33 -      /// normal output
    1.34 -      MESSAGE_NORMAL_OUTPUT = 2,
    1.35 -      /// full output (includes informational messages)
    1.36 -      MESSAGE_FULL_OUTPUT = 3
    1.37 -    };
    1.38 -
    1.39 -  private:
    1.40 -
    1.41 -    MessageLevel _message_level;
    1.42 -
    1.43 -  public:
    1.44 -
    1.45 -    ///Set the verbosity of the messages
    1.46 -
    1.47 -    ///Set the verbosity of the messages
    1.48 -    ///
    1.49 -    ///\param m is the level of the messages output by the solver routines.
    1.50 -    void messageLevel(MessageLevel m);
    1.51    };
    1.52  
    1.53    /// \brief Interface for the GLPK MIP solver
    1.54 @@ -244,30 +226,6 @@
    1.55      virtual Value _getSol(int i) const;
    1.56      virtual Value _getSolValue() const;
    1.57  
    1.58 -    ///Enum for \c messageLevel() parameter
    1.59 -    enum MessageLevel {
    1.60 -      /// no output (default value)
    1.61 -      MESSAGE_NO_OUTPUT = 0,
    1.62 -      /// error messages only
    1.63 -      MESSAGE_ERROR_MESSAGE = 1,
    1.64 -      /// normal output
    1.65 -      MESSAGE_NORMAL_OUTPUT = 2,
    1.66 -      /// full output (includes informational messages)
    1.67 -      MESSAGE_FULL_OUTPUT = 3
    1.68 -    };
    1.69 -
    1.70 -  private:
    1.71 -
    1.72 -    MessageLevel _message_level;
    1.73 -
    1.74 -  public:
    1.75 -
    1.76 -    ///Set the verbosity of the messages
    1.77 -
    1.78 -    ///Set the verbosity of the messages
    1.79 -    ///
    1.80 -    ///\param m is the level of the messages output by the solver routines.
    1.81 -    void messageLevel(MessageLevel m);
    1.82    };
    1.83  
    1.84