| 1 |
Author: Ralf Treinen <[email protected]> |
| 2 |
Description: make cbc the default solver |
| 3 |
|
| 4 |
Index: mccs-1.1/sources/cudf.c |
| 5 |
=================================================================== |
| 6 |
--- mccs-1.1.orig/sources/cudf.c 2011-07-26 17:25:50.000000000 +0200 |
| 7 |
+++ mccs-1.1/sources/cudf.c 2011-08-25 16:14:16.000000000 +0200 |
| 8 |
@@ -628,19 +628,7 @@ |
| 9 |
|
| 10 |
// choose the solver |
| 11 |
if (solver == (abstract_solver *)NULL) |
| 12 |
-#ifdef USECPLEX |
| 13 |
- solver = new_cplex_solver(); |
| 14 |
-#else |
| 15 |
- #ifdef USEGLPK |
| 16 |
- solver = new_glpk_solver(false); |
| 17 |
- #else |
| 18 |
- #ifdef USELPSOLVE |
| 19 |
- solver = new_lpsolve_solver(); |
| 20 |
- #else |
| 21 |
- { fprintf(stderr, "ERROR: no solver defined\n"); exit(-1); } |
| 22 |
- #endif |
| 23 |
- #endif |
| 24 |
-#endif |
| 25 |
+ solver = new_lp_solver("/usr/share/mccs/cbclp"); |
| 26 |
|
| 27 |
// check criteria properties |
| 28 |
for (vector<abstract_criteria *>::iterator icrit = criteria_with_property.begin(); icrit != criteria_with_property.end(); icrit++) |