1.1 --- a/lemon/glpk.h Mon Jan 12 12:26:01 2009 +0000
1.2 +++ b/lemon/glpk.h Mon Jan 12 12:26:02 2009 +0000
1.3 @@ -119,13 +119,13 @@
1.4 ///
1.5 /// This class implements an interface for the GLPK LP solver.
1.6 ///\ingroup lp_group
1.7 - class LpGlpk : public GlpkBase, public LpSolver {
1.8 + class GlpkLp : public GlpkBase, public LpSolver {
1.9 public:
1.10
1.11 ///\e
1.12 - LpGlpk();
1.13 + GlpkLp();
1.14 ///\e
1.15 - LpGlpk(const LpGlpk&);
1.16 + GlpkLp(const GlpkLp&);
1.17
1.18 private:
1.19
1.20 @@ -136,8 +136,8 @@
1.21
1.22 protected:
1.23
1.24 - virtual LpGlpk* _cloneSolver() const;
1.25 - virtual LpGlpk* _newSolver() const;
1.26 + virtual GlpkLp* _cloneSolver() const;
1.27 + virtual GlpkLp* _newSolver() const;
1.28
1.29 virtual const char* _solverName() const;
1.30
1.31 @@ -203,18 +203,18 @@
1.32 ///
1.33 /// This class implements an interface for the GLPK MIP solver.
1.34 ///\ingroup lp_group
1.35 - class MipGlpk : public GlpkBase, public MipSolver {
1.36 + class GlpkMip : public GlpkBase, public MipSolver {
1.37 public:
1.38
1.39 ///\e
1.40 - MipGlpk();
1.41 + GlpkMip();
1.42 ///\e
1.43 - MipGlpk(const MipGlpk&);
1.44 + GlpkMip(const GlpkMip&);
1.45
1.46 protected:
1.47
1.48 - virtual MipGlpk* _cloneSolver() const;
1.49 - virtual MipGlpk* _newSolver() const;
1.50 + virtual GlpkMip* _cloneSolver() const;
1.51 + virtual GlpkMip* _newSolver() const;
1.52
1.53 virtual const char* _solverName() const;
1.54