diff options
| author | Bjoern Brandenburg <bbb@mpi-sws.org> | 2012-08-13 16:41:09 -0400 |
|---|---|---|
| committer | Bjoern Brandenburg <bbb@mpi-sws.org> | 2013-02-12 06:55:15 -0500 |
| commit | 5a7cba3cc5e17fec43285997eb519eb3c2da40f7 (patch) | |
| tree | 55298dc51097782af028ab706bfbb763ffe16c2b | |
| parent | 79818e276e30d037501b4eceaa25b9b2ccffbff6 (diff) | |
Switch to CPX (CPLEX C API) as default LP solver
Much faster than the alternatives, so use it when available.
| -rw-r--r-- | native/include/linprog/solver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/native/include/linprog/solver.h b/native/include/linprog/solver.h index 0129903..eb873b8 100644 --- a/native/include/linprog/solver.h +++ b/native/include/linprog/solver.h | |||
| @@ -24,15 +24,15 @@ public: | |||
| 24 | } | 24 | } |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_HAVE_GLPK) | 27 | #if defined(CONFIG_HAVE_CPLEX) |
| 28 | 28 | ||
| 29 | #include "linprog/glpk.h" | 29 | #include "linprog/cplex.h" |
| 30 | #define linprog_solve(lp, vars) glpk_solve((lp), (vars)) | 30 | #define linprog_solve(lp, vars) cpx_solve((lp), (vars)) |
| 31 | 31 | ||
| 32 | #elif defined(CONFIG_HAVE_CPLEX) | 32 | #elif defined(CONFIG_HAVE_GLPK) |
| 33 | 33 | ||
| 34 | #include "linprog/cplex.h" | 34 | #include "linprog/glpk.h" |
| 35 | #define linprog_solve(lp, vars) cplex_solve((lp), (vars)) | 35 | #define linprog_solve(lp, vars) glpk_solve((lp), (vars)) |
| 36 | 36 | ||
| 37 | #else | 37 | #else |
| 38 | 38 | ||