Changeset 1108:e00d7b681d8e in lemon-main

Timestamp:

04/08/14 15:43:12 (11 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Amend:

38356530386365363838383930333838646236316663393863306565326235373233316262373565

Message:

Bugfix in default LP/MIP setting (#465)

The bug was introduced in [fc3854d936f7]

Location:

lemon

Files:

• config.h.in (modified) (2 diffs)
• lp.h (modified) (3 diffs)

lemon/config.h.in

@@ -1 +1 @@
 #define LEMON_VERSION "@PROJECT_VERSION@"
 #cmakedefine LEMON_HAVE_LONG_LONG 1
+
 #cmakedefine LEMON_HAVE_LP 1
 #cmakedefine LEMON_HAVE_MIP 1
@@ -8 +9 @@
 #cmakedefine LEMON_HAVE_CLP 1
 #cmakedefine LEMON_HAVE_CBC 1
-#cmakedefine LEMON_DEFAULT_LP @LEMON_DEFAULT_LP@
-#cmakedefine LEMON_DEFAULT_MIP @LEMON_DEFAULT_MIP@
+
+#define _LEMON_CPLEX 1
+#define _LEMON_CLP 2
+#define _LEMON_GLPK 3
+#define _LEMON_SOPLEX 4
+#define _LEMON_CBC 5
+
+#cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
+#cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
+
 #cmakedefine LEMON_USE_PTHREAD 1
 #cmakedefine LEMON_USE_WIN32_THREADS 1

lemon/lp.h

@@ -46 +46 @@
   ///\ingroup lp_group
   ///
-  ///Currently, the possible values are \c GLPK, \c CPLEX,
-  ///\c SOPLEX or \c CLP
+  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX,
+  ///\c _LEMON_SOPLEX or \c LEMON__CLP
 #define LEMON_DEFAULT_LP SOLVER
   ///The default LP solver
@@ -62 +62 @@
   ///\ingroup lp_group
   ///
-  ///Currently, the possible values are \c GLPK, \c CPLEX or \c CBC
+  ///Currently, the possible values are \c _LEMON_GLPK, \c LEMON__CPLEX
+  ///or \c _LEMON_CBC
 #define LEMON_DEFAULT_MIP SOLVER
   ///The default MIP solver.
@@ -72 +73 @@
   typedef GlpkMip Mip;
 #else
-#if LEMON_DEFAULT_LP == GLPK
+#if LEMON_DEFAULT_LP == _LEMON_GLPK
   typedef GlpkLp Lp;
-#elif LEMON_DEFAULT_LP == CPLEX
+#elif LEMON_DEFAULT_LP == _LEMON_CPLEX
   typedef CplexLp Lp;
-#elif LEMON_DEFAULT_LP == SOPLEX
+#elif LEMON_DEFAULT_LP == _LEMON_SOPLEX
   typedef SoplexLp Lp;
-#elif LEMON_DEFAULT_LP == CLP
+#elif LEMON_DEFAULT_LP == _LEMON_CLP
   typedef ClpLp Lp;
 #endif
-#if LEMON_DEFAULT_MIP == GLPK
+#if LEMON_DEFAULT_MIP == _LEMON_GLPK
   typedef GlpkMip Mip;
-#elif LEMON_DEFAULT_MIP == CPLEX
+#elif LEMON_DEFAULT_MIP == _LEMON_CPLEX
   typedef CplexMip Mip;
-#elif LEMON_DEFAULT_MIP == CBC
+#elif LEMON_DEFAULT_MIP == _LEMON_CBC
   typedef CbcMip Mip;
 #endif