diff -r 08d495d48089 -r 9b082b3fb33f lemon/glpk.h --- a/lemon/glpk.h Mon Jan 12 12:26:01 2009 +0000 +++ b/lemon/glpk.h Mon Jan 12 12:26:02 2009 +0000 @@ -119,13 +119,13 @@ /// /// This class implements an interface for the GLPK LP solver. ///\ingroup lp_group - class LpGlpk : public GlpkBase, public LpSolver { + class GlpkLp : public GlpkBase, public LpSolver { public: ///\e - LpGlpk(); + GlpkLp(); ///\e - LpGlpk(const LpGlpk&); + GlpkLp(const GlpkLp&); private: @@ -136,8 +136,8 @@ protected: - virtual LpGlpk* _cloneSolver() const; - virtual LpGlpk* _newSolver() const; + virtual GlpkLp* _cloneSolver() const; + virtual GlpkLp* _newSolver() const; virtual const char* _solverName() const; @@ -203,18 +203,18 @@ /// /// This class implements an interface for the GLPK MIP solver. ///\ingroup lp_group - class MipGlpk : public GlpkBase, public MipSolver { + class GlpkMip : public GlpkBase, public MipSolver { public: ///\e - MipGlpk(); + GlpkMip(); ///\e - MipGlpk(const MipGlpk&); + GlpkMip(const GlpkMip&); protected: - virtual MipGlpk* _cloneSolver() const; - virtual MipGlpk* _newSolver() const; + virtual GlpkMip* _cloneSolver() const; + virtual GlpkMip* _newSolver() const; virtual const char* _solverName() const;