Merge branch 'simgrid-fork-plugin-photovoltaic'

[simgrid.git] / src / kernel / resource / NetworkModel.cpp

diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp
index 01ded589b2e35cbc9b73746731632e8efc393f5c..0d34f48797988b5ee7f139e1f6a68d2d423579fb 100644 (file)
--- a/src/kernel/resource/NetworkModel.cpp
+++ b/src/kernel/resource/NetworkModel.cpp
@@ -1,20 +1,17 @@
-/* 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. */
 
 #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 "src/simgrid/sg_config.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");
 
 /*********
@@ -35,6 +32,10 @@ config::Flag<bool> NetworkModel::cfg_crosstraffic(
     "network/crosstraffic",
     "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", "yes");
 
+config::Flag<double> NetworkModel::cfg_weight_S_parameter(
+    "network/weight-S",
+    "Correction factor to apply to the weight of competing streams (default value set by network model)", 0.0);
+
 NetworkModel::~NetworkModel() = default;
 
 double NetworkModel::next_occurring_event_full(double now)
@@ -109,5 +110,3 @@ void insert_link_latency(std::vector<StandardLinkImpl*>& result, const std::vect
 }
 
 } // namespace simgrid::kernel::resource
-
-#endif /* NETWORK_INTERFACE_CPP_ */