Bump OR-Tools 9.2 -> 9.5, fix random compilation errors in Windows (#…

…1167)

* Bump OR-Tools 9.2 -> 9.5

* Remove typedef struct, use C++ declarations instead

* Fix error C2445

result type of conditional expression is ambiguous: types 'const wchar_t [5]' and 'wxString' can be converted to multiple common types [D:\a\Antares_Simulator\Antares_Simulator\_build\ui\simulator\antares-8.5-ui-simulator.vcxproj]

* rte1.0 -> rte1.1

* Bump to 9.5-rte2.0

* Fix error C2445

result type of conditional expression is ambiguous: types 'const wchar_t [5]' and 'wxString' can be converted to multiple common types [D:\a\Antares_Simulator\Antares_Simulator\_build\ui\simulator\antares-8.5-ui-simulator.vcxproj]

.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.2-rte2.1/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
+           echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
 
     - name: Download OR-Tools
       id: ortools

.github/workflows/sonarcloud.yml

@@ -22,7 +22,7 @@ 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.2-rte1.7/ortools_cxx_ubuntu-20.04_static_sirius.zip"
+      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

.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.2-rte2.1/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
+          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
 
     - name: Download pre-compiled librairies
       uses: ./.github/workflows/download-extract-precompiled-libraries-tgz

.github/workflows/windows-release.yml

@@ -20,7 +20,7 @@ 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.2-rte2.1/ortools_cxx_windows-latest_static_sirius.zip"
+      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

.github/workflows/windows-vcpkg.yml

@@ -28,7 +28,7 @@ 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.2-rte2.1/ortools_cxx_windows-latest_static_sirius.zip"
+      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

ortools_tag

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

src/ui/simulator/windows/simulation/run.cpp

@@ -91,7 +91,11 @@ static wxString TimeSeriesToWxString(uint m)
         r << (r.empty() ? wxEmptyString : wxT(", ")) << wxT("wind");
     if (m & Data::timeSeriesThermal)
         r << (r.empty() ? wxEmptyString : wxT(", ")) << wxT("thermal");
-    return r.empty() ? wxT("none") : r;
+
+    if (r.empty())
+        return wxT("none");
+    else
+        return r;
 }
 
 static inline void UpdateLabel(bool& guiUpdated, wxStaticText* label, const wxString& text)