Revert some more

.github/workflows/run-tests/action.yml

@@ -30,7 +30,7 @@ runs:
     shell: bash {0}
     run: |
            cd _build
-           ctest -C Release --output-on-failure -R ${{inputs.variant}} -VV
+           ctest -C Release --output-on-failure -R ${{inputs.variant}}
            echo "RET_CODE=$?" >> $GITHUB_ENV
 
   - name: Clean batches

.github/workflows/windows-vcpkg.yml

@@ -10,21 +10,12 @@ on:
       - issue-*
       - release/*
       - doc/*
-      - windows-scheduled-runs
-
-  workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-        required: false
-        default: false
-
   schedule:
-    - cron: '15 9 * * *'
+    - cron: '21 2 * * *'
 
 jobs:
   windows:
+
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -43,7 +34,6 @@ jobs:
       RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}}
 
     steps:
-
     - uses: actions/checkout@v3
 
     - name: Pre-requisites
@@ -117,27 +107,43 @@ jobs:
       run: |
            cmake -B _build -S src \
            -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
-           -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install;rte-antares-deps-Release" \
+           -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \
            -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \
            -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
            -DCMAKE_BUILD_TYPE=release \
            -DBUILD_TESTING=ON  \
            -DBUILD_TOOLS=ON \
-           -DBUILD_UI=OFF \
-           -DBUILD_not_system=OFF \
-           -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT="ProgramDatabase" \
-           -DCMAKE_EXE_LINKER_FLAGS_RELEASE="/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF"
+           -DBUILD_not_system=OFF
 
     - name: Build
       shell: bash
       run: |
-           cmake --build _build --config release -j10
+           cmake --build _build --config release -j2
+
+    - name: Run unfeasibility-related tests
+      run: |
+           cd _build
+           ctest -C Release --output-on-failure -R unfeasible
+
+    - name: Run unit and end-to-end tests
+      run: |
+           cd _build
+           ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" -LE ortools
 
+    - name: Run kirchhoff-constraint-tests
+      if: ${{ false }}
+      shell: bash
+      run: |
+           tar xvf src/tests/kirchhoff-cbuilder/reference.tar.gz -C src/tests/kirchhoff-cbuilder/
+           cd _build
+           ctest -C Release --output-on-failure -R kirchhoff
 
-    # Enable tmate debugging of manually-triggered workflows if the input option was provided
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-    # if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+    - name: Upload build on failure
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: MPS-diff
+        path: ${{ github.workspace }}/src/tests/mps
 
     # simtest
     - name: Read simtest version
@@ -147,15 +153,81 @@ jobs:
         path: 'simtest.json'
         prop_path: 'version'
 
+    - name: Run named mps tests
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-named-mps
+        os: ${{ matrix.test-platform }}
+        variant: "named-mps"
+
+    - name: Run tests for adequacy patch (CSR)
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: adequacy-patch-CSR
+        os: ${{ matrix.test-platform }}
+
+    - name: Run tests about infinity on BCs RHS
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-v830
+        os: ${{ matrix.test-platform }}
+
+    - name: Run tests introduced in v860
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-v860
+        os: ${{ matrix.test-platform }}
+
+    - name: Run short-tests
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: short-tests
+        os: ${{ matrix.test-platform }}
+
+    - name: Run mps tests
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: valid-mps
+        os: ${{ matrix.test-platform }}
+
+    - name: Run medium-tests
+      if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: medium-tests
+        os: ${{ matrix.test-platform }}
+
+    - name: Run long-tests-1
+      if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: long-tests-1
+        os: ${{ matrix.test-platform }}
 
     - name: Run long-tests-2
-      shell: bash {0}
-      run: |
-        cd _build
-        ctest -C Release --output-on-failure -R json -VV
-        echo "RET_CODE=$?" >> $GITHUB_ENV
+      if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: long-tests-2
+        os: ${{ matrix.test-platform }}
+
+    - name: Run long-tests-3
+      if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
+      uses: ./.github/workflows/run-tests
+      with:
+        simtest-tag: ${{steps.simtest-version.outputs.prop}}
+        batch-name: long-tests-3
+        os: ${{ matrix.test-platform }}
 
-    
     - name: Solver archive creation
       shell: bash
       run: |

.gitignore

@@ -35,7 +35,7 @@ src/ext/yuni/docs/*
 src/ext/yuni/nany/*
 src/ext/yuni/src/compiler-flags-*
 
-
+src/tests/resources/batches/*
 src/tests/benchmark/results.json
 
 src/distrib/win32/version.nsh

src/solver/hydro/CMakeLists.txt

@@ -5,7 +5,6 @@ set(SRC_EXT_SOLVER_H2O_DAILY
 	daily/h2o_j_construire_les_variables.cpp
 	daily/h2o_j_donnees_mensuelles.h
 	daily/h2o_j_donnees_optimisation.h
-	daily/a.cpp
 	daily/h2o_j_fonctions.h
 	daily/h2o_j_free.cpp
 	daily/h2o_j_initialiser_les_bornes_des_variables.cpp