1.1 --- a/lemon/cplex.h	Mon Jan 12 12:26:01 2009 +0000
     1.2 +++ b/lemon/cplex.h	Mon Jan 12 12:26:02 2009 +0000
     1.3 @@ -160,16 +160,16 @@
     1.4    ///
     1.5    /// This class implements an interface for the CPLEX LP solver.
     1.6    ///\ingroup lp_group
     1.7 -  class LpCplex : public CplexBase, public LpSolver {
     1.8 +  class CplexLp : public CplexBase, public LpSolver {
     1.9    public:
    1.10      /// \e
    1.11 -    LpCplex();
    1.12 +    CplexLp();
    1.13      /// \e
    1.14 -    LpCplex(const CplexEnv&);
    1.15 +    CplexLp(const CplexEnv&);
    1.16      /// \e
    1.17 -    LpCplex(const LpCplex&);
    1.18 +    CplexLp(const CplexLp&);
    1.19      /// \e
    1.20 -    virtual ~LpCplex();
    1.21 +    virtual ~CplexLp();
    1.22  
    1.23    private:
    1.24  
    1.25 @@ -186,8 +186,8 @@
    1.26  
    1.27    protected:
    1.28  
    1.29 -    virtual LpCplex* _cloneSolver() const;
    1.30 -    virtual LpCplex* _newSolver() const;
    1.31 +    virtual CplexLp* _cloneSolver() const;
    1.32 +    virtual CplexLp* _newSolver() const;
    1.33  
    1.34      virtual const char* _solverName() const;
    1.35  
    1.36 @@ -222,21 +222,21 @@
    1.37    ///
    1.38    /// This class implements an interface for the CPLEX MIP solver.
    1.39    ///\ingroup lp_group
    1.40 -  class MipCplex : public CplexBase, public MipSolver {
    1.41 +  class CplexMip : public CplexBase, public MipSolver {
    1.42    public:
    1.43      /// \e
    1.44 -    MipCplex();
    1.45 +    CplexMip();
    1.46      /// \e
    1.47 -    MipCplex(const CplexEnv&);
    1.48 +    CplexMip(const CplexEnv&);
    1.49      /// \e
    1.50 -    MipCplex(const MipCplex&);
    1.51 +    CplexMip(const CplexMip&);
    1.52      /// \e
    1.53 -    virtual ~MipCplex();
    1.54 +    virtual ~CplexMip();
    1.55  
    1.56    protected:
    1.57  
    1.58 -    virtual MipCplex* _cloneSolver() const;
    1.59 -    virtual MipCplex* _newSolver() const;
    1.60 +    virtual CplexMip* _cloneSolver() const;
    1.61 +    virtual CplexMip* _newSolver() const;
    1.62  
    1.63      virtual const char* _solverName() const;
    1.64