Remove deprecated features for next release.

[simgrid.git] / src / surf / network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 4e45f4d..74414df 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -39,9 +39,8 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or fro
 /*  } */
 void surf_network_model_init_LegrandVelho()
 {
-  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>();
-  net_model->set_name("Network_LegrandVelho");
-  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model, {});
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_LegrandVelho");
+  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -66,9 +65,8 @@ void surf_network_model_init_CM02()
   simgrid::config::set_default<double>("network/bandwidth-factor", 1.0);
   simgrid::config::set_default<double>("network/weight-S", 0.0);
 
-  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>();
-  net_model->set_name("Network_CM02");
-  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model, {});
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_CM02");
+  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
 }
 
@@ -76,7 +74,7 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
-NetworkCm02Model::NetworkCm02Model()
+NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name)
 {
   if (config::get_value<std::string>("network/optim") == "Lazy")
     set_update_algorithm(Model::UpdateAlgo::LAZY);