1.1 --- a/lemon/lp.h Mon Jul 17 07:30:56 2006 +0000
1.2 +++ b/lemon/lp.h Mon Jul 17 09:00:21 2006 +0000
1.3 @@ -23,6 +23,7 @@
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 #endif
1.11 @@ -54,10 +55,19 @@
1.12 ///
1.13 ///Currently, the possible values are "GLPK" or "CPLEX"
1.14 const char default_solver_name[]="SOLVER";
1.15 +
1.16 + ///The default ILP solver.
1.17 +
1.18 + ///The default ILP solver.
1.19 + ///\ingroup gen_opt_group
1.20 + ///
1.21 + ///Currently, it is either \c LpGlpk or \c LpCplex
1.22 + typedef MipGlpk Mip;
1.23 #else
1.24 #ifdef HAVE_GLPK
1.25 #define DEFAULT_LP GLPK
1.26 typedef LpGlpk Lp;
1.27 + typedef MipGlpk Mip;
1.28 const char default_solver_name[]="GLPK";
1.29 #elif HAVE_CPLEX
1.30 #define DEFAULT_LP CPLEX