Merge branch 'develop' into release/1.4.0

AntaresSimulatorTeam · Feb 10, 2025 · 3f5850a · 3f5850a
2 parents eff4d49 + 251556d
commit 3f5850a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/cpp/lpnamer/main/include/antares-xpansion/lpnamer/main/ProblemGeneration.h b/src/cpp/lpnamer/main/include/antares-xpansion/lpnamer/main/ProblemGeneration.h
@@ -10,17 +10,15 @@
 
 #include <antares/solver/lps/LpsFromAntares.h>
 
-// clang-format off
+#include "ProblemGenerationOptions.h"
+#include "antares-xpansion/helpers/ArchiveReader.h"
+#include "antares-xpansion/lpnamer/helper/ProblemGenerationLogger.h"
 #include "antares-xpansion/lpnamer/input_reader/MpsTxtWriter.h"
+#include "antares-xpansion/lpnamer/main/ProblemGenerationExeOptions.h"
 #include "antares-xpansion/lpnamer/model/Problem.h"
 #include "antares-xpansion/lpnamer/model/SimulationInputMode.h"
-#include "antares-xpansion/helpers/ArchiveReader.h"
-#include "antares-xpansion/lpnamer/main/ProblemGenerationExeOptions.h"
-#include "antares-xpansion/lpnamer/helper/ProblemGenerationLogger.h"
-#include "ProblemGenerationOptions.h"
 #include "antares-xpansion/multisolver_interface/SolverAbstract.h"
 #include "antares-xpansion/multisolver_interface/SolverConfig.h"
-// clang-format on
 
 class ProblemGeneration
 {