fix circular includes

AntaresSimulatorTeam · Jun 27, 2024 · 398ecee · 398ecee
1 parent d349dd7
commit 398ecee
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/src/solver/application/ScenarioBuilderOwner.cpp b/src/solver/application/ScenarioBuilderOwner.cpp
@@ -25,8 +25,6 @@
 #include "antares/solver/simulation/timeseries-numbers.h"
 #include "antares/solver/ts-generator/generator.h"
 #include "antares/study/study.h"
-#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h"
-
 
 Antares::Solver::ScenarioBuilderOwner::ScenarioBuilderOwner(Data::Study& study):
     study_(study)

diff --git a/src/solver/hydro/CMakeLists.txt b/src/solver/hydro/CMakeLists.txt
@@ -58,6 +58,8 @@ set(SRC_MANAGEMENT
         management/MinGenerationScaling.cpp
         include/antares/solver/hydro/management/HydroInputsChecker.h
         management/HydroInputsChecker.cpp
+        include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h
+        management/hydro-final-reservoir-level-functions.cpp
 )
 
 

diff --git a/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h b/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h
@@ -23,7 +23,6 @@
 #include "antares/date/date.h"
 #include "antares/solver/hydro/management/MinGenerationScaling.h"
 #include "antares/solver/hydro/management/PrepareInflows.h"
-#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h"
 #include "antares/study/study.h"
 namespace Antares
 {

diff --git a/...n/hydro-final-reservoir-level-functions.h → ...t/hydro-final-reservoir-level-functions.h b/...n/hydro-final-reservoir-level-functions.h → ...t/hydro-final-reservoir-level-functions.h
diff --git a/src/solver/hydro/management/HydroInputsChecker.cpp b/src/solver/hydro/management/HydroInputsChecker.cpp
@@ -24,6 +24,7 @@
 
 #include <antares/utils/utils.h>
 #include "antares/antares/fatal-error.h"
+#include "antares/solver/hydro/management/hydro-final-reservoir-level-functions.h"
 #include "antares/solver/hydro/monthly/h2o_m_donnees_annuelles.h"
 #include "antares/solver/hydro/monthly/h2o_m_fonctions.h"
 #include "antares/solver/simulation/common-eco-adq.h"

diff --git a/...hydro-final-reservoir-level-functions.cpp → ...hydro-final-reservoir-level-functions.cpp b/...hydro-final-reservoir-level-functions.cpp → ...hydro-final-reservoir-level-functions.cpp
@@ -25,9 +25,10 @@
 ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
 */
 
-#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h"
-#include "antares/study/parts/hydro/finalLevelValidator.h"
+#include "antares/solver/hydro/management/hydro-final-reservoir-level-functions.h"
+
 #include <antares/antares/fatal-error.h>
+#include "antares/study/parts/hydro/finalLevelValidator.h"
 
 namespace Antares::Solver
 {

diff --git a/src/solver/simulation/CMakeLists.txt b/src/solver/simulation/CMakeLists.txt
@@ -44,8 +44,6 @@ set(SRC_SIMULATION
         include/antares/solver/simulation/adequacy_patch_runtime_data.h
         adequacy_patch_runtime_data.cpp
         include/antares/solver/simulation/ITimeSeriesNumbersWriter.h
-		include/antares/solver/simulation/hydro-final-reservoir-level-functions.h
-		hydro-final-reservoir-level-functions.cpp
         TimeSeriesNumbersWriter.cpp
 		include/antares/solver/simulation/BindingConstraintsTimeSeriesNumbersWriter.h
 		include/antares/solver/simulation/ISimulationObserver.h

diff --git a/src/tests/src/solver/simulation/CMakeLists.txt b/src/tests/src/solver/simulation/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Useful variables definitions
 set(src_solver_simulation "${CMAKE_SOURCE_DIR}/solver/simulation")
+set(src_solver_hydro "${CMAKE_SOURCE_DIR}/solver/hydro")
 set(src_libs_antares_study "${CMAKE_SOURCE_DIR}/libs/antares/study")
 
 set(SRC_TS_NUMBERS
@@ -99,6 +100,7 @@ target_include_directories(test-hydro_final
 	PRIVATE
 	"${src_solver_simulation}"
 	"${src_libs_antares_study}"
+	"${src_solver_hydro}"
 )
 target_link_libraries(test-hydro_final
 	PRIVATE

diff --git a/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp b/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp
@@ -6,10 +6,11 @@
 #define WIN32_LEAN_AND_MEAN
 #include <boost/test/unit_test.hpp>
 
-#include "include/antares/solver/simulation/hydro-final-reservoir-level-functions.h"
-#include "include/antares/study/parts/hydro/finalLevelValidator.h"
 #include <antares/study/study.h>
 
+#include "include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h"
+#include "include/antares/study/parts/hydro/finalLevelValidator.h"
+
 using namespace Antares::Solver;
 using namespace Antares::Data;