From a50603794322242516e61874ce09cf3c2e78b979 Mon Sep 17 00:00:00 2001 From: Milos-RTEi Date: Fri, 4 Oct 2024 12:40:11 +0200 Subject: [PATCH] remove "Aux" from folder and file names --- src/solver/simulation/solver.hxx | 2 +- src/solver/ts-generator/CMakeLists.txt | 12 ++++++------ .../main/OptimizedGenerator.h | 4 ++-- .../AuxFreeFun.cpp => support/SupportFunctions.cpp} | 4 ++-- .../AuxFreeFun.h => support/SupportFunctions.h} | 2 +- .../SupportStructures.cpp} | 2 +- .../SupportStructures.h} | 0 .../{auxillary => support}/pre-scenario-builder.cpp | 0 .../{auxillary => support}/pre-scenario-builder.h | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary/AuxFreeFun.cpp => support/SupportFunctions.cpp} (98%) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary/AuxFreeFun.h => support/SupportFunctions.h} (98%) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary/AuxillaryStructures.cpp => support/SupportStructures.cpp} (97%) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary/AuxillaryStructures.h => support/SupportStructures.h} (100%) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary => support}/pre-scenario-builder.cpp (100%) rename src/solver/ts-generator/optimized-thermal-generator/{auxillary => support}/pre-scenario-builder.h (100%) diff --git a/src/solver/simulation/solver.hxx b/src/solver/simulation/solver.hxx index 06f906ed4f..42875f216e 100644 --- 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 #include diff --git a/src/solver/ts-generator/CMakeLists.txt b/src/solver/ts-generator/CMakeLists.txt index 84a7e58249..02220be4af 100644 --- 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 index e5ec2e9c5c..74c913e8b3 100644 --- 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 diff --git a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.cpp b/src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.cpp similarity index 98% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.cpp rename to src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.cpp index afe5c1237c..9b2ce80882 100644 --- a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.cpp +++ b/src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.cpp @@ -5,7 +5,7 @@ #include #include #include "../main/OptimizedGenerator.h" -#include "../auxillary/AuxFreeFun.h" +#include "../support/SupportFunctions.h" namespace Antares::Solver::TSGenerator { @@ -79,7 +79,7 @@ std::array calculateAverageRenewableTs( } } -// auxillary functions - for parameter calculations +// support functions - for parameter calculations std::array calculateDailySums( const std::array& hourlyValues) { diff --git a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.h b/src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.h similarity index 98% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.h rename to src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.h index 492d0236d0..1fb5554937 100644 --- a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxFreeFun.h +++ b/src/solver/ts-generator/optimized-thermal-generator/support/SupportFunctions.h @@ -9,7 +9,7 @@ namespace Antares::Solver::TSGenerator { -// auxillary functions +// support functions std::array calculateDailySums( const std::array& hourlyValues); std::array calculateAverageTs(const Matrix& tsValue, diff --git a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxillaryStructures.cpp b/src/solver/ts-generator/optimized-thermal-generator/support/SupportStructures.cpp similarity index 97% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxillaryStructures.cpp rename to src/solver/ts-generator/optimized-thermal-generator/support/SupportStructures.cpp index 22496a2130..ede3325fe4 100644 --- a/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxillaryStructures.cpp +++ b/src/solver/ts-generator/optimized-thermal-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/src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxillaryStructures.h b/src/solver/ts-generator/optimized-thermal-generator/support/SupportStructures.h similarity index 100% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/AuxillaryStructures.h rename to src/solver/ts-generator/optimized-thermal-generator/support/SupportStructures.h diff --git a/src/solver/ts-generator/optimized-thermal-generator/auxillary/pre-scenario-builder.cpp b/src/solver/ts-generator/optimized-thermal-generator/support/pre-scenario-builder.cpp similarity index 100% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/pre-scenario-builder.cpp rename to src/solver/ts-generator/optimized-thermal-generator/support/pre-scenario-builder.cpp diff --git a/src/solver/ts-generator/optimized-thermal-generator/auxillary/pre-scenario-builder.h b/src/solver/ts-generator/optimized-thermal-generator/support/pre-scenario-builder.h similarity index 100% rename from src/solver/ts-generator/optimized-thermal-generator/auxillary/pre-scenario-builder.h rename to src/solver/ts-generator/optimized-thermal-generator/support/pre-scenario-builder.h