lemon/lp.h
changeset 485 9b082b3fb33f
parent 484 08d495d48089
child 674 20dac2104519
     1.1 --- a/lemon/lp.h	Mon Jan 12 12:26:01 2009 +0000
     1.2 +++ b/lemon/lp.h	Mon Jan 12 12:26:02 2009 +0000
     1.3 @@ -51,8 +51,8 @@
     1.4    ///The default LP solver.
     1.5    ///\ingroup lp_group
     1.6    ///
     1.7 -  ///Currently, it is either \c LpGlpk, \c LpCplex, \c LpSoplex or \c LpClp
     1.8 -  typedef LpGlpk Lp;
     1.9 +  ///Currently, it is either \c GlpkLp, \c CplexLp, \c SoplexLp or \c ClpLp
    1.10 +  typedef GlpkLp Lp;
    1.11  
    1.12    ///The default MIP solver identifier
    1.13  
    1.14 @@ -66,25 +66,25 @@
    1.15    ///The default MIP solver.
    1.16    ///\ingroup lp_group
    1.17    ///
    1.18 -  ///Currently, it is either \c MipGlpk or \c MipCplex
    1.19 -  typedef MipGlpk Mip;
    1.20 +  ///Currently, it is either \c GlpkMip or \c CplexMip
    1.21 +  typedef GlpkMip Mip;
    1.22  #else
    1.23  #ifdef HAVE_GLPK
    1.24  # define LEMON_DEFAULT_LP GLPK
    1.25 -  typedef LpGlpk Lp;
    1.26 +  typedef GlpkLp Lp;
    1.27  # define LEMON_DEFAULT_MIP GLPK
    1.28 -  typedef MipGlpk Mip;
    1.29 +  typedef GlpkMip Mip;
    1.30  #elif HAVE_CPLEX
    1.31  # define LEMON_DEFAULT_LP CPLEX
    1.32 -  typedef LpCplex Lp;
    1.33 +  typedef CplexLp Lp;
    1.34  # define LEMON_DEFAULT_MIP CPLEX
    1.35 -  typedef MipCplex Mip;
    1.36 +  typedef CplexMip Mip;
    1.37  #elif HAVE_SOPLEX
    1.38  # define DEFAULT_LP SOPLEX
    1.39 -  typedef LpSoplex Lp;
    1.40 +  typedef SoplexLp Lp;
    1.41  #elif HAVE_CLP
    1.42  # define DEFAULT_LP CLP
    1.43 -  typedef LpClp Lp;  
    1.44 +  typedef ClpLp Lp;  
    1.45  #endif
    1.46  #endif
    1.47