1.1 --- a/lemon/lp.h Tue Dec 02 21:40:33 2008 +0100
1.2 +++ b/lemon/lp.h Tue Dec 02 22:48:28 2008 +0100
1.3 @@ -24,12 +24,12 @@
1.4
1.5 #ifdef HAVE_GLPK
1.6 #include <lemon/lp_glpk.h>
1.7 -#include <lemon/mip_glpk.h>
1.8 #elif HAVE_CPLEX
1.9 #include <lemon/lp_cplex.h>
1.10 -#include <lemon/mip_cplex.h>
1.11 #elif HAVE_SOPLEX
1.12 #include <lemon/lp_soplex.h>
1.13 +#elif HAVE_CLP
1.14 +#include <lemon/lp_clp.h>
1.15 #endif
1.16
1.17 ///\file
1.18 @@ -43,45 +43,48 @@
1.19 ///The default LP solver identifier.
1.20 ///\ingroup lp_group
1.21 ///
1.22 - ///Currently, the possible values are \c GLPK or \c CPLEX
1.23 -#define DEFAULT_LP SOLVER
1.24 + ///Currently, the possible values are \c LP_GLPK, \c LP_CPLEX, \c
1.25 + ///LP_SOPLEX or \c LP_CLP
1.26 +#define LEMON_DEFAULT_LP SOLVER
1.27 ///The default LP solver
1.28
1.29 ///The default LP solver.
1.30 ///\ingroup lp_group
1.31 ///
1.32 - ///Currently, it is either \c LpGlpk or \c LpCplex
1.33 + ///Currently, it is either \c LpGlpk, \c LpCplex, \c LpSoplex or \c LpClp
1.34 typedef LpGlpk Lp;
1.35 - ///The default LP solver identifier string
1.36
1.37 - ///The default LP solver identifier string.
1.38 + ///The default MIP solver identifier
1.39 +
1.40 + ///The default MIP solver identifier.
1.41 ///\ingroup lp_group
1.42 ///
1.43 - ///Currently, the possible values are "GLPK" or "CPLEX"
1.44 - const char default_solver_name[]="SOLVER";
1.45 + ///Currently, the possible values are \c MIP_GLPK or \c MIP_CPLEX
1.46 +#define LEMON_DEFAULT_MIP SOLVER
1.47 + ///The default MIP solver.
1.48
1.49 - ///The default ILP solver.
1.50 -
1.51 - ///The default ILP solver.
1.52 + ///The default MIP solver.
1.53 ///\ingroup lp_group
1.54 ///
1.55 - ///Currently, it is either \c LpGlpk or \c LpCplex
1.56 + ///Currently, it is either \c MipGlpk or \c MipCplex
1.57 typedef MipGlpk Mip;
1.58 #else
1.59 #ifdef HAVE_GLPK
1.60 -#define DEFAULT_LP GLPK
1.61 +# define LEMON_DEFAULT_LP LP_GLPK
1.62 typedef LpGlpk Lp;
1.63 +# define LEMON_DEFAULT_MIP MIP_GLPK
1.64 typedef MipGlpk Mip;
1.65 - const char default_solver_name[]="GLPK";
1.66 #elif HAVE_CPLEX
1.67 -#define DEFAULT_LP CPLEX
1.68 +# define LEMON_DEFAULT_LP LP_CPLEX
1.69 typedef LpCplex Lp;
1.70 +# define LEMON_DEFAULT_MIP MIP_CPLEX
1.71 typedef MipCplex Mip;
1.72 - const char default_solver_name[]="CPLEX";
1.73 #elif HAVE_SOPLEX
1.74 -#define DEFAULT_LP SOPLEX
1.75 +# define DEFAULT_LP LP_SOPLEX
1.76 typedef LpSoplex Lp;
1.77 - const char default_solver_name[]="SOPLEX";
1.78 +#elif HAVE_CLP
1.79 +# define DEFAULT_LP LP_CLP
1.80 + typedef LpClp Lp;
1.81 #endif
1.82 #endif
1.83