X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7c05e186c0c2c4555d127909c1898f0668c050c..578dd56a4a07709db1922ff5edd98f0c8f3090f9:/src/surf/AsClusterFatTree.cpp

diff --git a/src/surf/AsClusterFatTree.cpp b/src/surf/AsClusterFatTree.cpp
index 912561664c..3b071e1f9d 100644
--- a/src/surf/AsClusterFatTree.cpp
+++ b/src/surf/AsClusterFatTree.cpp
@@ -93,7 +93,7 @@ void AsClusterFatTree::getRouteAndLatency(NetCard *src,
   /* In case destination is the source, and there is a loopback, let's get
      through it instead of going up to a switch*/
   if(source->id == destination->id && this->has_loopback_) {
-    into->link_list.push_back(source->loopback);
+    into->link_list->push_back(source->loopback);
     if(latency) {
       *latency += source->loopback->getLatency();
     }
@@ -112,14 +112,14 @@ void AsClusterFatTree::getRouteAndLatency(NetCard *src,
     }
     k = this->upperLevelNodesNumber_[currentNode->level];
     d = d % k;
-    into->link_list.push_back(currentNode->parents[d]->upLink);
+    into->link_list->push_back(currentNode->parents[d]->upLink);
 
     if(latency) {
       *latency += currentNode->parents[d]->upLink->getLatency();
     }
 
     if (this->has_limiter_) {
-      into->link_list.push_back(currentNode->limiterLink);
+      into->link_list->push_back(currentNode->limiterLink);
     }
     currentNode = currentNode->parents[d]->upNode;
   }
@@ -133,13 +133,13 @@ void AsClusterFatTree::getRouteAndLatency(NetCard *src,
     for(unsigned int i = 0 ; i < currentNode->children.size() ; i++) {
       if(i % this->lowerLevelNodesNumber_[currentNode->level - 1] ==
          destination->label[currentNode->level - 1]) {
-        into->link_list.push_back(currentNode->children[i]->downLink);
+        into->link_list->push_back(currentNode->children[i]->downLink);
         if(latency) {
           *latency += currentNode->children[i]->downLink->getLatency();
         }
         currentNode = currentNode->children[i]->downNode;
         if (this->has_limiter_) {
-          into->link_list.push_back(currentNode->limiterLink);
+          into->link_list->push_back(currentNode->limiterLink);
         }
         XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id,
                   destination->level, destination->position, currentNode->id,
@@ -403,7 +403,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster
 
   // TODO : we have to check for zeros and negative numbers, or it might crash
   if (parameters.size() != 4){
-    surf_parse_error("Fat trees are defined by the levels number and 3 vectors, see the documentation for more informations");
+    surf_parse_error("Fat trees are defined by the levels number and 3 vectors, see the documentation for more information");
   }
 
   // The first parts of topo_parameters should be the levels number
@@ -413,7 +413,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster
   boost::split(tmp, parameters[1], boost::is_any_of(","));
   if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
-                     ", see the documentation for more informations"); 
+                     ", see the documentation for more information");
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){
     this->lowerLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
@@ -423,7 +423,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster
   boost::split(tmp, parameters[2], boost::is_any_of(","));
   if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
-                     ", see the documentation for more informations"); 
+                     ", see the documentation for more information");
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){
     this->upperLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid upper level node number: %s"));
@@ -433,7 +433,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster
   boost::split(tmp, parameters[3], boost::is_any_of(","));
   if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
-                     ", see the documentation for more informations"); 
+                     ", see the documentation for more information");
     
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){