1.1 --- a/lemon/glpk.h Thu Feb 26 09:39:02 2009 +0000
1.2 +++ b/lemon/glpk.h Thu Feb 26 07:39:16 2009 +0000
1.3 @@ -119,7 +119,7 @@
1.4 ///
1.5 /// This class implements an interface for the GLPK LP solver.
1.6 ///\ingroup lp_group
1.7 - class GlpkLp : public GlpkBase, public LpSolver {
1.8 + class GlpkLp : public LpSolver, public GlpkBase {
1.9 public:
1.10
1.11 ///\e
1.12 @@ -127,6 +127,11 @@
1.13 ///\e
1.14 GlpkLp(const GlpkLp&);
1.15
1.16 + ///\e
1.17 + virtual GlpkLp* cloneSolver() const;
1.18 + ///\e
1.19 + virtual GlpkLp* newSolver() const;
1.20 +
1.21 private:
1.22
1.23 mutable std::vector<double> _primal_ray;
1.24 @@ -136,9 +141,6 @@
1.25
1.26 protected:
1.27
1.28 - virtual GlpkLp* _cloneSolver() const;
1.29 - virtual GlpkLp* _newSolver() const;
1.30 -
1.31 virtual const char* _solverName() const;
1.32
1.33 virtual SolveExitStatus _solve();
1.34 @@ -203,7 +205,7 @@
1.35 ///
1.36 /// This class implements an interface for the GLPK MIP solver.
1.37 ///\ingroup lp_group
1.38 - class GlpkMip : public GlpkBase, public MipSolver {
1.39 + class GlpkMip : public MipSolver, public GlpkBase {
1.40 public:
1.41
1.42 ///\e
1.43 @@ -211,11 +213,11 @@
1.44 ///\e
1.45 GlpkMip(const GlpkMip&);
1.46
1.47 + virtual GlpkMip* cloneSolver() const;
1.48 + virtual GlpkMip* newSolver() const;
1.49 +
1.50 protected:
1.51
1.52 - virtual GlpkMip* _cloneSolver() const;
1.53 - virtual GlpkMip* _newSolver() const;
1.54 -
1.55 virtual const char* _solverName() const;
1.56
1.57 virtual ColTypes _getColType(int col) const;