From 3b5509b5e072256c0e683e7c0a367083815d7819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A8=D9=84=D8=A7=D9=84=20=D9=85=D8=B3=D9=84=D9=88=D8=A8?= Date: Thu, 8 Aug 2024 21:31:52 +0200 Subject: [PATCH] New antares emulator 8 (#302) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "Add I/O & doc for CurtailmentSharing::recomputeDTGMRG [ANT-1809] (#2141)" This reverts commit f758ed6aadf962367b336358d8d62e8c96a3caad. * Rename .github/workflows/branchNameValidation.yml to New Antares Emulator-8 Signed-off-by: بلال مسلوب --------- Signed-off-by: بلال مسلوب --- .../branchNameValidation.yml => New Antares Emulator-8 | 0 docs/user-guide/04-migration-guides.md | 1 - src/libs/antares/study/parameters/adq-patch-params.cpp | 7 ------- 3 files changed, 8 deletions(-) rename .github/workflows/branchNameValidation.yml => New Antares Emulator-8 (100%) diff --git a/.github/workflows/branchNameValidation.yml b/New Antares Emulator-8 similarity index 100% rename from .github/workflows/branchNameValidation.yml rename to New Antares Emulator-8 diff --git a/docs/user-guide/04-migration-guides.md b/docs/user-guide/04-migration-guides.md index 729818c28f..e7758be70d 100644 --- a/docs/user-guide/04-migration-guides.md +++ b/docs/user-guide/04-migration-guides.md @@ -193,7 +193,6 @@ In file **settings/generaldata.ini**, in section `adequacy patch`, add propertie * `price-taking-order` [string] can take values `DENS` (default value) and `Load`. * `include-hurdle-cost-csr` [bool]. Default value = `false` * `check-csr-cost-function` [bool]. Default value = `false` -* `recompute-dtg-mrg` [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` diff --git a/src/libs/antares/study/parameters/adq-patch-params.cpp b/src/libs/antares/study/parameters/adq-patch-params.cpp index a0656d21fd..172ba309ba 100644 --- a/src/libs/antares/study/parameters/adq-patch-params.cpp +++ b/src/libs/antares/study/parameters/adq-patch-params.cpp @@ -71,7 +71,6 @@ void CurtailmentSharing::reset() priceTakingOrder = AdqPatchPTO::isDens; includeHurdleCost = false; checkCsrCostFunction = false; - recomputeDTGMRG = false; resetThresholds(); } @@ -122,11 +121,6 @@ bool CurtailmentSharing::updateFromKeyValue(const Yuni::String& key, const Yuni: { return value.to(checkCsrCostFunction); } - if (key == "recompute-dtg-mrg") - { - return value.to(recomputeDTGMRG); - } - // Thresholds if (key == "threshold-initiate-curtailment-sharing-rule") { @@ -162,7 +156,6 @@ void CurtailmentSharing::addProperties(IniFile::Section* section) const section->add("price-taking-order", PriceTakingOrderToString(priceTakingOrder)); section->add("include-hurdle-cost-csr", includeHurdleCost); section->add("check-csr-cost-function", checkCsrCostFunction); - section->add("recompute-dtg-mrg", recomputeDTGMRG); // Thresholds section->add("threshold-initiate-curtailment-sharing-rule", thresholdRun);