X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/283236f8e2414d7c30d46e6d1aea0e8882699dd1..d0ffc37686edcc803601f76ab51fdfed5fc2f241:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 4509a743b3..13fff27765 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -2,7 +2,6 @@
 #include "surf/random_mgr.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static random_data_t random_latency = NULL;
 static int host_number_int = 0;
 
 static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
@@ -17,15 +16,12 @@ void surf_network_model_init_Constant()
   xbt_assert(surf_network_model == NULL);
   surf_network_model = new NetworkConstantModel();
 
-  if (!random_latency)
-    random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
-
-  //FIXME:sg_platf_host_add_cb(netcste_count_hosts);
+  sg_platf_host_add_cb(netcste_count_hosts);
 
   ModelPtr model = static_cast<ModelPtr>(surf_network_model);
   xbt_dynar_push(model_list, &model);
 
-  //FIXME:routing_model_create(NULL);
+  routing_model_create(NULL);
 }
 
 double NetworkConstantModel::shareResources(double now)
@@ -35,7 +31,7 @@ double NetworkConstantModel::shareResources(double now)
   double min = -1.0;
 
   xbt_swag_foreach(_action, p_runningActionSet) {
-	action = (NetworkConstantActionLmmPtr) _action;
+	action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
     if (action->m_latency > 0) {
       if (min < 0)
         min = action->m_latency;
@@ -53,7 +49,7 @@ void NetworkConstantModel::updateActionsState(double now, double delta)
   NetworkConstantActionLmmPtr action = NULL;
 
   xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) {
-	action = (NetworkConstantActionLmmPtr) _action;
+	action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
         double_update(&(action->m_latency), delta);
@@ -77,7 +73,7 @@ void NetworkConstantModel::updateActionsState(double now, double delta)
   }
 }
 
-NetworkCm02ActionLmmPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
 		                         double size, double rate)
 {
   char *src_name = src->p_name;