From 9b8ae79b92e61aeae029655c9c1ab1fc724432e1 Mon Sep 17 00:00:00 2001 From: Abdoulbari Zakir Date: Tue, 12 Nov 2024 12:06:33 +0100 Subject: [PATCH] rename OuterLoopInputDataReader --- src/cpp/benders/benders_core/CMakeLists.txt | 4 ++-- ...erLoopInputDataReader.cpp => CriterionInputDataReader.cpp} | 2 +- .../benders/benders_core/CriterionComputation.h | 2 +- ...{OuterLoopInputDataReader.h => CriterionInputDataReader.h} | 0 .../antares-xpansion/benders/benders_core/VariablesGroup.h | 2 +- .../antares-xpansion/benders/outer_loop/OuterLoopBiLevel.h | 2 +- tests/cpp/outer_loop/outer_loop_test.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/cpp/benders/benders_core/{OuterLoopInputDataReader.cpp => CriterionInputDataReader.cpp} (98%) rename src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/{OuterLoopInputDataReader.h => CriterionInputDataReader.h} (100%) diff --git a/src/cpp/benders/benders_core/CMakeLists.txt b/src/cpp/benders/benders_core/CMakeLists.txt index 0e5dd396a..c4bd7ac2c 100644 --- a/src/cpp/benders/benders_core/CMakeLists.txt +++ b/src/cpp/benders/benders_core/CMakeLists.txt @@ -23,7 +23,7 @@ target_sources(benders_core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/WorkerMaster.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common.cpp ${CMAKE_CURRENT_SOURCE_DIR}/CriterionComputation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/OuterLoopInputDataReader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CriterionInputDataReader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/VariablesGroup.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/BendersBase.h ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/BendersMathLogger.h @@ -41,7 +41,7 @@ target_sources(benders_core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/WorkerMaster.h ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/common.h ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/CriterionComputation.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/CriterionInputDataReader.h ${CMAKE_CURRENT_SOURCE_DIR}/include/antares-xpansion/benders/benders_core/VariablesGroup.h ) diff --git a/src/cpp/benders/benders_core/OuterLoopInputDataReader.cpp b/src/cpp/benders/benders_core/CriterionInputDataReader.cpp similarity index 98% rename from src/cpp/benders/benders_core/OuterLoopInputDataReader.cpp rename to src/cpp/benders/benders_core/CriterionInputDataReader.cpp index cf58717c6..be4a62b7d 100644 --- a/src/cpp/benders/benders_core/OuterLoopInputDataReader.cpp +++ b/src/cpp/benders/benders_core/CriterionInputDataReader.cpp @@ -1,4 +1,4 @@ -#include "include/antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h" +#include "include/antares-xpansion/benders/benders_core/CriterionInputDataReader.h" #include diff --git a/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionComputation.h b/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionComputation.h index aa601d23c..dcc995962 100644 --- a/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionComputation.h +++ b/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionComputation.h @@ -1,6 +1,6 @@ #pragma once -#include "OuterLoopInputDataReader.h" +#include "CriterionInputDataReader.h" #include "VariablesGroup.h" namespace Benders::Criterion { diff --git a/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h b/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionInputDataReader.h similarity index 100% rename from src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h rename to src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionInputDataReader.h diff --git a/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/VariablesGroup.h b/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/VariablesGroup.h index 4f82153d5..c3c2b7aff 100644 --- a/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/VariablesGroup.h +++ b/src/cpp/benders/benders_core/include/antares-xpansion/benders/benders_core/VariablesGroup.h @@ -3,7 +3,7 @@ #include #include -#include "OuterLoopInputDataReader.h" +#include "CriterionInputDataReader.h" namespace Benders::Criterion { class VariablesGroup { public: diff --git a/src/cpp/benders/outer_loop/include/antares-xpansion/benders/outer_loop/OuterLoopBiLevel.h b/src/cpp/benders/outer_loop/include/antares-xpansion/benders/outer_loop/OuterLoopBiLevel.h index 59971f2b5..1e97b2779 100644 --- a/src/cpp/benders/outer_loop/include/antares-xpansion/benders/outer_loop/OuterLoopBiLevel.h +++ b/src/cpp/benders/outer_loop/include/antares-xpansion/benders/outer_loop/OuterLoopBiLevel.h @@ -1,5 +1,5 @@ #pragma once -#include "antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h" +#include "antares-xpansion/benders/benders_core/CriterionInputDataReader.h" // TODO typedef std::map Point; diff --git a/tests/cpp/outer_loop/outer_loop_test.cpp b/tests/cpp/outer_loop/outer_loop_test.cpp index 725472d49..2361179e3 100644 --- a/tests/cpp/outer_loop/outer_loop_test.cpp +++ b/tests/cpp/outer_loop/outer_loop_test.cpp @@ -1,6 +1,6 @@ +#include "antares-xpansion/benders/benders_core/CriterionInputDataReader.h" #include "antares-xpansion/benders/benders_core/MasterUpdate.h" -#include "antares-xpansion/benders/benders_core/OuterLoopInputDataReader.h" #include "antares-xpansion/benders/benders_core/VariablesGroup.h" #include "antares-xpansion/benders/benders_mpi/OuterLoopBenders.h" #include "antares-xpansion/benders/factories/LoggerFactories.h"