X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..7f00b09c7ebfa3b4e12c96c764ee7a0e0e07ec20:/teshsuite/platforms/flatifier.cpp diff --git a/teshsuite/platforms/flatifier.cpp b/teshsuite/platforms/flatifier.cpp index a874331cac..6141996f3f 100644 --- a/teshsuite/platforms/flatifier.cpp +++ b/teshsuite/platforms/flatifier.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2023. 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. */ @@ -47,10 +47,8 @@ static void create_environment(xbt_os_timer_t parse_time, const std::string& pla static void dump_hosts() { std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); - std::sort(hosts.begin(), hosts.end(), - [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); }); - for (auto h : hosts) { + for (auto const* h : hosts) { std::printf(" get_cname(), h->get_speed()); const std::unordered_map* props = h->get_properties(); if (h->get_core_count() > 1) { @@ -58,8 +56,8 @@ static void dump_hosts() } // Sort the properties before displaying them, so that the tests are perfectly reproducible std::vector keys; - for (auto const& kv : *props) - keys.push_back(kv.first); + for (auto const& [key, _] : *props) + keys.push_back(key); if (not keys.empty()) { std::printf(">\n"); std::sort(keys.begin(), keys.end()); @@ -79,7 +77,7 @@ static void dump_links() std::sort(links.begin(), links.end(), [](const sg4::Link* a, const sg4::Link* b) { return a->get_name() < b->get_name(); }); - for (auto link : links) { + for (auto const* link : links) { std::printf(" get_cname(), link->get_bandwidth(), @@ -108,17 +106,15 @@ static void dump_routers() static void dump_routes() { std::vector hosts = sg4::Engine::get_instance()->get_all_hosts(); - std::sort(hosts.begin(), hosts.end(), - [](const sg4::Host* a, const sg4::Host* b) { return a->get_name() < b->get_name(); }); std::vector netpoints = sg4::Engine::get_instance()->get_all_netpoints(); std::sort(netpoints.begin(), netpoints.end(), [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) { return a->get_name() < b->get_name(); }); - for (auto src_host : hosts) { // Routes from host + for (auto const* src_host : hosts) { // Routes from host const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint(); - for (auto dst_host : hosts) { // Routes to host + for (auto const* dst_host : hosts) { // Routes to host std::vector route; const simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint(); simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr); @@ -157,7 +153,7 @@ static void dump_routes() std::printf("", link->get_cname()); std::printf("\n \n"); } - for (auto dst_host : hosts) { // Routes to host + for (auto const* dst_host : hosts) { // Routes to host std::printf(" \n ", value1->get_cname(), dst_host->get_cname()); std::vector route; const simgrid::kernel::routing::NetPoint* netcardDst = dst_host->get_netpoint();