From bbb9826f7442fbb2fa52134b28c74d76f6ef2ff7 Mon Sep 17 00:00:00 2001 From: Pauline Jean-Marie Date: Mon, 14 Oct 2024 17:59:32 +0200 Subject: [PATCH] update yml --- .../test/resources/config_withExtensions.yml | 73 ++++++++++--------- .../config_withPartialExtensions.yml | 52 +++++++------ .../resources/config_withoutExtensions.yml | 36 +++++---- 3 files changed, 87 insertions(+), 74 deletions(-) diff --git a/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml index 60fbd63eaf..fa23cd9d9d 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml @@ -1,64 +1,67 @@ rao-objective-function: type: MAX_MIN_MARGIN - curative-min-obj-improvement: 3.0 rao-range-actions-optimization: + pst-ra-min-impact-threshold: 0.02 + hvdc-ra-min-impact-threshold: 0.002 + injection-ra-min-impact-threshold: 0.003 + +rao-topological-actions-optimization: + relative-minimum-impact-threshold: 0.02 + absolute-minimum-impact-threshold: 2.0 + +rao-not-optimized-cnecs: + do-not-optimize-curative-cnecs-for-tsos-without-cras: false + +rao-loop-flow-parameters: + acceptable-increase: 11.0 + ptdf-approximation: UPDATE_PTDF_WITH_TOPO + constraint-adjustment-coefficient: 12.0 + violation-cost: 13.0 + countries: [ "FR", "ES", "PT" ] + +rao-mnec-parameters: + acceptable-margin-decrease: 55.0 + violation-cost: 11.0 + constraint-adjustment-coefficient: 12.0 + +rao-relative-margins-parameters: + ptdf-boundaries: [ "{FR}-{BE}", "{FR}-{DE}" ] + ptdf-approximation: UPDATE_PTDF_WITH_TOPO_AND_PST + ptdf-sum-lower-bound: 0.02 + +search-tree-objective-function: + curative-min-obj-improvement: 3.0 + +search-tree-range-actions-optimization: max-mip-iterations: 2 - pst-penalty-cost: 0.02 pst-sensitivity-threshold: 0.2 pst-model: APPROXIMATED_INTEGERS - hvdc-penalty-cost: 0.002 hvdc-sensitivity-threshold: 0.2 - injection-ra-penalty-cost: 0.003 injection-ra-sensitivity-threshold: 0.3 -rao-linear-optimization-solver: +search-tree-linear-optimization-solver: solver: XPRESS relative-mip-gap: 0.004 solver-specific-parameters: BLABLABLA -rao-topological-actions-optimization: +search-tree-topological-actions-optimization: max-preventive-search-tree-depth: 3 max-auto-search-tree-depth: 2 max-curative-search-tree-depth: 3 predefined-combinations: [ "{na1}+{na2}", "{na3}+{na4}+{na5}" ] - relative-minimum-impact-threshold: 0.02 - absolute-minimum-impact-threshold: 2.0 skip-actions-far-from-most-limiting-element: true max-number-of-boundaries-for-skipping-actions: 3 -rao-second-preventive-rao: +search-tree-second-preventive-rao: execution-condition: POSSIBLE_CURATIVE_IMPROVEMENT re-optimize-curative-range-actions: true hint-from-first-preventive-rao: true -rao-not-optimized-cnecs: - do-not-optimize-curative-cnecs-for-tsos-without-cras: false - -rao-load-flow-and-sensitivity-computation: +search-tree-load-flow-and-sensitivity-computation: load-flow-provider: LOADFLOW_PROVIDER sensitivity-provider: SENSI_PROVIDER sensitivity-failure-overcost: 2 -rao-multi-threading: - contingency-scenarios-in-parallel: 4 - preventive-leaves-in-parallel: 5 - auto-leaves-in-parallel: 3 - curative-leaves-in-parallel: 6 - -rao-loop-flow-parameters: - acceptable-increase: 11.0 - ptdf-approximation: UPDATE_PTDF_WITH_TOPO - constraint-adjustment-coefficient: 12.0 - violation-cost: 13.0 - countries: [ "FR", "ES", "PT" ] - -rao-mnec-parameters: - acceptable-margin-decrease: 55.0 - violation-cost: 11.0 - constraint-adjustment-coefficient: 12.0 - -rao-relative-margins-parameters: - ptdf-boundaries: [ "{FR}-{BE}", "{FR}-{DE}" ] - ptdf-approximation: UPDATE_PTDF_WITH_TOPO_AND_PST - ptdf-sum-lower-bound: 0.02 \ No newline at end of file +search-tree-multi-threading: + available-cpus: 5 \ No newline at end of file diff --git a/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml index c0b7faee12..165da81e4b 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml @@ -1,50 +1,54 @@ rao-objective-function: type: MAX_MIN_MARGIN - curative-min-obj-improvement: 3.0 rao-range-actions-optimization: - pst-penalty-cost: 0.02 + pst-ra-min-impact-threshold: 0.02 + hvdc-ra-min-impact-threshold: 0.002 + injection-ra-min-impact-threshold: 0.003 + +rao-topological-actions-optimization: + relative-minimum-impact-threshold: 0.02 + absolute-minimum-impact-threshold: 2.0 + +rao-loop-flow-parameters: + ptdf-approximation: UPDATE_PTDF_WITH_TOPO + constraint-adjustment-coefficient: 12.0 + violation-cost: 13.0 + countries: [ "FR", "ES", "PT" ] + +rao-relative-margins-parameters: + ptdf-approximation: UPDATE_PTDF_WITH_TOPO_AND_PST + ptdf-sum-lower-bound: 0.02 + +search-tree-objective-function: + curative-min-obj-improvement: 3.0 + +search-tree-range-actions-optimization: pst-sensitivity-threshold: 0.2 pst-model: APPROXIMATED_INTEGERS ra-range-shrinking: ENABLED - hvdc-penalty-cost: 0.002 hvdc-sensitivity-threshold: 0.2 - injection-ra-penalty-cost: 0.003 injection-ra-sensitivity-threshold: 0.3 -rao-linear-optimization-solver: +search-tree-linear-optimization-solver: relative-mip-gap: 0.004 solver-specific-parameters: BLABLABLA -rao-topological-actions-optimization: +search-tree-topological-actions-optimization: max-preventive-search-tree-depth: 3 max-auto-search-tree-depth: 2 max-curative-search-tree-depth: 3 predefined-combinations: [ "{na1}+{na2}", "{na3}+{na4}+{na5}" ] - relative-minimum-impact-threshold: 0.02 - absolute-minimum-impact-threshold: 2.0 skip-actions-far-from-most-limiting-element: true max-number-of-boundaries-for-skipping-actions: 2 -rao-second-preventive-rao: +search-tree-second-preventive-rao: re-optimize-curative-range-actions: true hint-from-first-preventive-rao: true -rao-load-flow-and-sensitivity-computation: +search-tree-load-flow-and-sensitivity-computation: sensitivity-provider: SENSI_PROVIDER sensitivity-failure-overcost: 2 -rao-multi-threading: - preventive-leaves-in-parallel: 5 - auto-leaves-in-parallel: 2 - curative-leaves-in-parallel: 6 - -rao-loop-flow-parameters: - ptdf-approximation: UPDATE_PTDF_WITH_TOPO - constraint-adjustment-coefficient: 12.0 - violation-cost: 13.0 - countries: [ "FR", "ES", "PT" ] - -rao-relative-margins-parameters: - ptdf-approximation: UPDATE_PTDF_WITH_TOPO_AND_PST - ptdf-sum-lower-bound: 0.02 \ No newline at end of file +search-tree-multi-threading: + available-cpus: 5 \ No newline at end of file diff --git a/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml index 77e0bd4e94..438d586d69 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml @@ -1,9 +1,23 @@ rao-objective-function: type: MAX_MIN_MARGIN - curative-min-obj-improvement: 3.0 enforce-curative-security: false rao-range-actions-optimization: + pst-ra-min-impact-threshold: 0.02 + hvdc-ra-min-impact-threshold: 0.002 + injection-ra-min-impact-threshold: 0.003 + +rao-topological-actions-optimization: + relative-minimum-impact-threshold: 0.02 + absolute-minimum-impact-threshold: 2.0 + +rao-not-optimized-cnecs: + do-not-optimize-curative-cnecs-for-tsos-without-cras: false + +search-tree-objective-function: + curative-min-obj-improvement: 3.0 + +search-tree-range-actions-optimization: max-mip-iterations: 2 pst-penalty-cost: 0.02 pst-sensitivity-threshold: 0.2 @@ -14,36 +28,28 @@ rao-range-actions-optimization: injection-ra-penalty-cost: 0.003 injection-ra-sensitivity-threshold: 0.3 -rao-linear-optimization-solver: +search-tree-linear-optimization-solver: solver: XPRESS relative-mip-gap: 0.004 solver-specific-parameters: BLABLABLA -rao-topological-actions-optimization: +search-tree-topological-actions-optimization: max-preventive-search-tree-depth: 3 max-auto-search-tree-depth: 2 max-curative-search-tree-depth: 3 predefined-combinations: [ "{na1}+{na2}", "{na3}+{na4}+{na5}" ] - relative-minimum-impact-threshold: 0.02 - absolute-minimum-impact-threshold: 2.0 skip-actions-far-from-most-limiting-element: true max-number-of-boundaries-for-skipping-actions: 3 -rao-second-preventive-rao: +search-tree-second-preventive-rao: execution-condition: POSSIBLE_CURATIVE_IMPROVEMENT re-optimize-curative-range-actions: true hint-from-first-preventive-rao: true -rao-not-optimized-cnecs: - do-not-optimize-curative-cnecs-for-tsos-without-cras: false - -rao-load-flow-and-sensitivity-computation: +search-tree-load-flow-and-sensitivity-computation: load-flow-provider: LOADFLOW_PROVIDER sensitivity-provider: SENSI_PROVIDER sensitivity-failure-overcost: 2 -rao-multi-threading: - contingency-scenarios-in-parallel: 4 - preventive-leaves-in-parallel: 5 - auto-leaves-in-parallel: 3 - curative-leaves-in-parallel: 6 \ No newline at end of file +search-tree-multi-threading: + available-cpus: 5 \ No newline at end of file