[sonar] Change raw for-loops to range for-loops.

[simgrid.git] / src / kernel / routing / FatTreeZone.cpp

diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index 0c30abf..820dfba 100644 (file)
--- a/src/kernel/routing/FatTreeZone.cpp
+++ b/src/kernel/routing/FatTreeZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -30,11 +30,11 @@ FatTreeZone::FatTreeZone(NetZoneImpl* father, const std::string& name, resource:
 
 FatTreeZone::~FatTreeZone()
 {
-  for (unsigned int i = 0; i < this->nodes_.size(); i++) {
-    delete this->nodes_[i];
+  for (FatTreeNode const* node : this->nodes_) {
+    delete node;
   }
-  for (unsigned int i = 0; i < this->links_.size(); i++) {
-    delete this->links_[i];
+  for (FatTreeLink const* link : this->links_) {
+    delete link;
   }
 }
 
@@ -61,7 +61,6 @@ bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node)
 
 void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency)
 {
-
   if (dst->is_router() || src->is_router())
     return;
 
@@ -150,8 +149,8 @@ void FatTreeZone::seal()
     msgBuffer.str("");
     msgBuffer << "Nodes are : ";
 
-    for (unsigned int i = 0; i < this->nodes_.size(); i++) {
-      msgBuffer << this->nodes_[i]->id << "(" << this->nodes_[i]->level << "," << this->nodes_[i]->position << ") ";
+    for (FatTreeNode const* node : this->nodes_) {
+      msgBuffer << node->id << "(" << node->level << "," << node->position << ") ";
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
@@ -170,8 +169,8 @@ void FatTreeZone::seal()
   if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
     std::stringstream msgBuffer;
     msgBuffer << "Links are : ";
-    for (unsigned int i = 0; i < this->links_.size(); i++) {
-      msgBuffer << "(" << this->links_[i]->up_node_->id << "," << this->links_[i]->down_node_->id << ") ";
+    for (FatTreeLink const* link : this->links_) {
+      msgBuffer << "(" << link->up_node_->id << "," << link->down_node_->id << ") ";
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
@@ -291,7 +290,6 @@ void FatTreeZone::generate_labels()
     }
 
     for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
-
       if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
         std::stringstream msgBuffer;
 
@@ -382,11 +380,11 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
                                                      " levels but the child count vector (the first one) contains " +
                                                      std::to_string(tmp.size()) + " levels.");
 
-  for (size_t i = 0; i < tmp.size(); i++) {
+  for (std::string const& level : tmp) {
     try {
-      this->num_children_per_node_.push_back(std::stoi(tmp[i]));
+      this->num_children_per_node_.push_back(std::stoi(level));
     } catch (const std::invalid_argument&) {
-      surf_parse_error(std::string("Invalid child count: ") + tmp[i]);
+      surf_parse_error(std::string("Invalid child count: ") + level);
     }
   }
 
@@ -395,11 +393,11 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) +
                                                      " levels but the parent count vector (the second one) contains " +
                                                      std::to_string(tmp.size()) + " levels.");
-  for (size_t i = 0; i < tmp.size(); i++) {
+  for (std::string const& parent : tmp) {
     try {
-      this->num_parents_per_node_.push_back(std::stoi(tmp[i]));
+      this->num_parents_per_node_.push_back(std::stoi(parent));
     } catch (const std::invalid_argument&) {
-      surf_parse_error(std::string("Invalid parent count: ") + tmp[i]);
+      surf_parse_error(std::string("Invalid parent count: ") + parent);
     }
   }
 
@@ -408,11 +406,11 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) +
                                                      " levels but the port count vector (the third one) contains " +
                                                      std::to_string(tmp.size()) + " levels.");
-  for (size_t i = 0; i < tmp.size(); i++) {
+  for (std::string const& port : tmp) {
     try {
-      this->num_port_lower_level_.push_back(std::stoi(tmp[i]));
+      this->num_port_lower_level_.push_back(std::stoi(port));
     } catch (const std::invalid_argument&) {
-      throw std::invalid_argument(std::string("Invalid lower level port number:") + tmp[i]);
+      throw std::invalid_argument(std::string("Invalid lower level port number:") + port);
     }
   }
   this->cluster_ = cluster;
@@ -425,22 +423,22 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const
   xbt_assert(file.is_open(), "Unable to open file %s", filename.c_str());
 
   file << "graph AsClusterFatTree {\n";
-  for (unsigned int i = 0; i < this->nodes_.size(); i++) {
-    file << this->nodes_[i]->id;
-    if (this->nodes_[i]->id < 0)
+  for (FatTreeNode const* node : this->nodes_) {
+    file << node->id;
+    if (node->id < 0)
       file << " [shape=circle];\n";
     else
       file << " [shape=hexagon];\n";
   }
 
-  for (unsigned int i = 0; i < this->links_.size(); i++) {
-    file << this->links_[i]->down_node_->id << " -- " << this->links_[i]->up_node_->id << ";\n";
+  for (FatTreeLink const* link : this->links_) {
+    file << link->down_node_->id << " -- " << link->up_node_->id << ";\n";
   }
   file << "}";
   file.close();
 }
 
-FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int position)
+FatTreeNode::FatTreeNode(const ClusterCreationArgs* cluster, int id, int level, int position)
     : id(id), level(level), position(position)
 {
   LinkCreationArgs linkTemplate;
@@ -462,7 +460,7 @@ FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int po
   }
 }
 
-FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode)
+FatTreeLink::FatTreeLink(const ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode)
     : up_node_(upNode), down_node_(downNode)
 {
   static int uniqueId = 0;
@@ -483,6 +481,6 @@ FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, Fa
   }
   uniqueId++;
 }
-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid