From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 12 Sep 2008 14:14:56 +0000 (+0000)
Subject: Use the rate variable... (thanks Fred for noticing it).
X-Git-Tag: v3.3~180
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9af4fc9cb2c30c46d44c492feb8d3af6c72dfa77

Use the rate variable... (thanks Fred for noticing it).


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5928 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 2e5f270e36..989379e83b 100644
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -542,14 +542,10 @@ static surf_action_t execute_parallel_task(int workstation_nb,
   xbt_swag_insert(action, action->generic_action.state_set);
   action->rate = rate;
 
-  if (action->rate > 0)
-    action->variable =
-	lmm_variable_new(ptask_maxmin_system, action, 1.0, -1.0,
-			 workstation_nb + nb_link);
-  else
-    action->variable =
-	lmm_variable_new(ptask_maxmin_system, action, 1.0, action->rate,
-			 workstation_nb + nb_link);
+  action->variable =
+    lmm_variable_new(ptask_maxmin_system, action, 1.0, 
+		     (action->rate>0)?action->rate:-1.0,
+		     workstation_nb + nb_link);
 
   if (action->latency > 0) 
     lmm_update_variable_weight(ptask_maxmin_system,action->variable,0.0);