X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3369e2be7e245615f9d2fbad78dd8248429d09a0..952402db6d0f3eade16684d4b044c4ed5282abef:/src/kernel/resource/NetworkModel.cpp

diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp
index ca437cef86..27d222ebba 100644
--- a/src/kernel/resource/NetworkModel.cpp
+++ b/src/kernel/resource/NetworkModel.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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. */
@@ -6,15 +6,12 @@
 #include <simgrid/s4u/Engine.hpp>
 
 #include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/FactorSet.hpp"
 #include "src/kernel/resource/NetworkModel.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/surf_interface.hpp"
 
 #include <numeric>
 
-#ifndef NETWORK_INTERFACE_CPP_
-#define NETWORK_INTERFACE_CPP_
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuel communications");
 
 /*********
@@ -22,23 +19,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, t
  *********/
 
 namespace simgrid::kernel::resource {
-double NetworkModel::cfg_latency_factor   = 1.0; // default value
-double NetworkModel::cfg_bandwidth_factor = 1.0; // default value
-
-static config::Flag<std::string> cfg_latency_factor_str(
-    "network/latency-factor",
-    "Correction factor to apply to the provided latency (default value overridden by network model)", "1.0",
-    [](std::string str) {
-      NetworkModel::cfg_latency_factor =
-          xbt_str_parse_double(str.c_str(), "The value of 'network/latency-factor' is not a double");
-    });
-static config::Flag<std::string> cfg_bandwidth_factor_str(
-    "network/bandwidth-factor",
-    "Correction factor to apply to the provided bandwidth (default value overridden by network model)", "1.0",
-    [](std::string str) {
-      NetworkModel::cfg_bandwidth_factor =
-          xbt_str_parse_double(str.c_str(), "The value of 'network/bandwidth-factor' is not a double");
-    });
 
 /** @brief Command-line option 'network/TCP-gamma' -- see @ref options_model_network_gamma */
 config::Flag<double> NetworkModel::cfg_tcp_gamma(
@@ -130,5 +110,3 @@ void insert_link_latency(std::vector<StandardLinkImpl*>& result, const std::vect
 }
 
 } // namespace simgrid::kernel::resource
-
-#endif /* NETWORK_INTERFACE_CPP_ */