rename OuterLoopInputDataReader

AntaresSimulatorTeam · Nov 12, 2024 · 9b8ae79 · 9b8ae79
1 parent 6a3ba09
commit 9b8ae79
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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/...benders_core/OuterLoopInputDataReader.cpp → ...benders_core/CriterionInputDataReader.cpp b/...benders_core/OuterLoopInputDataReader.cpp → ...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 <utility>
 

diff --git a/...benders/benders_core/include/antares-xpansion/benders/benders_core/CriterionComputation.h b/...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/...s/benders_core/OuterLoopInputDataReader.h → ...s/benders_core/CriterionInputDataReader.h b/...s/benders_core/OuterLoopInputDataReader.h → ...s/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
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#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
@@ -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<std::string, double> Point;

diff --git 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"