cherry pick 1

.github/workflows/centos7.yml

@@ -48,7 +48,7 @@ jobs:
 
     - name: Config OR-Tools URL
       run: |
-           echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
+           echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
 
     - name: Download OR-Tools
       id: ortools

.github/workflows/sonarcloud.yml

@@ -22,12 +22,18 @@ jobs:
       # https://sonarcloud.io/documentation/analysis/scan/sonarscanner/
       SONAR_SERVER_URL: "https://sonarcloud.io"
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
-      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip"
 
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Config OR-Tools URL
+        run: |
+            echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
+
+      - name: Install sonar-scanner and build-wrapper
+        uses: SonarSource/sonarcloud-github-c-cpp@v2
 
       - name: ccache
         uses: hendrikmuhs/[email protected]
@@ -42,16 +48,6 @@ jobs:
           key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}
           restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}
 
-      - name: Download and setup sonar-scanner
-        shell: bash
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        if: steps.sonarcloud-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p $HOME/.sonar
-          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-
       - name: Download and setup build-wrapper
         shell: bash
         env:

.github/workflows/ubuntu.yml

@@ -59,7 +59,7 @@ jobs:
 
     - name: Config OR-Tools URL
       run: |
-          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
 
     - name: Download pre-compiled librairies
       uses: ./.github/workflows/download-extract-precompiled-libraries-tgz

.github/workflows/windows-release.yml

@@ -20,11 +20,15 @@ jobs:
       # Indicates the location of the vcpkg as a Git submodule of the project repository.
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
-      ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip"
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Config OR-Tools URL
+      run: |
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_windows-latest_static_sirius.zip" >> $GITHUB_ENV    
+      shell: bash
+
     - name: Pre-requisites
       shell: cmd
       run: |

.github/workflows/windows-vcpkg.yml

@@ -29,10 +29,16 @@ jobs:
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
       ORTOOLS_DIR: ${{ github.workspace }}/or-tools
       ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip"
+      RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}}
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Config OR-Tools URL
+      run: |
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_windows-latest_static_sirius.zip" >> $GITHUB_ENV
+      shell: bash
+
     - name: Pre-requisites
       shell: cmd
       run: |

ortools_tag

@@ -1 +1 @@
-v9.5-rte2.0
+v9.5-rte3.0

src/CMakeLists.txt

@@ -261,7 +261,8 @@ message(STATUS "OR-Tools tag ${ORTOOLS_TAG}")
   set(BUILD_SAMPLES "OFF" CACHE INTERNAL "")
   set(BUILD_FLATZINC "OFF" CACHE INTERNAL "")
   set(BUILD_EXAMPLES "OFF" CACHE INTERNAL "")
-  set(USE_SCIP "OFF" CACHE INTERNAL "")
+  set(USE_SCIP "ON" CACHE INTERNAL "")
+  set(USE_GLPK "ON" CACHE INTERNAL "")
   # We build OR-Tools as a static lib. Cyclic dependencies are detected
   # without this flag.
   set(BUILD_SHARED_LIBS "OFF" CACHE INTERNAL "")

src/solver/optimisation/opt_structure_probleme_a_resoudre.h

@@ -30,6 +30,7 @@
 #include <vector>
 #include <string>
 #include "opt_constants.h"
+#include "ortools/linear_solver/linear_solver.h"
 
 /*--------------------------------------------------------------------------------------*/
 
@@ -40,7 +41,7 @@ typedef struct
 } PROBLEMES_SIMPLEXE;
 
 /* Le probleme a resoudre */
-typedef struct
+struct PROBLEME_ANTARES_A_RESOUDRE
 {
     /* La matrice des contraintes */
     int NombreDeVariables;
@@ -111,10 +112,14 @@ typedef struct
     std::vector<std::string> NomDesVariables;
     std::vector<std::string> NomDesContraintes;
 
+    std::vector<bool> VariablesEntieres; // true = int, false = continuous
+
+private:
+  using BasisStatus = operations_research::MPSolver::BasisStatus;
 public:
-    std::vector<int> StatutDesVariables;
-    std::vector<int> StatutDesContraintes;
+    std::vector<BasisStatus> StatutDesVariables;
+    std::vector<BasisStatus> StatutDesContraintes;
 
-} PROBLEME_ANTARES_A_RESOUDRE;
+};
 
 #endif /* __SOLVER_OPTIMISATION_STRUCTURE_PROBLEME_A_RESOUDRE_H__ */

src/solver/utils/include/antares/solver/utils/named_problem.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include "spx_definition_arguments.h"
+#include "spx_fonctions.h"
+
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <iterator>
+#include "ortools/linear_solver/linear_solver.h"
+
+namespace Antares
+{
+namespace Optimization
+{
+struct PROBLEME_SIMPLEXE_NOMME : public PROBLEME_SIMPLEXE
+{
+private:
+    using BasisStatus = operations_research::MPSolver::BasisStatus;
+public:
+    PROBLEME_SIMPLEXE_NOMME(std::vector<std::string>& NomDesVariables,
+                            std::vector<std::string>& NomDesContraintes,
+                            std::vector<BasisStatus>& StatutDesVariables,
+                            std::vector<BasisStatus>& StatutDesContraintes);
+
+    std::vector<std::string>& NomDesVariables;
+    std::vector<std::string>& NomDesContraintes;
+
+    std::vector<BasisStatus>& StatutDesVariables;
+    std::vector<BasisStatus>& StatutDesContraintes;
+
+    bool isMIP() const;
+    bool basisExists() const;
+
+};
+} // namespace Optimization
+} // namespace Antares

src/solver/utils/named_problem.cpp

@@ -1,13 +1,15 @@
-#include "named_problem.h"
+#include "antares/solver/utils/named_problem.h"
 
 namespace Antares
 {
 namespace Optimization
 {
+using BasisStatus = operations_research::MPSolver::BasisStus;
+
 PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(const std::vector<std::string>& NomDesVariables,
                                                  const std::vector<std::string>& NomDesContraintes,
-                                                 std::vector<int>& StatutDesVariables,
-                                                 std::vector<int>& StatutDesContraintes) :
+                                                 std::vector<BasisStatus>& StatutDesVariables,
+                                                 std::vector<BasisStatus>& StatutDesContraintes) :
  NomDesVariables(NomDesVariables),
  NomDesContraintes(NomDesContraintes),
  StatutDesVariables(StatutDesVariables),

src/solver/utils/ortools_utils.cpp

@@ -299,6 +299,17 @@ MPSolver* ORTOOLS_ConvertIfNeeded(const Antares::Optimization::PROBLEME_SIMPLEXE
     }
 }
 
+template<class SourceT>
+static void transferBasis(std::vector<operations_research::MPSolver::BasisStatus>& destination,
+                          const SourceT& source)
+{
+    destination.resize(source.size());
+    for (size_t idx = 0; idx < source.size(); idx++)
+    {
+        destination[idx] = source[idx]->basis_status();
+    }
+}
+
 MPSolver* ORTOOLS_Simplexe(Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* Probleme,
                            MPSolver* solver,
                            bool keepBasis)
@@ -309,7 +320,8 @@ MPSolver* ORTOOLS_Simplexe(Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* Probl
     // Provide an initial simplex basis, if any
     if (warmStart && Probleme->basisExists())
     {
-        solver->SetStartingLpBasisInt(Probleme->StatutDesVariables, Probleme->StatutDesContraintes);
+        solver->SetStartingLpBasis(Probleme->StatutDesVariables,
+                                   Probleme->StatutDesContraintes);
     }
 
     if (solveAndManageStatus(solver, Probleme->ExistenceDUneSolution, params))
@@ -318,8 +330,8 @@ MPSolver* ORTOOLS_Simplexe(Antares::Optimization::PROBLEME_SIMPLEXE_NOMME* Probl
         // Save the final simplex basis for next resolutions
         if (warmStart && keepBasis)
         {
-            solver->GetFinalLpBasisInt(Probleme->StatutDesVariables,
-                                       Probleme->StatutDesContraintes);
+            transferBasis(Probleme->StatutDesVariables, solver->variables());
+            transferBasis(Probleme->StatutDesContraintes, solver->constraints());
         }
     }
 
@@ -370,7 +382,8 @@ const std::map<std::string, struct OrtoolsUtils::SolverNames> OrtoolsUtils::solv
   = {{"xpress", {"xpress_lp", "xpress"}},
      {"sirius", {"sirius_lp", "sirius"}},
      {"coin", {"clp", "cbc"}},
-     {"glpk", {"glpk_lp", "glpk"}}};
+     {"glpk", {"glpk_lp", "glpk"}},
+     {"scip", {"scip", "scip"}}};
 
 std::list<std::string> getAvailableOrtoolsSolverName()
 {