Slight simplification.

[simgrid.git] / src / instr / jedule / jedule_platform.cpp

diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp
index 2b065312cb602176f5b7a8882f2cab04fa5d689c..76631fe6e4deca97ff5c287ca2cbf761e5e08bb9 100644 (file)
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -58,7 +58,7 @@ void Container::create_hierarchy(const_sg_netzone_t from_as)
     this->add_resources(table);
   } else {
     for (auto const& nz : from_as->get_children()) {
-      jed_container_t child_container = new simgrid::jedule::Container(nz->get_name());
+      auto* child_container = new simgrid::jedule::Container(nz->get_name());
       this->add_child(child_container);
       child_container->create_hierarchy(nz);
     }
@@ -96,13 +96,13 @@ std::string Container::get_hierarchy_as_string()
 
   std::vector<int> hier_list = this->get_hierarchy();
 
-  unsigned int length = static_cast<unsigned int>(hier_list.size());
-  unsigned int i = 0;
+  bool sep = false;
   for (auto const& id : hier_list) {
+    if (sep)
+      output += '.';
+    else
+      sep = true;
     output += std::to_string(id);
-    if( i != length-1 ) {
-      output += ".";
-    }
   }
 
   return output;
@@ -110,20 +110,19 @@ std::string Container::get_hierarchy_as_string()
 
 void Container::print_resources(FILE* jed_file)
 {
-  unsigned int i=0;
   xbt_assert(not this->resource_list.empty());
 
-  unsigned int res_nb = static_cast<unsigned int>(this->resource_list.size());
-  std::string resid   = this->get_hierarchy_as_string();
+  std::string resid = this->get_hierarchy_as_string();
 
-  fprintf(jed_file, "      <rset id=\"%s\" nb=\"%u\" names=\"", resid.c_str(), res_nb);
+  fprintf(jed_file, "      <rset id=\"%s\" nb=\"%zu\" names=\"", resid.c_str(), this->resource_list.size());
+  bool sep = false;
   for (auto const& res : this->resource_list) {
+    if (sep)
+      putc('|', jed_file);
+    else
+      sep = true;
     const char * res_name = sg_host_get_name(res);
     fprintf(jed_file, "%s", res_name);
-    if( i != res_nb-1 ) {
-      fprintf(jed_file, "|");
-    }
-    i++;
   }
   fprintf(jed_file, "\" />\n");
 }
@@ -162,27 +161,25 @@ static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, st
     unsigned int id             = parent_cont->get_id_by_name(host_name);
     id_list.push_back(id);
   }
-  unsigned int nb_ids = static_cast<unsigned int>(id_list.size());
   std::sort(id_list.begin(), id_list.end());
 
-  if( nb_ids > 0 ) {
-    int start = 0;
-    int pos = start;
-    for(unsigned int i=0; i<nb_ids; i++) {
-      if( id_list[i] - id_list[pos] > 1 ) {
-        subset_list.emplace_back(id_list[start], id_list[pos], parent);
-        start = i;
-
-        if( i == nb_ids-1 ) {
-          subset_list.emplace_back(id_list[i], id_list[i], parent);
-        }
-      } else {
-        if( i == nb_ids-1 ) {
-          subset_list.emplace_back(id_list[start], id_list[i], parent);
-        }
+  size_t nb_ids = id_list.size();
+  size_t start  = 0;
+  size_t pos    = start;
+  for (size_t i = 0; i < nb_ids; i++) {
+    if (id_list[i] - id_list[pos] > 1) {
+      subset_list.emplace_back(id_list[start], id_list[pos], parent);
+      start = i;
+
+      if (i == nb_ids - 1) {
+        subset_list.emplace_back(id_list[i], id_list[i], parent);
+      }
+    } else {
+      if (i == nb_ids - 1) {
+        subset_list.emplace_back(id_list[start], id_list[i], parent);
       }
-      pos = i;
     }
+    pos = i;
   }
 }