1.1 --- a/lemon/lp.h	Fri Jul 20 17:09:01 2012 +0200
     1.2 +++ b/lemon/lp.h	Sat May 25 06:59:31 2013 +0200
     1.3 @@ -59,32 +59,31 @@
     1.4    ///The default MIP solver identifier.
     1.5    ///\ingroup lp_group
     1.6    ///
     1.7 -  ///Currently, the possible values are \c GLPK or \c CPLEX
     1.8 +  ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
     1.9  #define LEMON_DEFAULT_MIP SOLVER
    1.10    ///The default MIP solver.
    1.11  
    1.12    ///The default MIP solver.
    1.13    ///\ingroup lp_group
    1.14    ///
    1.15 -  ///Currently, it is either \c GlpkMip or \c CplexMip
    1.16 +  ///Currently, it is either \c GlpkMip, \c CplexMip , \c CbcMip
    1.17    typedef GlpkMip Mip;
    1.18  #else
    1.19 -#ifdef LEMON_HAVE_GLPK
    1.20 -# define LEMON_DEFAULT_LP GLPK
    1.21 +#if LEMON_DEFAULT_LP == GLPK
    1.22    typedef GlpkLp Lp;
    1.23 -# define LEMON_DEFAULT_MIP GLPK
    1.24 -  typedef GlpkMip Mip;
    1.25 -#elif LEMON_HAVE_CPLEX
    1.26 -# define LEMON_DEFAULT_LP CPLEX
    1.27 +#elif LEMON_DEFAULT_LP == CPLEX
    1.28    typedef CplexLp Lp;
    1.29 -# define LEMON_DEFAULT_MIP CPLEX
    1.30 +#elif LEMON_DEFAULT_LP == SOPLEX
    1.31 +  typedef SoplexLp Lp;
    1.32 +#elif LEMON_DEFAULT_LP == CLP
    1.33 +  typedef ClpLp Lp;
    1.34 +#endif
    1.35 +#if LEMON_DEFAULT_MIP == GLPK
    1.36 +  typedef GlpkLp Mip;
    1.37 +#elif LEMON_DEFAULT_MIP == CPLEX
    1.38    typedef CplexMip Mip;
    1.39 -#elif LEMON_HAVE_SOPLEX
    1.40 -# define DEFAULT_LP SOPLEX
    1.41 -  typedef SoplexLp Lp;
    1.42 -#elif LEMON_HAVE_CLP
    1.43 -# define DEFAULT_LP CLP
    1.44 -  typedef ClpLp Lp;
    1.45 +#elif LEMON_DEFAULT_MIP == CBC
    1.46 +  typedef CbcMip Mip;
    1.47  #endif
    1.48  #endif
    1.49