diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 591d497948..d1f77af3c8 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -139,14 +139,6 @@ jobs: path: 'simtest.json' prop_path: 'version' - - name: Run tests for adequacy patch (CSR) - if: ${{ env.IS_PUSH == 'true' }} - 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 if: ${{ env.IS_PUSH == 'true' }} uses: ./.github/workflows/run-tests @@ -171,6 +163,14 @@ jobs: batch-name: valid-mps os: ${{ matrix.test-platform }} + - name: Run tests for adequacy patch (CSR) + if: ${{ env.IS_RELEASE == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: adequacy-patch-CSR + os: ${{ matrix.test-platform }} + - name: Run medium-tests if: ${{ env.IS_RELEASE == 'true' }} uses: ./.github/workflows/run-tests diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml index ed39bc80f3..07190e3135 100644 --- a/.github/workflows/windows-release.yml +++ b/.github/workflows/windows-release.yml @@ -59,7 +59,7 @@ jobs: # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm. # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already). key: | - ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}-invalidate + ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }} - name: Setup Python 3.11 uses: actions/setup-python@v4 @@ -150,7 +150,6 @@ jobs: prop_path: 'version' - name: Run tests for adequacy patch (CSR) - if: ${{ env.IS_PUSH == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d67cd1dfb4..fb095aef93 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,17 @@ Antares Changelog ================= +v8.5.0-rc2 (01/2022) +-------------------- +* Re-publish of v8.5.0-rc1. + +v8.5.0-rc1 (01/2022) +-------------------- +## New features +* Hydraulic patch (#697) +* Curtailment sharing rule for Adequacy Patch (#1062) + + v8.4.2 (01/2022) -------------------- diff --git a/docs/reference-guide/13-file-format.md b/docs/reference-guide/13-file-format.md index c60592fe27..8c2a3a19cc 100644 --- a/docs/reference-guide/13-file-format.md +++ b/docs/reference-guide/13-file-format.md @@ -36,10 +36,23 @@ In existing section `optimization`, remove property `include-split-exported-mps` #### Result format In file **settings/generaldata.ini**, in existing section `output`, add property `result-format` [str]. Default value = `txt-files`. If this property is set to `zip`, all results are written into a single zip archive, instead of multiple files. +In file **settings/generaldata.ini**, in section `adequacy patch`, add properties + +* `price-taking-order` [Enum[isDens = 0, isLoad = 1]]. Default value = `isDens` +* `include-hurdle-cost-csr` [bool]. Default value = `false` +* `check-csr-cost-function` [bool]. Default value = `false` +* `threshold-initiate-curtailment-sharing-rule` [double]. Default value = `0.0` +* `threshold-display-local-matching-rule-violations` [double]. Default value = `0.0` +* `threshold-csr-variable-bounds-relaxation` [int]. Default value = `3` + ### Output #### Result format If property `output/result-format` is set to `zip`, all results are stored in a single archive. The hierarchy within this archive remains identical, for example **economy/mc-all/areas/**. Otherwise, txt files are created like in previous versions. +* If `include-adq-patch` is set to `true`, add column `LMR VIOL.` in files **values-<period>.txt** (mc-all & mc-ind) +* If `include-adq-patch` is set to `true`, add column `SPIL. ENRG. CSR` in files **values-<period>.txt** (mc-all & mc-ind) +* If `include-adq-patch` is set to `true`, add column `DTG MRG CSR` in files **values-<period>.txt** (mc-all & mc-ind) + ## v8.3.2 ### Writing MPS files MPS files of first optimization used to be overwritten by MPS files of second optimization. Not anymore. diff --git a/sonar-project.properties b/sonar-project.properties index da34c616f7..7765f91c72 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.projectName=Antares_Simulator sonar.projectKey=AntaresSimulatorTeam_Antares_Simulator sonar.organization=antaressimulatorteam -sonar.projectVersion=8.4.2 +sonar.projectVersion=8.5.0 # ===================================================== # Properties that will be shared amongst all modules diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aed9236665..071d13994d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.14) # FetchContent_MakeAvailable # Version set(ANTARES_VERSION_HI 8) -set(ANTARES_VERSION_LO 4) -set(ANTARES_VERSION_REVISION 2) -set(ANTARES_VERSION_YEAR 2022) +set(ANTARES_VERSION_LO 5) +set(ANTARES_VERSION_REVISION 0) +set(ANTARES_VERSION_YEAR 2023) project(antares VERSION ${ANTARES_VERSION_HI}.${ANTARES_VERSION_LO}.${ANTARES_VERSION_REVISION}) @@ -15,7 +15,7 @@ set(ANTARES_ONLINE_DOC "https://antares-simulator.readthedocs.io/") # Beta release set(ANTARES_BETA 0) -set(ANTARES_RC 0) +set(ANTARES_RC 3) # OR-Tools tag file(READ "../ortools_tag" ORTOOLS_TAG) diff --git a/src/libs/antares/study/version.cpp b/src/libs/antares/study/version.cpp index dd4c047d8e..c405d9d6e8 100644 --- a/src/libs/antares/study/version.cpp +++ b/src/libs/antares/study/version.cpp @@ -97,7 +97,9 @@ const char* VersionToCStr(const Version v) switch (v) { case versionFutur: - return ">8.4"; + return ">8.5"; + case version850: + return "8.5"; case version840: return "8.4"; case version830: @@ -108,14 +110,14 @@ const char* VersionToCStr(const Version v) return "8.1"; case version800: return "8.0"; + + // older versions case version720: return "7.2"; case version710: return "7.1"; case version700: return "7.0"; - - // older versions case version650: return "6.5"; case version640: @@ -182,7 +184,9 @@ const wchar_t* VersionToWStr(const Version v) switch (v) { case versionFutur: - return L">8.3"; + return L">8.5"; + case version850: + return L"8.5"; case version840: return L"8.4"; case version830: @@ -193,14 +197,14 @@ const wchar_t* VersionToWStr(const Version v) return L"8.1"; case version800: return L"8.0"; + + // older versions case version720: return L"7.2"; case version710: return L"7.1"; case version700: return L"7.0"; - - // older versions case version650: return L"6.5"; case version640: @@ -266,6 +270,8 @@ Version VersionIntToVersion(uint version) // The list should remain ordered in the reverse order for performance reasons switch (version) { + case 850: + return version850; case 840: return version840; case 830: @@ -276,6 +282,8 @@ Version VersionIntToVersion(uint version) return version810; case 800: return version800; + + // older versions case 720: return version720; case 710: diff --git a/src/libs/antares/study/version.h b/src/libs/antares/study/version.h index 97da56c23b..80c155ed07 100644 --- a/src/libs/antares/study/version.h +++ b/src/libs/antares/study/version.h @@ -114,6 +114,8 @@ enum Version version830 = 830, //! Study version 8.4 version840 = 840, + //! Study version 8.5 + version850 = 850, // see versionLatest below // Constants @@ -125,7 +127,7 @@ enum Version enum { //! The latest version - versionLatest = version840, + versionLatest = version850, }; /*! diff --git a/src/solver/optimisation/opt_appel_solveur_quadratique.cpp b/src/solver/optimisation/opt_appel_solveur_quadratique.cpp index ba9063e954..509a8854e3 100644 --- a/src/solver/optimisation/opt_appel_solveur_quadratique.cpp +++ b/src/solver/optimisation/opt_appel_solveur_quadratique.cpp @@ -173,4 +173,4 @@ bool OPT_AppelDuSolveurQuadratique(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudr return false; } -} +} \ No newline at end of file diff --git a/vcpkg_manifest/vcpkg.json b/vcpkg_manifest/vcpkg.json index 48e01e8003..15837160b1 100644 --- a/vcpkg_manifest/vcpkg.json +++ b/vcpkg_manifest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "antares-simulator", - "version-string": "8.3.1", + "version-string": "8.5.0", "dependencies": [ "wxwidgets", "boost-test"