Change public NetworkModelIntf.hpp into private NetworkModelFactors.hpp

- This will soon become a Trait dedicated to the handling of factors

diff --git a/MANIFEST.in b/MANIFEST.in
index 2406d6f..8d2e301 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2008,7 +2008,6 @@ include include/simgrid/kernel/ProfileBuilder.hpp
 include include/simgrid/kernel/Timer.hpp
 include include/simgrid/kernel/resource/Action.hpp
 include include/simgrid/kernel/resource/Model.hpp
-include include/simgrid/kernel/resource/NetworkModelIntf.hpp
 include include/simgrid/kernel/routing/ClusterZone.hpp
 include include/simgrid/kernel/routing/DijkstraZone.hpp
 include include/simgrid/kernel/routing/DragonflyZone.hpp
@@ -2246,7 +2245,8 @@ include src/kernel/resource/LinkImpl.hpp
 include src/kernel/resource/Model.cpp
 include src/kernel/resource/NetworkModel.cpp
 include src/kernel/resource/NetworkModel.hpp
-include src/kernel/resource/NetworkModelIntf_test.cpp
+include src/kernel/resource/NetworkModelFactors.hpp
+include src/kernel/resource/NetworkModelFactors_test.cpp
 include src/kernel/resource/Resource.hpp
 include src/kernel/resource/SplitDuplexLinkImpl.cpp
 include src/kernel/resource/SplitDuplexLinkImpl.hpp

diff --git a/src/kernel/resource/NetworkModel.cpp b/src/kernel/resource/NetworkModel.cpp
index 69dd1dc..8341a7a 100644 (file)
--- a/src/kernel/resource/NetworkModel.cpp
+++ b/src/kernel/resource/NetworkModel.cpp
@@ -13,9 +13,6 @@
 
 #include <numeric>
 
-#ifndef NETWORK_INTERFACE_CPP_
-#define NETWORK_INTERFACE_CPP_
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_network, ker_resource, "Network resources, that fuel communications");
 
 /*********
@@ -138,5 +135,3 @@ void insert_link_latency(std::vector<StandardLinkImpl*>& result, const std::vect
 }
 
 } // namespace simgrid::kernel::resource
-
-#endif /* NETWORK_INTERFACE_CPP_ */

diff --git a/src/kernel/resource/NetworkModel.hpp b/src/kernel/resource/NetworkModel.hpp
index 515c0ef..73de863 100644 (file)
--- a/src/kernel/resource/NetworkModel.hpp
+++ b/src/kernel/resource/NetworkModel.hpp
@@ -7,7 +7,7 @@
 #define SIMGRID_KERNEL_RESOURCE_NETWORKMODEL_HPP
 
 #include "simgrid/kernel/resource/Model.hpp"
-#include "simgrid/kernel/resource/NetworkModelIntf.hpp"
+#include "src/kernel/resource/NetworkModelFactors.hpp"
 #include "src/kernel/resource/StandardLinkImpl.hpp"
 
 #include <list>

diff --git a/include/simgrid/kernel/resource/NetworkModelIntf.hpp b/src/kernel/resource/NetworkModelFactors.hpp
similarity index 93%
rename from include/simgrid/kernel/resource/NetworkModelIntf.hpp
rename to src/kernel/resource/NetworkModelFactors.hpp
index ee1c446..407b31b 100644 (file)
--- a/include/simgrid/kernel/resource/NetworkModelIntf.hpp
+++ b/src/kernel/resource/NetworkModelFactors.hpp
@@ -3,8 +3,8 @@
 /* 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. */
 
-#ifndef SIMGRID_KERNEL_RESOURCE_NETWORKMODELINTF_HPP
-#define SIMGRID_KERNEL_RESOURCE_NETWORKMODELINTF_HPP
+#ifndef SIMGRID_KERNEL_RESOURCE_NETWORKMODELFACTORS_HPP
+#define SIMGRID_KERNEL_RESOURCE_NETWORKMODELFACTORS_HPP
 
 #include <simgrid/forward.h>
 

diff --git a/src/kernel/resource/NetworkModelIntf_test.cpp b/src/kernel/resource/NetworkModelFactors_test.cpp
similarity index 97%
rename from src/kernel/resource/NetworkModelIntf_test.cpp
rename to src/kernel/resource/NetworkModelFactors_test.cpp
index 5574eaa..ffb7897 100644 (file)
--- a/src/kernel/resource/NetworkModelIntf_test.cpp
+++ b/src/kernel/resource/NetworkModelFactors_test.cpp
@@ -5,10 +5,10 @@
 
 #include "catch.hpp"
 
-#include "simgrid/kernel/resource/NetworkModelIntf.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.hpp"
 #include "src/internal_config.h" // HAVE_SMPI
+#include "src/kernel/resource/NetworkModelFactors.hpp"
 
 static double factor_cb(double, const simgrid::s4u::Host*, const simgrid::s4u::Host*,
                         const std::vector<simgrid::s4u::Link*>&, const std::unordered_set<simgrid::s4u::NetZone*>&)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 60c15b5..723d2f4 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -18,6 +18,7 @@ set(EXTRA_DIST
   src/kernel/actor/Simcall.hpp
   src/kernel/resource/LinkImpl.hpp
   src/kernel/resource/NetworkModel.hpp
+  src/kernel/resource/NetworkModelFactors.hpp
   src/kernel/resource/SplitDuplexLinkImpl.hpp
   src/kernel/resource/StandardLinkImpl.hpp
   src/kernel/resource/WifiLinkImpl.hpp
@@ -708,7 +709,6 @@ set(headers_to_install
   include/simgrid/s4u.hpp
 
   include/simgrid/kernel/resource/Action.hpp
-  include/simgrid/kernel/resource/NetworkModelIntf.hpp
   include/simgrid/kernel/resource/Model.hpp
 
   include/simgrid/kernel/routing/ClusterZone.hpp

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index c6d4aa0..4ded9f1 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -123,7 +123,7 @@ ENDIF()
 
 # New tests should use the Catch Framework
 set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
-                src/kernel/resource/NetworkModelIntf_test.cpp
+                src/kernel/resource/NetworkModelFactors_test.cpp
                 src/kernel/resource/SplitDuplexLinkImpl_test.cpp
                 src/kernel/resource/profile/Profile_test.cpp
                 src/kernel/routing/DijkstraZone_test.cpp