From ed23b51d432e31840b2cc3d9d23d2d8f1847bb5d Mon Sep 17 00:00:00 2001 From: velho Date: Thu, 16 Oct 2008 14:31:49 +0000 Subject: [PATCH 1/1] Revert "Uses alpha and beta from LegrandVelho model to compute finishing time of transmissions." This reverts commit 8b3e9ea8d7423a048e47da03aa1a7edcdeb3fc73. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5993 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/surf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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) { -- 2.20.1