1.1 --- a/lemon/lp.h	Mon Jan 12 12:25:55 2009 +0000
     1.2 +++ b/lemon/lp.h	Mon Jan 12 12:26:01 2009 +0000
     1.3 @@ -23,13 +23,13 @@
     1.4  
     1.5  
     1.6  #ifdef HAVE_GLPK
     1.7 -#include <lemon/lp_glpk.h>
     1.8 +#include <lemon/glpk.h>
     1.9  #elif HAVE_CPLEX
    1.10 -#include <lemon/lp_cplex.h>
    1.11 +#include <lemon/cplex.h>
    1.12  #elif HAVE_SOPLEX
    1.13 -#include <lemon/lp_soplex.h>
    1.14 +#include <lemon/soplex.h>
    1.15  #elif HAVE_CLP
    1.16 -#include <lemon/lp_clp.h>
    1.17 +#include <lemon/clp.h>
    1.18  #endif
    1.19  
    1.20  ///\file
    1.21 @@ -43,8 +43,8 @@
    1.22    ///The default LP solver identifier.
    1.23    ///\ingroup lp_group
    1.24    ///
    1.25 -  ///Currently, the possible values are \c LP_GLPK, \c LP_CPLEX, \c
    1.26 -  ///LP_SOPLEX or \c LP_CLP
    1.27 +  ///Currently, the possible values are \c GLPK, \c CPLEX,
    1.28 +  ///\c SOPLEX or \c CLP
    1.29  #define LEMON_DEFAULT_LP SOLVER
    1.30    ///The default LP solver
    1.31  
    1.32 @@ -59,7 +59,7 @@
    1.33    ///The default MIP solver identifier.
    1.34    ///\ingroup lp_group
    1.35    ///
    1.36 -  ///Currently, the possible values are \c MIP_GLPK or \c MIP_CPLEX
    1.37 +  ///Currently, the possible values are \c GLPK or \c CPLEX
    1.38  #define LEMON_DEFAULT_MIP SOLVER
    1.39    ///The default MIP solver.
    1.40  
    1.41 @@ -70,20 +70,20 @@
    1.42    typedef MipGlpk Mip;
    1.43  #else
    1.44  #ifdef HAVE_GLPK
    1.45 -# define LEMON_DEFAULT_LP LP_GLPK
    1.46 +# define LEMON_DEFAULT_LP GLPK
    1.47    typedef LpGlpk Lp;
    1.48 -# define LEMON_DEFAULT_MIP MIP_GLPK
    1.49 +# define LEMON_DEFAULT_MIP GLPK
    1.50    typedef MipGlpk Mip;
    1.51  #elif HAVE_CPLEX
    1.52 -# define LEMON_DEFAULT_LP LP_CPLEX
    1.53 +# define LEMON_DEFAULT_LP CPLEX
    1.54    typedef LpCplex Lp;
    1.55 -# define LEMON_DEFAULT_MIP MIP_CPLEX
    1.56 +# define LEMON_DEFAULT_MIP CPLEX
    1.57    typedef MipCplex Mip;
    1.58  #elif HAVE_SOPLEX
    1.59 -# define DEFAULT_LP LP_SOPLEX
    1.60 +# define DEFAULT_LP SOPLEX
    1.61    typedef LpSoplex Lp;
    1.62  #elif HAVE_CLP
    1.63 -# define DEFAULT_LP LP_CLP
    1.64 +# define DEFAULT_LP CLP
    1.65    typedef LpClp Lp;  
    1.66  #endif
    1.67  #endif