X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8963831bbd6c10389bc103e579afe2d632262d95..40b9540a553006e50628eb13c451c354a0671d3e:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 2c81953488..7acfc6f186 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -459,8 +459,7 @@ static void update_resource_state(void *id,
       if (!(action->suspended))
 	lmm_update_variable_weight(network_maxmin_system, action->variable,
 				   action->lat_current);
-      lmm_update_variable_latency(network_maxmin_system, action->variable,
-				  delta);
+
     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
@@ -573,8 +572,6 @@ static surf_action_t communicate(void *src, void *dst, double size,
       lmm_update_variable_bound(network_maxmin_system, action->variable,
 				action->rate);
   }
-  lmm_update_variable_latency(network_maxmin_system, action->variable,
-			      action->latency);
 
   for (i = 0; i < route_size; i++)
     lmm_expand(network_maxmin_system, route[i]->constraint,
@@ -766,6 +763,24 @@ static void surf_network_model_init_internal(void)
     network_maxmin_system = lmm_system_new();
 }
 
+/***************************************************************************/
+/* New TCP sharing model based on thesis experimantation and discussions.  */
+/***************************************************************************/
+void surf_network_model_init_LegrandVelho(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+  xbt_dynar_push(model_list, &surf_network_model);
+  network_solve = lmm_solve;
+
+  update_model_description(surf_network_model_description,
+			   "LegrandVelho",
+			   (surf_model_t) surf_network_model);
+  INFO0("LegrandVelho Model was chosen!!");
+}
+
 /***************************************************************************/
 /* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
 /***************************************************************************/