X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/817f8a03cce56319fcefcbb7abe26a3d4153035a..902ae2608df3ebb7f8316225d5ebbae4b0d42afc:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 89b92c3cd2..b5fc9f4e88 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -14,6 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); int use_sdp_solver=0; +int use_lagrange_solver=0; /* Additional declarations for Windows potability. */ @@ -142,14 +143,16 @@ double generic_maxmin_share_resources2(xbt_swag_t running_actions, double value = -1; #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) - if(!use_sdp_solver) + if(!use_sdp_solver && !use_lagrange_solver) lmm_solve(sys); - else { + else if(!use_lagrange_solver){ #ifdef HAVE_SDP sdp_solve(sys); #else xbt_assert0(0, "No CSDP found! You cannot use this model!"); #endif + }else{ + lagrange_solve(sys); } xbt_swag_foreach(action, running_actions) {