X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b3e9ea8d7423a048e47da03aa1a7edcdeb3fc73..13c5da75068f441142fcf93d4d78124a7885d116:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 3180bbba99..a1d6ebf4ec 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -16,9 +16,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, int use_sdp_solver = 0; int use_lagrange_solver = 0; -extern double alpha_legrandvelho; -extern double beta_legrandvelho; - /* Additional declarations for Windows potability. */ #ifndef MAX_DRIVE @@ -209,11 +206,9 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, if (!action) return -1.0; - double action_latency= lmm_variable_getdf(VARIABLE(action)); - if (value > 0) { if(action->remains>0) - min = (action->remains / (value*alpha_legrandvelho)) + beta_legrandvelho*action_latency; + min = action->remains / value; else min = 0.0; if ((action->max_duration >= 0) && (action->max_duration < min)) @@ -228,7 +223,7 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, value = lmm_variable_getvalue(VARIABLE(action)); if (value > 0) { if(action->remains>0) - value = (action->remains / (value*alpha_legrandvelho)) + beta_legrandvelho*action_latency; + value = action->remains / value; else value = 0.0; if (value < min) {