remove "Aux" from folder and file names

AntaresSimulatorTeam · Oct 4, 2024 · a506037 · a506037
1 parent 41b6f16
commit a506037
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/solver/simulation/solver.hxx b/src/solver/simulation/solver.hxx
@@ -40,7 +40,7 @@
 #include "../ts-generator/generator.h"
 #include "opt_time_writer.h"
 #include "../hydro/management.h" // Added for use of randomReservoirLevel(...)
-#include "../ts-generator/optimized-thermal-generator/auxillary/pre-scenario-builder.h"
+#include "../ts-generator/optimized-thermal-generator/support/pre-scenario-builder.h"
 
 #include <yuni/core/system/suspend.h>
 #include <yuni/job/job.h>

diff --git a/src/solver/ts-generator/CMakeLists.txt b/src/solver/ts-generator/CMakeLists.txt
@@ -13,12 +13,12 @@ source_group("ts-generator\\Randomized-thermal-generator" FILES ${SRC_RANDOMIZED
 # Optimized-thermal-ts-generator
 #
 set(SRC_OPTIMIZEDGENERATORS
-	optimized-thermal-generator/auxillary/AuxillaryStructures.h
-	optimized-thermal-generator/auxillary/AuxillaryStructures.cpp
-	optimized-thermal-generator/auxillary/AuxFreeFun.h
-	optimized-thermal-generator/auxillary/AuxFreeFun.cpp
-	optimized-thermal-generator/auxillary/pre-scenario-builder.h
-	optimized-thermal-generator/auxillary/pre-scenario-builder.cpp
+	optimized-thermal-generator/support/SupportStructures.h
+	optimized-thermal-generator/support/SupportStructures.cpp
+	optimized-thermal-generator/support/SupportFunctions.h
+	optimized-thermal-generator/support/SupportFunctions.cpp
+	optimized-thermal-generator/support/pre-scenario-builder.h
+	optimized-thermal-generator/support/pre-scenario-builder.cpp
 	optimized-thermal-generator/main/OptimizedGenerator.h
 	optimized-thermal-generator/main/OptimizedGenerator.cpp
 	optimized-thermal-generator/parameters/OptimizationParameters.h

diff --git a/src/solver/ts-generator/optimized-thermal-generator/main/OptimizedGenerator.h b/src/solver/ts-generator/optimized-thermal-generator/main/OptimizedGenerator.h
@@ -7,8 +7,8 @@
 #include "ortools/linear_solver/linear_solver.h"
 #include "../../randomized-thermal-generator/RandomizedGenerator.h"
 #include "../../../../libs/antares/study/maintenance_planning/MaintenanceGroup.h"
-#include "../auxillary/AuxillaryStructures.h"
-#include "../auxillary/AuxFreeFun.h"
+#include "../support/SupportStructures.h"
+#include "../support/SupportFunctions.h"
 #include "../parameters/OptimizationParameters.h"
 #include <antares/exception/AssertionError.hpp>
 

diff --git a/...hermal-generator/auxillary/AuxFreeFun.cpp → ...al-generator/support/SupportFunctions.cpp b/...hermal-generator/auxillary/AuxFreeFun.cpp → ...al-generator/support/SupportFunctions.cpp
@@ -5,7 +5,7 @@
 #include <numeric>
 #include <algorithm>
 #include "../main/OptimizedGenerator.h"
-#include "../auxillary/AuxFreeFun.h"
+#include "../support/SupportFunctions.h"
 
 namespace Antares::Solver::TSGenerator
 {
@@ -79,7 +79,7 @@ std::array<double, HOURS_PER_YEAR> calculateAverageRenewableTs(
     }
 }
 
-// auxillary functions - for parameter calculations
+// support functions - for parameter calculations
 std::array<double, DAYS_PER_YEAR> calculateDailySums(
   const std::array<double, HOURS_PER_YEAR>& hourlyValues)
 {

diff --git a/...-thermal-generator/auxillary/AuxFreeFun.h → ...rmal-generator/support/SupportFunctions.h b/...-thermal-generator/auxillary/AuxFreeFun.h → ...rmal-generator/support/SupportFunctions.h
@@ -9,7 +9,7 @@
 namespace Antares::Solver::TSGenerator
 {
 
-// auxillary functions
+// support functions
 std::array<double, DAYS_PER_YEAR> calculateDailySums(
   const std::array<double, HOURS_PER_YEAR>& hourlyValues);
 std::array<double, HOURS_PER_YEAR> calculateAverageTs(const Matrix<double>& tsValue,

diff --git a/...nerator/auxillary/AuxillaryStructures.cpp → ...l-generator/support/SupportStructures.cpp b/...nerator/auxillary/AuxillaryStructures.cpp → ...l-generator/support/SupportStructures.cpp
@@ -2,7 +2,7 @@
 // Created by milos on 14/11/23.
 //
 
-#include "AuxillaryStructures.h"
+#include "SupportStructures.h"
 
 namespace Antares::Solver::TSGenerator
 {

diff --git a/...generator/auxillary/AuxillaryStructures.h → ...mal-generator/support/SupportStructures.h b/...generator/auxillary/AuxillaryStructures.h → ...mal-generator/support/SupportStructures.h
diff --git a/...erator/auxillary/pre-scenario-builder.cpp → ...enerator/support/pre-scenario-builder.cpp b/...erator/auxillary/pre-scenario-builder.cpp → ...enerator/support/pre-scenario-builder.cpp
diff --git a/...enerator/auxillary/pre-scenario-builder.h → ...-generator/support/pre-scenario-builder.h b/...enerator/auxillary/pre-scenario-builder.h → ...-generator/support/pre-scenario-builder.h