1.1 --- a/lemon/cplex.h Thu Feb 26 09:39:02 2009 +0000
1.2 +++ b/lemon/cplex.h Thu Feb 26 07:39:16 2009 +0000
1.3 @@ -160,7 +160,7 @@
1.4 ///
1.5 /// This class implements an interface for the CPLEX LP solver.
1.6 ///\ingroup lp_group
1.7 - class CplexLp : public CplexBase, public LpSolver {
1.8 + class CplexLp : public LpSolver, public CplexBase {
1.9 public:
1.10 /// \e
1.11 CplexLp();
1.12 @@ -171,6 +171,11 @@
1.13 /// \e
1.14 virtual ~CplexLp();
1.15
1.16 + /// \e
1.17 + virtual CplexLp* cloneSolver() const;
1.18 + /// \e
1.19 + virtual CplexLp* newSolver() const;
1.20 +
1.21 private:
1.22
1.23 // these values cannot retrieved element by element
1.24 @@ -186,9 +191,6 @@
1.25
1.26 protected:
1.27
1.28 - virtual CplexLp* _cloneSolver() const;
1.29 - virtual CplexLp* _newSolver() const;
1.30 -
1.31 virtual const char* _solverName() const;
1.32
1.33 virtual SolveExitStatus _solve();
1.34 @@ -222,7 +224,7 @@
1.35 ///
1.36 /// This class implements an interface for the CPLEX MIP solver.
1.37 ///\ingroup lp_group
1.38 - class CplexMip : public CplexBase, public MipSolver {
1.39 + class CplexMip : public MipSolver, public CplexBase {
1.40 public:
1.41 /// \e
1.42 CplexMip();