X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89feb425bdeb4351ac0e27a38d9a9b3463fff433..8efd2607b59ef797240440b016bbf67fe94a0821:/examples/platforms/routing_cluster.cpp diff --git a/examples/platforms/routing_cluster.cpp b/examples/platforms/routing_cluster.cpp index 4bc6f25bce..0cef8eee58 100644 --- a/examples/platforms/routing_cluster.cpp +++ b/examples/platforms/routing_cluster.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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. */ @@ -23,20 +23,18 @@ static void create_cluster(const sg4::NetZone* root, const std::string& cluster_ cluster->set_parent(root); /* create the backbone link */ - const sg4::Link* l_bb = - cluster->create_link("backbone" + cluster_suffix, std::vector{2.25e9})->set_latency(5e-4)->seal(); + const sg4::Link* l_bb = cluster->create_link("backbone" + cluster_suffix, 2.25e9)->set_latency(5e-4)->seal(); /* create all hosts and connect them to outside world */ for (const auto& hostname : hosts) { /* create host */ - const sg4::Host* host = cluster->create_host(hostname, std::vector{1e9}); + const sg4::Host* host = cluster->create_host(hostname, 1e9); /* create UP link */ - const sg4::Link* l_up = - cluster->create_link(hostname + "_up", std::vector{1.25e8})->set_latency(0.0001)->seal(); + const sg4::Link* l_up = cluster->create_link(hostname + "_up", 1.25e8)->set_latency(0.0001)->seal(); /* create DOWN link, if needed */ const sg4::Link* l_down = l_up; if (hostname != single_link_host) { - l_down = cluster->create_link(hostname + "_down", std::vector{1.25e8})->set_latency(0.0001)->seal(); + l_down = cluster->create_link(hostname + "_down", 1.25e8)->set_latency(0.0001)->seal(); } sg4::LinkInRoute backbone{l_bb}; sg4::LinkInRoute link_up{l_up}; @@ -83,7 +81,7 @@ void load_platform(const sg4::Engine& e) create_cluster(root, "2", {"host4", "host5", "host6"}, "host6"); /* connect both cluster through their respective routers */ - const sg4::Link* l = root->create_link("link1-2", std::vector{2.25e9})->set_latency(5e-4)->seal(); + const sg4::Link* l = root->create_link("link1-2", 2.25e9)->set_latency(5e-4)->seal(); sg4::LinkInRoute link{l}; root->add_route(e.netpoint_by_name_or_null("cluster1"), e.netpoint_by_name_or_null("cluster2"), e.netpoint_by_name_or_null("router1"), e.netpoint_by_name_or_null("router2"), {link});