1.1 --- a/lemon/lp.h Tue Apr 08 15:41:56 2014 +0200
1.2 +++ b/lemon/lp.h Tue Apr 08 15:43:12 2014 +0200
1.3 @@ -45,8 +45,8 @@
1.4 ///The default LP solver identifier.
1.5 ///\ingroup lp_group
1.6 ///
1.7 - ///Currently, the possible values are \c GLPK, \c CPLEX,
1.8 - ///\c SOPLEX or \c CLP
1.9 + ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
1.10 + ///\c _LEMON_SOPLEX or \c LEMON__CLP
1.11 #define LEMON_DEFAULT_LP SOLVER
1.12 ///The default LP solver
1.13
1.14 @@ -61,7 +61,8 @@
1.15 ///The default MIP solver identifier.
1.16 ///\ingroup lp_group
1.17 ///
1.18 - ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
1.19 + ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
1.20 + ///or \c _LEMON_CBC
1.21 #define LEMON_DEFAULT_MIP SOLVER
1.22 ///The default MIP solver.
1.23
1.24 @@ -71,20 +72,20 @@
1.25 ///Currently, it is either \c GlpkMip, \c CplexMip , \c CbcMip
1.26 typedef GlpkMip Mip;
1.27 #else
1.28 -#if LEMON_DEFAULT_LP == GLPK
1.29 +#if LEMON_DEFAULT_LP == _LEMON_GLPK
1.30 typedef GlpkLp Lp;
1.31 -#elif LEMON_DEFAULT_LP == CPLEX
1.32 +#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
1.33 typedef CplexLp Lp;
1.34 -#elif LEMON_DEFAULT_LP == SOPLEX
1.35 +#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
1.36 typedef SoplexLp Lp;
1.37 -#elif LEMON_DEFAULT_LP == CLP
1.38 +#elif LEMON_DEFAULT_LP == _LEMON_CLP
1.39 typedef ClpLp Lp;
1.40 #endif
1.41 -#if LEMON_DEFAULT_MIP == GLPK
1.42 +#if LEMON_DEFAULT_MIP == _LEMON_GLPK
1.43 typedef GlpkMip Mip;
1.44 -#elif LEMON_DEFAULT_MIP == CPLEX
1.45 +#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
1.46 typedef CplexMip Mip;
1.47 -#elif LEMON_DEFAULT_MIP == CBC
1.48 +#elif LEMON_DEFAULT_MIP == _LEMON_CBC
1.49 typedef CbcMip Mip;
1.50 #endif
1.51 #endif