New hydro remix : create a cmake target for remix hydro algorithm

AntaresSimulatorTeam · Jan 7, 2025 · 37bb2be · 37bb2be
1 parent 511435a
commit 37bb2be
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/solver/simulation/CMakeLists.txt b/src/solver/simulation/CMakeLists.txt
@@ -76,6 +76,18 @@ target_link_libraries(antares-solver-simulation
         antares-solver-ts-generator
 )
 
+# Remix hydro algorithm
+add_library(shave-peaks-by-remix-hydro)
+
+target_sources(shave-peaks-by-remix-hydro
+        PRIVATE
+        shave-peaks-by-remix-hydro.cpp)
+
+target_include_directories(shave-peaks-by-remix-hydro
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+
+
 install(DIRECTORY include/antares
         DESTINATION "include"
 )
diff --git a/...tares/solver/simulation/hydro-remix-new.h → ...r/simulation/shave-peaks-by-remix-hydro.h b/...tares/solver/simulation/hydro-remix-new.h → ...r/simulation/shave-peaks-by-remix-hydro.h
diff --git a/src/solver/simulation/hydro-remix-new.cpp → ...simulation/shave-peaks-by-remix-hydro.cpp b/src/solver/simulation/hydro-remix-new.cpp → ...simulation/shave-peaks-by-remix-hydro.cpp
@@ -1,4 +1,4 @@
-#include "include/antares/solver/simulation/hydro-remix-new.h"
+#include "include/antares/solver/simulation/shave-peaks-by-remix-hydro.h"
 
 #include <algorithm>
 #include <ranges>

diff --git a/src/tests/src/solver/simulation/CMakeLists.txt b/src/tests/src/solver/simulation/CMakeLists.txt
@@ -66,8 +66,6 @@ add_boost_test(test-hydro_final
 add_boost_test(tests-on-hydro-remix
         SRC
         test-hydro-remix.cpp
-        ${src_solver_simulation}/hydro-remix-new.cpp
-        INCLUDE
-        "${src_solver_simulation}"
         LIBS
+        shave-peaks-by-remix-hydro
         test_utils_unit)
diff --git a/src/tests/src/solver/simulation/test-hydro-remix.cpp b/src/tests/src/solver/simulation/test-hydro-remix.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "include/antares/solver/simulation/hydro-remix-new.h"
+#include "antares/solver/simulation/shave-peaks-by-remix-hydro.h"
 
 using namespace Antares::Solver::Simulation;