Correctly print dots between elements.

[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 53e657a..ba5453e 100644 (file)
--- a/src/instr/jedule/jedule_platform.cpp
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -58,46 +58,35 @@ 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);
     }
   }
 }
 
-int Container::get_child_position(Container* child)
+int Container::get_child_position(const Container* child) const
 {
-  unsigned int i = 0;
-  int child_nb   = -1;
-
-  for (auto const& c : children_) {
-    if (c.get() == child) {
-      child_nb = i;
-      break;
-    }
-    i++;
-  }
-  return child_nb;
+  auto it = std::find_if(begin(children_), end(children_),
+                         [&child](const std::unique_ptr<Container>& c) { return c.get() == child; });
+  return it == end(children_) ? -1 : static_cast<int>(std::distance(begin(children_), it));
 }
 
 std::vector<int> Container::get_hierarchy()
 {
-  if (parent_ != nullptr) {
-    if (not parent_->has_children()) {
-      // we are in the last level
-      return parent_->get_hierarchy();
-    } else {
-      int child_nb = parent_->get_child_position(this);
-
-      xbt_assert( child_nb > - 1);
-      std::vector<int> heir_list = parent_->get_hierarchy();
-      heir_list.insert(heir_list.begin(), child_nb);
-      return heir_list;
-    }
-  } else {
+  if (parent_ == nullptr) {
     int top_level = 0;
-    std::vector<int> heir_list = {top_level};
-    return heir_list;
+    std::vector<int> hier_list = {top_level};
+    return hier_list;
+  } else if (parent_->has_children()) {
+    int child_nb = parent_->get_child_position(this);
+    xbt_assert(child_nb > -1);
+    std::vector<int> hier_list = parent_->get_hierarchy();
+    hier_list.insert(hier_list.begin(), child_nb);
+    return hier_list;
+  } else {
+    // we are in the last level
+    return parent_->get_hierarchy();
   }
 }
 
@@ -105,15 +94,15 @@ std::string Container::get_hierarchy_as_string()
 {
   std::string output("");
 
-  std::vector<int> heir_list = this->get_hierarchy();
+  std::vector<int> hier_list = this->get_hierarchy();
 
-  unsigned int length = heir_list.size();
-  unsigned int i = 0;
-  for (auto const& id : heir_list) {
+  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;
@@ -121,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 = 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");
 }
@@ -169,11 +157,11 @@ static void add_subsets_to(std::vector<simgrid::jedule::Subset>& subset_list, st
 
   for (auto const& host_name : hostgroup) {
     xbt_assert( host_name != nullptr );
-    jed_container_t parent_cont = host2_simgrid_parent_container.at(host_name);
+    const simgrid::jedule::Container* parent_cont = host2_simgrid_parent_container.at(host_name);
     unsigned int id             = parent_cont->get_id_by_name(host_name);
     id_list.push_back(id);
   }
-  unsigned int nb_ids = id_list.size();
+  unsigned int nb_ids = static_cast<unsigned int>(id_list.size());
   std::sort(id_list.begin(), id_list.end());
 
   if( nb_ids > 0 ) {