Add optimization options in OR-Tools / XPRESS, refactor

docs/CHANGELOG.md

@@ -4,10 +4,11 @@ toc_depth: 2
 
 # Antares Changelog
 
-## Next version 
+## Next version
 --------------------
 ### Improvements
 * STS groups are now "dynamic" : group names are no longer fixed by code, user is free to define these groups.
+* When XPRESS or SCIP solver is selected (using OR-Tools), solver specific parameters can be specified from the command-line (#1837)
 
 ## 9.0.0
 --------------------

docs/reference-guide/10-command_line.md

@@ -41,6 +41,7 @@ _In all cases, arguments " –h" or "–help" can be used to get help_
 |-m, --mps-export | Export anonymous mps weekly or daily optimal UC+dispatch linear |
 |-s, --named-mps-problems | Export named mps weekly or daily optimal UC+dispatch linear |
 |--solver-logs | Print solver logs |
+|--solver-parameters | Set solver-specific parameters, for instance `--solver-parameters="param1 value1 param2 value2"`. Syntax is solver-dependent, and only supported for SCIP & XPRESS. |
 
 - Misc.
 

docs/reference-guide/13-file-format.md

@@ -1,8 +1,8 @@
 # Study format changes
 This is a list of all recent changes that came with new Antares Simulator features. The main goal of this document is to lower the costs of changing existing interfaces, both GUI and scripts.
 ## v9.1.0
-## Input 
-### Hydro Maximum Generation/Pumping Power
+### Input 
+#### Hydro Maximum Generation/Pumping Power
 * For time series ![Migration diagram](migration.png "Migration diagram"), for more details, see [this Python script](migration.py)
 
 Regarding Hydro time-series, the scenario builder allows the user to choose, for a given year and area, a different time series whether we consider :
@@ -12,7 +12,7 @@ This implies that, inside one of the previous categories, the number of availabl
 
 * [Logic changes](17-v91.md)
 
-### Short term storage groups
+#### Short term storage groups
 STS groups in input are now "dynamic" : group names are no longer fixed by code, user is free to define these groups.
 
 In the "thematic trimming" section, the new dynamic variable `STS by group` is now used to enable/disable all variables (level/injection/withdrawal) for all groups. The following variables are obsolete and must not be provided
@@ -35,15 +35,16 @@ Other5_level
 
 The default value for group is "OTHER1".
 
-## Output
-### ST Storage
+### Output
+#### ST Storage
+
 - Output columns for ST storage are capitalized. For any STS group name my_group, 3 output columns are created : `MY_GROUP_INJECTION`, `MY_GROUP_WITHDRAWAL`, `MY_GROUP_LEVEL`.
 - If a group is empty, no column is produced.
 - There is now a variable number of columns in files values-XXX.txt, depending on the groups of ST storages provided by the user. Note that groups are case-insensitive, for example `battery`, `Battery` and `BATTERY` all represent the same group. If no ST storage exist for a given area, no variables associated to ST storages will be produced.
 
 ## v9.0.0
 ### Input
-### Study version
+#### Study version
 Breaking change in the study format, file **study.antares**
 ```
 version = 900

src/libs/antares/CMakeLists.txt

@@ -29,6 +29,8 @@ add_subdirectory(sys)
 add_subdirectory(utils)
 add_subdirectory(writer)
 
+add_subdirectory(optimization-options)
+
 set(HEADERS
         include/antares/antares/antares.h
         include/antares/antares/constants.h

src/libs/antares/InfoCollection/StudyInfoCollector.cpp

@@ -146,17 +146,17 @@ void StudyInfoCollector::solverVersionToFileContent(FileContent& file_content)
 
 void StudyInfoCollector::ORToolsUsed(FileContent& file_content)
 {
-    const bool& ortoolsUsed = study_.parameters.ortoolsUsed;
+    const bool& ortoolsUsed = study_.parameters.optOptions.ortoolsUsed;
     file_content.addItemToSection("study", "ortools used", ortoolsUsed ? "true" : "false");
 }
 
 void StudyInfoCollector::ORToolsSolver(FileContent& file_content)
 {
-    const bool& ortoolsUsed = study_.parameters.ortoolsUsed;
+    const bool& ortoolsUsed = study_.parameters.optOptions.ortoolsUsed;
     std::string ortoolsSolver = "none";
     if (ortoolsUsed)
     {
-        ortoolsSolver = study_.parameters.ortoolsSolver;
+        ortoolsSolver = study_.parameters.optOptions.ortoolsSolver;
     }
     file_content.addItemToSection("study", "ortools solver", ortoolsSolver);
 }

src/libs/antares/checks/include/antares/checks/checkLoadedInputData.h

@@ -18,15 +18,17 @@
 ** You should have received a copy of the Mozilla Public Licence 2.0
 ** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
 */
-
+#include "antares/optimization-options/options.h"
 #include "antares/study/fwd.h"
 
 namespace Antares::Check
 {
+
 void checkOrtoolsUsage(Antares::Data::UnitCommitmentMode ucMode,
                        bool ortoolsUsed,
                        const std::string& solverName);
 
+
 void checkStudyVersion(const AnyString& optStudyFolder);
 
 void checkSimplexRangeHydroPricing(Antares::Data::SimplexOptimization optRange,

src/libs/antares/exception/LoadingError.cpp

@@ -81,6 +81,22 @@ InvalidSolver::InvalidSolver(const std::string& solver, const std::string& avail
 {
 }
 
+static std::string InvalidSolverSpecificParametersHelper(const std::string& solver,
+                                                         const std::string& specificParameters)
+{
+    std::ostringstream message;
+    message << "Specific parameters '" << specificParameters
+            << "' are not valid or not supported for solver " << solver;
+    return message.str();
+}
+
+InvalidSolverSpecificParameters::InvalidSolverSpecificParameters(
+  const std::string& solver,
+  const std::string& specificParameters):
+    LoadingError(InvalidSolverSpecificParametersHelper(solver, specificParameters))
+{
+}
+
 InvalidStudy::InvalidStudy(const Yuni::String& study):
     LoadingError(std::string("The folder `") + study.c_str()
                  + "` does not seem to be a valid study")

src/libs/antares/exception/include/antares/exception/LoadingError.hpp

@@ -130,7 +130,13 @@ class InvalidSolver: public LoadingError
     explicit InvalidSolver(const std::string& solver, const std::string& availableSolverList);
 };
 
-class InvalidStudy: public LoadingError
+class InvalidSolverSpecificParameters : public LoadingError
+{
+public:
+    explicit InvalidSolverSpecificParameters(const std::string& solver, const std::string& specificParameters);
+};
+
+class InvalidStudy : public LoadingError
 {
 public:
     explicit InvalidStudy(const Yuni::String& study);

src/libs/antares/optimization-options/CMakeLists.txt

@@ -0,0 +1,10 @@
+set(PROJ optimization-options)
+
+add_library(${PROJ} INTERFACE)
+
+target_include_directories(${PROJ}
+        INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+add_library(Antares::${PROJ} ALIAS ${PROJ})

src/libs/antares/optimization-options/include/antares/optimization-options/options.h

@@ -0,0 +1,37 @@
+/*
+** Copyright 2007-2024, RTE (https://www.rte-france.com)
+** See AUTHORS.txt
+** SPDX-License-Identifier: MPL-2.0
+** This file is part of Antares-Simulator,
+** Adequacy and Performance assessment for interconnected energy networks.
+**
+** Antares_Simulator is free software: you can redistribute it and/or modify
+** it under the terms of the Mozilla Public Licence 2.0 as published by
+** the Mozilla Foundation, either version 2 of the License, or
+** (at your option) any later version.
+**
+** Antares_Simulator is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** Mozilla Public Licence 2.0 for more details.
+**
+** You should have received a copy of the Mozilla Public Licence 2.0
+** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
+*/
+
+#pragma once
+#include <antares/logs/logs.h>
+
+namespace Antares::Solver::Optimization
+{
+
+struct OptimizationOptions
+{
+    //! Force ortools use
+    bool ortoolsUsed = false;
+    //! The solver name, sirius is the default
+    std::string ortoolsSolver = "sirius";
+    bool solverLogs = false;
+    std::string solverParameters;
+};
+} // namespace Antares::Solver::Optimization

src/libs/antares/study/include/antares/study/load-options.h

@@ -24,6 +24,8 @@
 #include <yuni/yuni.h>
 #include <yuni/core/string.h>
 
+#include <antares/optimization-options/options.h>
+
 #include "parameters.h"
 
 namespace Antares
@@ -63,8 +65,6 @@ class StudyLoadOptions
     bool mpsToExport;
     //! named problems
     bool namedProblems = false;
-    //! enable solver logs
-    bool solverLogs = false;
     //! Ignore all constraints
     bool ignoreConstraints;
     //! Simulation mode
@@ -80,10 +80,8 @@ class StudyLoadOptions
     //! A non-zero value if the data will be used for a simulation
     bool usedByTheSolver;
 
-    //! Force ortools use
-    bool ortoolsUsed;
-    //! THe solver name, sirius is the default
-    std::string ortoolsSolver = "sirius";
+    //! All options related to optimization
+    Antares::Solver::Optimization::OptimizationOptions optOptions;
 
     //! Temporary string for passing log message
     mutable Yuni::String logMessage;

src/libs/antares/study/include/antares/study/parameters.h

@@ -30,6 +30,7 @@
 
 #include <antares/date/date.h>
 #include <antares/inifile/inifile.h>
+#include <antares/optimization-options/options.h>
 #include <antares/study/UnfeasibleProblemBehavior.hpp>
 #include <antares/writer/result_format.h>
 #include "antares/antares/antares.h"
@@ -141,6 +142,11 @@ class Parameters final
     */
     void resetAdqPatchParameters();
 
+    /*!
+    ** \brief Handle priority between command-line option and configuration file
+    */
+    void handleOptimizationOptions(const StudyLoadOptions& options);
+
     /*!
     ** \brief Try to detect then fix any bad value
     */
@@ -509,25 +515,20 @@ class Parameters final
     uint seed[seedMax];
     //@}
 
-    //! \name Ortools configuration
-    //@{
-    //! Define if ortools is used
-    bool ortoolsUsed;
-    //! Ortool solver used for simulation
-    std::string ortoolsSolver;
-    //@}
     // Format of results. Currently, only single files or zip archive are supported
     ResultFormat resultFormat = legacyFilesDirectories;
 
     // Naming constraints and variables in problems
     bool namedProblems;
 
-    // solver logs
-    bool solverLogs;
+    // All options related to optimization
+    Antares::Solver::Optimization::OptimizationOptions optOptions;
 
 private:
     //! Load data from an INI file
-    bool loadFromINI(const IniFile& ini, StudyVersion& version, const StudyLoadOptions& options);
+    bool loadFromINI(const IniFile& ini,
+                     const StudyVersion& version,
+                     const StudyLoadOptions& options);
 
     void resetPlayedYears(uint nbOfYears);
 

src/libs/antares/study/load-options.cpp

@@ -40,8 +40,7 @@ StudyLoadOptions::StudyLoadOptions():
     enableParallel(false),
     forceParallel(false),
     maxNbYearsInParallel(0),
-    usedByTheSolver(false),
-    ortoolsUsed(false)
+    usedByTheSolver(false)
 {
 }