codacy

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

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index de87cef..7f6b210 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -33,22 +33,17 @@ TorusZone::TorusZone(NetZone* father, const char* name) : ClusterZone(father, na
 
 void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position)
 {
-  /*
-   * Create all links that exist in the torus.
-   * Each rank creates @a dimensions-1 links
-   */
-  int neighbor_rank_id  = 0; // The other node the link connects
-  int current_dimension = 0; // which dimension are we currently in?
-      // we need to iterate over all dimensions
-      // and create all links there
+  /* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */
   int dim_product = 1; // Needed to calculate the next neighbor_id
-  for (unsigned int j = 0; j < dimensions_.size(); j++) {
 
+  for (unsigned int j = 0; j < dimensions_.size(); j++) {
     LinkCreationArgs link;
-    current_dimension = dimensions_.at(j);
-    neighbor_rank_id  = ((static_cast<int>(rank) / dim_product) % current_dimension == current_dimension - 1)
-                           ? rank - (current_dimension - 1) * dim_product
-                           : rank + dim_product;
+    int current_dimension = dimensions_.at(j); // which dimension are we currently in?
+                                               // we need to iterate over all dimensions and create all links there
+    // The other node the link connects
+    int neighbor_rank_id = ((static_cast<int>(rank) / dim_product) % current_dimension == current_dimension - 1)
+                               ? rank - (current_dimension - 1) * dim_product
+                               : rank + dim_product;
     // name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case)
     char* link_id  = bprintf("%s_link_from_%i_to_%i", cluster->id, id, neighbor_rank_id);
     link.id        = link_id;
@@ -86,7 +81,7 @@ void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
   std::vector<std::string> dimensions;
   boost::split(dimensions, cluster->topo_parameters, boost::is_any_of(","));
 
-  if (!dimensions.empty()) {
+  if (not dimensions.empty()) {
     /* We are in a torus cluster
      * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and safe it in a vector.
      * Additionally, we need to know how many ranks we have in total
@@ -121,7 +116,6 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
    * Dimension based routing routes through each dimension consecutively
    * TODO Change to dynamic assignment
    */
-  unsigned int dim_product = 1;
   unsigned int current_node = src->id();
   unsigned int next_node    = 0;
   /*
@@ -147,7 +141,7 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
   bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"?
   // false means: next -> cur
   while (current_node != dst->id()) {
-    dim_product = 1; // First, we will route in x-dimension
+    unsigned int dim_product = 1; // First, we will route in x-dimension
     int j=0;
     for (auto cur_dim : dimensions_){
       // current_node/dim_product = position in current dimension