diff options
| author | Bjoern Brandenburg <bbb@mpi-sws.org> | 2012-08-07 07:09:21 -0400 |
|---|---|---|
| committer | Bjoern Brandenburg <bbb@mpi-sws.org> | 2013-02-12 06:49:40 -0500 |
| commit | f79777a2c66301c6b8f7ec757f02b4b13e640d94 (patch) | |
| tree | 9e37d92fd2ba0e94241ac133352f1f469454580d /native/src/blocking | |
| parent | c2c3126de5fc548db5821081af265bb8cf69cebd (diff) | |
Add GLPK Integration
Add a bridge to the GLPK library. Availability is auto-discovered by
the build system. Most of the code is solver-agnostic.
Diffstat (limited to 'native/src/blocking')
| -rw-r--r-- | native/src/blocking/linprog/lp_dflp.cpp | 4 | ||||
| -rw-r--r-- | native/src/blocking/linprog/lp_dpcp.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/native/src/blocking/linprog/lp_dflp.cpp b/native/src/blocking/linprog/lp_dflp.cpp index 6198825..0370358 100644 --- a/native/src/blocking/linprog/lp_dflp.cpp +++ b/native/src/blocking/linprog/lp_dflp.cpp | |||
| @@ -153,7 +153,7 @@ static BlockingBounds* _lp_dflp_bounds(const ResourceSharingInfo& info, | |||
| 153 | #endif | 153 | #endif |
| 154 | 154 | ||
| 155 | // Solve the big, combined LP. | 155 | // Solve the big, combined LP. |
| 156 | Solution *sol = cplex_solve(lp, var_idx); | 156 | Solution *sol = linprog_solve(lp, var_idx); |
| 157 | 157 | ||
| 158 | assert(sol != NULL); | 158 | assert(sol != NULL); |
| 159 | 159 | ||
| @@ -225,7 +225,7 @@ static void apply_dflp_bounds_for_task( | |||
| 225 | solver_cost.start(); | 225 | solver_cost.start(); |
| 226 | #endif | 226 | #endif |
| 227 | 227 | ||
| 228 | Solution *sol = cplex_solve(lp, vars.get_num_vars()); | 228 | Solution *sol = linprog_solve(lp, vars.get_num_vars()); |
| 229 | 229 | ||
| 230 | #if DEBUG_LP_OVERHEADS >=2 | 230 | #if DEBUG_LP_OVERHEADS >=2 |
| 231 | solver_cost.stop(); | 231 | solver_cost.stop(); |
diff --git a/native/src/blocking/linprog/lp_dpcp.cpp b/native/src/blocking/linprog/lp_dpcp.cpp index 1b1cf32..bec131b 100644 --- a/native/src/blocking/linprog/lp_dpcp.cpp +++ b/native/src/blocking/linprog/lp_dpcp.cpp | |||
| @@ -371,7 +371,7 @@ static BlockingBounds* _lp_dpcp_bounds(const ResourceSharingInfo& info, | |||
| 371 | #endif | 371 | #endif |
| 372 | 372 | ||
| 373 | // Solve the big, combined LP. | 373 | // Solve the big, combined LP. |
| 374 | Solution *sol = cplex_solve(lp, var_idx); | 374 | Solution *sol = linprog_solve(lp, var_idx); |
| 375 | 375 | ||
| 376 | assert(sol != NULL); | 376 | assert(sol != NULL); |
| 377 | 377 | ||
| @@ -445,7 +445,7 @@ static void apply_dpcp_bounds_for_task( | |||
| 445 | solver_cost.start(); | 445 | solver_cost.start(); |
| 446 | #endif | 446 | #endif |
| 447 | 447 | ||
| 448 | Solution *sol = cplex_solve(lp, vars.get_num_vars()); | 448 | Solution *sol = linprog_solve(lp, vars.get_num_vars()); |
| 449 | 449 | ||
| 450 | #if DEBUG_LP_OVERHEADS >= 2 | 450 | #if DEBUG_LP_OVERHEADS >= 2 |
| 451 | solver_cost.stop(); | 451 | solver_cost.stop(); |
