Merge branch 'develop' into feature/test-new-outputs

CMakeGraphVizOptions.cmake

@@ -0,0 +1,3 @@
+set(GRAPHVIZ_GENERATE_PER_TARGET FALSE)
+set(GRAPHVIZ_IGNORE_TARGETS ".*test.*")
+set(GRAPHVIZ_EXTERNAL_LIBS FALSE)

CMakeLists.txt

@@ -407,3 +407,10 @@ endif ()
 #version file to define Xpansion and Antares-simulator versions
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/python/antares_xpansion/__version__.py.in ${CMAKE_CURRENT_SOURCE_DIR}/src/python/antares_xpansion/__version__.py)
 include(CPack)
+
+add_custom_target(graphviz
+        COMMAND ${CMAKE_COMMAND} "--graphviz=xpansion.dot" .
+        COMMAND dot -Tsvg xpansion.dot -o xpansion.svg
+        COMMAND dot -Tpng xpansion.dot -o xpansion.png
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+)

src/cpp/benders/factories/BendersFactory.cpp

@@ -183,7 +183,9 @@ BendersMainFactory::ProcessCriterionInput() {
   const auto fpath = std::filesystem::path(options_.INPUTROOT) /
                      options_.OUTER_LOOP_OPTION_FILE;
   // if adequacy_criterion.yml is provided read it
-  if (std::filesystem::exists(fpath)) {
+  if ((method_ == BENDERSMETHOD::BENDERS_OUTERLOOP ||
+       method_ == BENDERSMETHOD::BENDERS_BY_BATCH_OUTERLOOP) &&
+      std::filesystem::exists(fpath)) {
     return Benders::Criterion::OuterLoopInputFromYaml().Read(fpath);
   }
   // else compute criterion for all areas!