Remove unnecessary ".inc.hxx" files (#2031)

Replaces ugly includes which behaviour is guided by preprocessor definition, with standard template instantiation mechanisms. --------- Signed-off-by: Sylvain Leclerc <[email protected]>
AntaresSimulatorTeam · Apr 11, 2024 · 5c8796b · 5c8796b
1 parent 88fe914
commit 5c8796b
Show file tree

Hide file tree

Showing 12 changed files with 260 additions and 532 deletions.
diff --git a/src/solver/variable/CMakeLists.txt b/src/solver/variable/CMakeLists.txt
@@ -12,7 +12,6 @@ set(SRC_VARIABLE
         include/antares/solver/variable/state.hxx
         include/antares/solver/variable/area.h
         include/antares/solver/variable/area.hxx
-        include/antares/solver/variable/area.inc.hxx
         include/antares/solver/variable/setofareas.h
         include/antares/solver/variable/setofareas.hxx
         include/antares/solver/variable/bindConstraints.h
@@ -68,9 +67,6 @@ source_group("variable\\common" FILES ${SRC_VARIABLE_COMMON})
 
 set(SRC_VARIABLE_ADEQUACY
         include/antares/solver/variable/adequacy/all.h
-        adequacy/area.cpp
-        adequacy/area.memory-estimation.cpp
-        adequacy/bc.memory-estimation.cpp
         include/antares/solver/variable/adequacy/links.h
         include/antares/solver/variable/adequacy/spilledEnergy.h
         include/antares/solver/variable/adequacy/overallCost.h
@@ -81,9 +77,6 @@ source_group("variable\\adequacy" FILES ${SRC_VARIABLE_ADEQUACY})
 set(SRC_VARIABLE_ECONOMY
         include/antares/solver/variable/economy/all.h
         include/antares/solver/variable/economy/links.h
-        economy/area.cpp
-        economy/area.memory-estimation.cpp
-        economy/bc.memory-estimation.cpp
 
         # Variables for Economy
         include/antares/solver/variable/economy/max-mrg.h
@@ -170,10 +163,6 @@ target_link_libraries(antares-solver-variable
 add_library(antares-solver-variable-info
         include/antares/solver/variable/adequacy/all.h
         include/antares/solver/variable/economy/all.h
-        economy/area.memory-estimation.cpp
-        adequacy/area.memory-estimation.cpp
-        economy/bc.memory-estimation.cpp
-        adequacy/bc.memory-estimation.cpp
         include/antares/solver/variable/surveyresults.h
         include/antares/solver/variable/surveyresults/surveyresults.h
         include/antares/solver/variable/surveyresults/data.h

diff --git a/src/solver/variable/adequacy/area.cpp b/src/solver/variable/adequacy/area.cpp
diff --git a/src/solver/variable/adequacy/area.memory-estimation.cpp b/src/solver/variable/adequacy/area.memory-estimation.cpp
diff --git a/src/solver/variable/adequacy/bc.memory-estimation.cpp b/src/solver/variable/adequacy/bc.memory-estimation.cpp
diff --git a/src/solver/variable/economy/area.cpp b/src/solver/variable/economy/area.cpp
diff --git a/src/solver/variable/economy/area.memory-estimation.cpp b/src/solver/variable/economy/area.memory-estimation.cpp
diff --git a/src/solver/variable/economy/bc.memory-estimation.cpp b/src/solver/variable/economy/bc.memory-estimation.cpp