Skip to content

Commit fd60e2f

Browse files
GodelaineRoxaneChen02phiedwpet-mitbqth29
authored
FastRAO - to be merged branch (#1438)
* copy paste original file as is * copy paste original file as is * copy paste original file as is + small change to match recent renaming * debug test wip * Fixed cucumber tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add log + fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update code to match main Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix US 19.7 features Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove semaphore Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * force global 2P Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * fix merge main Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Refactor RemedialActionActivationResult to handle actions per state. Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Change RAO type from SEARCH_TREE_RAO to FAST_RAO in tests. Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao don't support optimization on one given state only Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unecessary function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unecessary import Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update log Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * todo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao parameters Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correct JsonRaoParametersTest Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add config loader + make the extension optional Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * branch fast rao parameters in code Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * test fast rao in cucumber Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add todo doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * move check Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * keep marmot change Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao slide to doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * variant manager correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add UT FastRaoResultImplTest Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * revert and move to other branch Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fast rao/add raoresult extension (#1387) * add considered to FastRaoResultImpl Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao result specific serializer and deserializer Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao extension + UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * rename function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> * Fast rao/add ut (#1390) * add considered to FastRaoResultImpl Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao result specific serializer and deserializer Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao extension + UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * rename function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add simple fast rao test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correct test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * improve coverage Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add iniital sensi failed test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add 2 UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao result ut Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * reformat Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * change rao param Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * blank space Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> * copy paste original file as is Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * copy paste original file as is Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Run cucumber on mac. Update jaxb bindings (#1212) Signed-off-by: Peter Mitri <peter.mitri@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Export execution details (#1193) * export failure reason/executed steps to a executionDetails field Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * added check of execution details for failed RAOs in cucumber tests Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * add unit tests for try catch Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * updated documentation Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * clean code smells Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * fixed tests Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * rename section in rao result json documentation Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * added a business error with the error and the stack trace to not lose the information Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * added unit test to check serialization, updated version to 1.7, fixed ordering of states in range action results Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * fix version Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * copy paste original file as is + small change to match recent renaming Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * debug test wip Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Use upward and downward variation variables in MILP for Range Actions (#1205) Use upward and downward variation variables in MILP for Range Actions Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fixed cucumber tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add log + fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Temporal data (#1228) * temporal data Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * sonar Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Refactor objective function evaluators API and add cost-wise Search-Tree (#1186) * refactor objective function evaluators API * enable cost-wise Search Tree Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * create class InterTemporalRaoInput (#1232) * create class InterTemporalRaoInput Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * removed parameters from input class Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix Jenkins (#1231) * only keep PST_DE Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * keep previous crac Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: phiedw <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update code to match main Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fix bug 2p (#1237) * fix bug Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * match style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * changed complete method to take into account previous failing contingencies Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * add UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * add UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * add UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * add UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * fix UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Philippe Edwards <philippe.edwards@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Run tests on graalvm, slightly change ra ordering method in search tree to make it os agnostic (#1234) * run tests on java & graalvm * changed min impact for a couple tests, and change search tree ordering to make it os agnostic (hopefully) Signed-off-by: Peter Mitri <peter.mitri@rte-france.com> Co-authored-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update powsybl dependencies (6.6.0 release train) (#1239) Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Bump to v6.2.0 Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Bump to v6.3.0-SNAPSHOT Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix US 19.7 features Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove semaphore Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Power Gradient Constraint (#1229) * Power Gradient Constraint Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * JUnit Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * typo in test name Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * extract VariationDirection from RangeAction Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * replace record by class Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update pom Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add module to jacoco Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add pgcs to RAO inputs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix poms Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * udate new POM tp 6.3.0-SNAPSHOT Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * inter-tempoal RAO API (#1236) * inter-tempoal RAO API Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * move to right module Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix InterTemporalRaoInput creation Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Classes generated by Jakarta implement interfaces (#1246) * get back to previous JAXB behavior for interface inheritance * remove Jakarta dependency in CSA profiles module Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Swe cne threshold decimals (#1245) * add decimals for thrsholds in swe cne Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * include link fixes in documentation Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * make constants final Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> --------- Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Add new method withNetworkElement for InjectionRangeActionAdder (#1087) * Add new method withNetworkElement for InjectionRangeAction Signed-off-by: wangjer <jeremy.wang@rte-france.com> * Return error if withNetworkElement() called twice Signed-off-by: wangjer <jeremy.wang@rte-france.com> * Remove unused import Signed-off-by: wangjer <jeremy.wang@rte-france.com> --------- Signed-off-by: wangjer <jeremy.wang@rte-france.com> Co-authored-by: Peter Mitri <peter.mitri@rte-france.com> Co-authored-by: phiedw <philippe.edwards@rte-france.com> Co-authored-by: Thomas Bouquet <63302082+bqth29@users.noreply.github.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * TemporalData::map (#1251) Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Use hasImpactOnNetwork from powsybl-core, 'fix' tests (#1131) Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com> Co-authored-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com> Co-authored-by: Thomas Bouquet <63302082+bqth29@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fixes CRAC import from Flowbased Constraint Document to enable correct handling of XML without any MNEC element defined. (#1253) Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * timestamp in variables and constraints (#1259) Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Make MonitoringResult combine function thread safe (#1260) * make combine thread safe Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add comment Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Global balancing constraint (#1250) * add global balancing constraint Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add cucumber tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix docs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * Update crac-93-1-3.json Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> * add comment Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add constants in doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * Update CoreProblemFiller.java Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Costly optimization of range actions (#1243) * add costly variables and constraints Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * docs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * cucumber tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * rollback absolute variation Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * typo Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove continuous tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * only allow APPROXIMATED_INTEGERS mode for costly optimization Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * average cost/angle for PSTs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * introduce tap variables Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * minor fixes Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix tests and doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * sonar Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix after comments Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove inexistant 'com.powsybl:powsybl-action-util' dependency (#1262) Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * duplicate redispatching test in costly (#1261) Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Angle monitoring noglsk (#1249) * fix typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * crash if incomplete GLSK error Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * draft Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * set MonitoringResult status to FAILURE when no GLSK given Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * change global log message Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Update Monitoring.java Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Inter-Temporal Pool (#1235) * create class InterTemporalRaoInput Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * removed parameters from input class Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * WIP Beginning of InterTemporal Sensitivity Analysis Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add LF and sensi values in test Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * Fixed sensi computation in parallel Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add InterTemporalParameters Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * more relevant tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * merge head Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add json for inter temporal parameter Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * parallel RAOs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use right Pait class Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * intertemporal pool Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use of inter-temporal pool for parallel computation Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * some fixes Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * refactored inputs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * changes after comments Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use ThreadPoolExecutor for more relevant nested inter temporal pools Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove inter-temporal extension of parameters Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add unit test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * use ForkJoinPool again Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove useless files Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Thomas Bouquet <63302082+bqth29@users.noreply.github.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Power Gradient Constraint filler (#1257) * Update gradient API Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * Gradient MIP equations in doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix problems on min/max signums Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * preparatory work for PGC filler Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * complete PowerGradientConstraintFiller + fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * rename to PowerGradient Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * rename to PowerGradientBuilder Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * docstring for PowerGradient Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add Unit Test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * sonar Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * rename p0 to initialPower Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add to do Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * simplify function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix after review Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * merge main and update docs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Rao parameters forbid cost increase always true (#1112) * Remove ForbidCostIncrease parameter (should always be true) * Remove curative stop criterion and 'optimize curative if preventive unsecure' and partially replace them by 'enforce curative security' * Move unit out of objective function type * Merge content of preventive stop criterion into type * Move implem specific rao parameters into extensions * The object multithreading parameters should be the same than its input, so it contains one parameter available-cpus * Upgrade rao parameters version to 3.0 * Separate previous extensions in business/search-tree as optional * Rename to avoid having same class name in rao parameters and its extension * Separate rao parameters doc in multiple pages * change python script to be able to do all the changes to parameters --------- Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com> Co-authored-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fix format of datetimes in variable and constraint names (#1266) * fix format of datetimes in variable names Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use formatName for new variables and constraint Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * 2P for multi-curative optimization (#1263) * Handle multi-curative in 2P global opt Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * cucumber test for validation of feature Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * merge main Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Partial Failure and completeData (#1256) * draft Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * partial_failure fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix import Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * partial failure fix + automaton Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add Unit Test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up code Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add unit test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: phiedw <philippe.edwards@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> * ComputeHvdcAngleDroopActivePowerControlValue with getP (#1269) * use getP to avoid nullpointer Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * adapt cucumber Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Delete mvn compiler version (#1270) * delete useless compiler version(inherited from powsybl parent) Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * prepare release v6.3.0 Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * prepare next release v6.4.0-SNAPSHOT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * change url of info in rao result json serialization (#1273) Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Feature/timestamp in crac api (#1265) * add timestamp in CRAC API Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * first works on JSON Crac with timestamp Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add timestamp in state Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * deserialize ts Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix test Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * some fixes after comments Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * state id in helper Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * test to cover State API Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * date and author Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Add offsetdatetime in cracparameter (#1274) * add timestamp to crac creation parameters Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix cse test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix fbconstraint test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix csa test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix json deserializer Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix cucumber tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove Todo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fb constraint extension doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fic UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * FbConstraintCracCreationParameters to FbconstraintCracCreatorParameters + fix duplicate line ? Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix private cucumber tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * review fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix merge conflict Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove initial tap and tap to angle conversion map from json crac files (#1278) * removed initial tap and conversion map from json crac file (getting from network instead) Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * changed retrocompatibility tests to validate the files before reading them, changed documentation Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * added a test to try import a crac with a PST missing in network Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * fix broken test after merge Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix version greater or equal to equal in deserializer Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> --------- Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fix null ptdfSum in evaluator, relative margin case (#1264) ** add ptdfSumLowerBound to ptdfSums in evaluator Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: MURGEY Sebastien <sebastien.murgey@rte-france.com> Co-authored-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Inter-Temporal Skeleton (MARMOT) (#1258) * marmot first implementation Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * typo Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add TODOs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * typo in TODO Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add initial sensi computation Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add topologyChanger + UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fic style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Add Result Merger Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * refactor skeleton Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * parameters order Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * introduce skeleton Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * inter-temporal linear optimization inputs ready Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * create fillers from linear optimizer input Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * adapt PowerGradientConstraintFiller inputs Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * minor Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * fix inputs of gradient filler Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * round set-point values Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * finalize first version of optimizer Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix parameters for compiling Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add TODO Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * create global objective function Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * evaluate global objective function Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * first marmot test Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * MARMOT works !! Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use initial scenario id Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * test with rd Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * test with power gradient constraint Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use individual rao result cost Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * create dedicated module for results Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use only one linear opt result Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add tests and fixes Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * tests global linear optimization result Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * use ProblemFillerHelper in castor Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove useless attributes Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add new tests for global results Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * include preventive network actions in objective function evaluation Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * cleaning, comments, logging Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * explicit TODOs Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * delete TODO Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fix the action status badge (#1288) Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove timestamp in variables name for which a state is already provided (#1284) * remove timestamp in variables name for which a state is already provided Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix bad @author tag Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Clean up pom (#1281) * Remove redundant dependency version overrides Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add project artefacts Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unused dependency Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Priority ucte network analyser (#1280) * added priority to UCTE network analyzer parameters to prioritize order code or element name Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * modify cbcora importer to prioritize element names over order codes Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> --------- Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Generator constraints (#1293) * generator constraints Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add generator constraints module Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * deprecate PowerGradient Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update pom Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update main pom Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update distribution pom Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * [CIM] Import only one HVDC action if one line is disconnected (#1282) * do not import HVDC RA if HVDC disconnected Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * coherent group name Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove useless TODO Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * sonar Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * logs, fix clear(), add UT Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * checkstyle Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * More simple fix for ptdf sum (#1287) * Revert "Fix null ptdfSum in evaluator, relative margin case (#1264)" This reverts commit a2d0d856b390c99f34e4b6faa42200f222ce801d. * Add cucumber test for illustrating issue when monitoring open branch post contingency Signed-off-by: MURGEY Sebastien <sebastien.murgey@rte-france.com> * bound values in export to avoid trying to export +- infinity Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> --------- Signed-off-by: MURGEY Sebastien <sebastien.murgey@rte-france.com> Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Co-authored-by: MURGEY Sebastien <sebastien.murgey@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove power gradients (#1295) Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Cleaning/intertemporal features cleaner (#1289) * remove some TODOs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add log Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * log initial and final costs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add new SumMaxPerTimestampCostEvaluatorResult Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * better tests names Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove useless method Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * merge identical methods Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove max cost evaluator Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add comments in evaluator tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add TODO for cost checking Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> * Ignore duplicated CNECs in RAO status (#1303) * add exlude cnecs function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add excludeCnecs in getCost Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add log and reevaluate cost Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove cnec from raoresult Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unecessary class Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix for merge Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unnecessary class Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * sonarfix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * review correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix type Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * log Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> * Separate global result from individual results per timestamp (#1302) Separate global result from individual results per timestamp (#1302) --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fix RA import after invalid Contingency (#1308) * Fix RA import after invalid Contingency * Fix dev * Remove useless argument * Test fix * Fix * After review * fix sonar Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * fix Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * store highest threshold in evaluator result (#1322) Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Bump powsybl-core to 6.7.0, OLF to 1.15.0 and entsoe to 2.13.0 (#1309) * Add new powsybl-open-loadflow 'forceTargetQInReactiveLimits' parameter in test files Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> * Add new OLF 'voltageRemoteControlRobustMode' and 'disableInconsistentVoltageControls' params in test files Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> * Bump core to 6.7.0-RC1 Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> * Bump core to 6.7.0 and OLF to 1.15.0 Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> * Bump powsybl-entsoe to 2.13.0 Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> --------- Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * prepare release v6.4.0 Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * prepare next release v6.5.0-SNAPSHOT Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * serialize PST's tap Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove useless exception Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * retrocompatibility test Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * initialTap Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * rename add method in TemporalData to put (#1329) * renamed add method in temporal data to put Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * Revert "renamed add method in temporal data to put" This reverts commit 89a23c01bcc6281c83a3f460fddd5df4ee05909c. * only changed add for temporalData Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> --------- Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Move jniortools import into a separate thread. (#1331) * Move jniortools import into a separate thread. Signed-off-by: thiriondan <daniel.thirion@rte-france.com> * Add EOF Signed-off-by: thiriondan <daniel.thirion@rte-france.com> * Revert "Add EOF" This reverts commit 6ce6ce4194c18a6aa4261ec88d92eaa387207176. Signed-off-by: thiriondan <daniel.thirion@rte-france.com> * Revert "Move jniortools import into a separate thread." This reverts commit 081280b6d8141c85a4417e554c5e00aa83da6707. Signed-off-by: thiriondan <daniel.thirion@rte-france.com> * Add OR-tools loading in Castor class so it gets loaded upon start Signed-off-by: thiriondan <daniel.thirion@rte-france.com> --------- Signed-off-by: thiriondan <daniel.thirion@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * All optional attributes in GeneratorConstraints (#1345) * optional attributes in GeneratorConstraints Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * coverage Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix test Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * sonar Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Renaming CSA profiles to NC (#1340) * rename CSA profiles to NC Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove CSA occurrences Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove auto search tree (#1318) * remove auto search tree Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update json parameters Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove auto search tree cucumber tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove max-auto-depth occurrences Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove max-auto-depth occurrences in docs Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * added a filter on versions to avoid printing the wrong version (was happening in pypowsybl where it was printing powsybl diagram version) (#1352) Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * No longer export flows for instants after CNEC's (#1347) * no longer export flows for instants after cnec's Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * fix typo in exception Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Extract features from idcc test data (#1353) * TemporalDataImpl : treeMap for reproductibility Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * offsetDateTime in FbConstraintCracCreator Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * perf: memoize previous state Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * add epsilon for range action filtering (range) Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * validate Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> --------- Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix merge main Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Refactor RemedialActionActivationResult to handle actions per state. Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Change RAO type from SEARCH_TREE_RAO to FAST_RAO in tests. Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao don't support optimization on one given state only Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unecessary function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove unecessary import Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Remove unused flowbased-related modules (#1356) * remove unused flowbased-related modules Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update pom Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Import automatons is `nc:RemedialAction.isManual` is `false` (#1349) * add isManual is queries Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove scheme remedial actions and import ARAs from isManual=false Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add TODO Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * remove auto-instant-time in NC CRAC creation parameters Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * TODO Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update doc Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * add NC file in doc tree Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Rename `monitoring` to `open-rao-monitoring` (#1357) * rename monitoring to open-rao-monitoring Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update poms Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update log Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * todo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao parameters Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correct JsonRaoParametersTest Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add config loader + make the extension optional Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add tests Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * branch fast rao parameters in code Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * test fast rao in cucumber Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * clean up Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add todo doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * move check Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * keep marmot change Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao slide to doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * variant manager correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add UT FastRaoResultImplTest Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * revert and move to other branch Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Fast rao/add raoresult extension (#1387) * add considered to FastRaoResultImpl Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fast rao result specific serializer and deserializer Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correction Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add fast rao extension + UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * rename function Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * merge main Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correct merge issue Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * correct merge issue pt2 Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * move fastrao doc to performance.md Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * wip max min margin with fast rao Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix after merge Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * bump parameters to v3.2 and add changelog Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * update doc + add gif Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * center text Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * complete tutorial Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * update tutorial.md Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix typo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix tests Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> * delete commonslang3 from pom to pull version from powsybl-core Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * merge main Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * add comments to getRaLimitationParameters Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * doc Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * adapt 20.2.2 by using topo CRA to ensure CRA is kept in 2P now that 2P is global Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * clean/ adapt US20_1 Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * fix merge Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * delete re-optimize everywhere Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * update parameter files * update values far from ref Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * add CriticalCnecsResult extension to rao result + serializer and deserializer Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * Add AbstractExtendable inheritance to InterTemporalRao classes Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix values Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * Add utility class for JSON serialization of RaoResult extensions Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * started changing loadflow calls Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> * add UT to improve sonar Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * checkstyle Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * improve sonar Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * fix test Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * more sonar Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * erreurs de compil residuelles critical cnecs Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * reliquat erreurs residuelles critical cnecs Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * force SearchTreeRao in Marmot Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * adapt runFilteredRao Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * force 2P reoptimization on US 20_1 Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * IO exception never thrown Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * skip multi-curative Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * broken link Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * unused test files Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> * Async PostPerimeterSensitivityAnalysis run Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add comment Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * mvn validate Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * refacto Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * todo Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * use pre perimeter result Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * only keep activated range action Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * exclude duplicate cnec from final cost Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * change fast rao continue condition Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * add new condition Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * export result (temporary to delete) Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * some refactoring Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * some refactoring Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * fix UT Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * remove fast rao from cucumber test Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * revert logback Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * sonar fix Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * check style Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * interrupt thread Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * interrupt thread Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * review comment Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> * unoptimized rao Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> --------- Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com> Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com> Signed-off-by: Peter Mitri <peter.mitri@rte-france.com> Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com> Signed-off-by: wangjer <jeremy.wang@rte-france.com> Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com> Signed-off-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com> Signed-off-by: MURGEY Sebastien <sebastien.murgey@rte-france.com> Signed-off-by: thiriondan <daniel.thirion@rte-france.com> Co-authored-by: CHEN Roxane <roxane.chen@rte-france.com> Co-authored-by: Philippe Edwards <philippe.edwards@rte-france.com> Co-authored-by: Roxane Chen <94446464+RoxaneChen02@users.noreply.github.com> Co-authored-by: Peter Mitri <peter.mitri@rte-france.com> Co-authored-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Thomas Bouquet <63302082+bqth29@users.noreply.github.com> Co-authored-by: Jérémy Wang <jeremy.wang@rte-france.com> Co-authored-by: pjeanmarie <72982611+pjeanmarie@users.noreply.github.com> Co-authored-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com> Co-authored-by: Sébastien Murgey <sebastien.murgey@rte-france.com> Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com> Co-authored-by: Viktor Terrier <11834022+terriervik@users.noreply.github.com> Co-authored-by: danielthirion <152513244+danielthirion@users.noreply.github.com>
1 parent ab1290e commit fd60e2f

64 files changed

Lines changed: 3434 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/NetworkActionImpl.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,17 @@ public int hashCode() {
9999
return super.hashCode();
100100
}
101101

102+
public static NetworkAction copyWithNewId(NetworkAction networkAction, String newId) {
103+
return new NetworkActionImpl(
104+
newId,
105+
networkAction.getName(),
106+
networkAction.getOperator(),
107+
networkAction.getUsageRules(),
108+
networkAction.getElementaryActions(),
109+
networkAction.getSpeed().orElse(null),
110+
networkAction.getActivationCost().orElse(null),
111+
networkAction.getNetworkElements()
112+
);
113+
}
114+
102115
}

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/crac/impl/NetworkActionImplTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,16 @@ void compatibility() {
120120
assertFalse(crac.getNetworkAction("aligned-psts").isCompatibleWith(crac.getNetworkAction("switch-pair-and-pst")));
121121
assertTrue(crac.getNetworkAction("switch-pair-and-pst").isCompatibleWith(crac.getNetworkAction("switch-pair-and-pst")));
122122
}
123+
124+
@Test
125+
void testCopyWithNewId() {
126+
NetworkAction duplicate = NetworkActionImpl.copyWithNewId(networkAction1, "copy");
127+
assertEquals("copy", duplicate.getId());
128+
assertEquals("name", duplicate.getName());
129+
assertEquals("operator", duplicate.getOperator());
130+
assertEquals(Optional.of(10), duplicate.getSpeed());
131+
assertEquals(1, duplicate.getUsageRules().size());
132+
assertEquals(1, duplicate.getElementaryActions().size());
133+
assertEquals(generator.getId(), duplicate.getNetworkElements().iterator().next().getId());
134+
}
123135
}

data/rao-result/rao-result-api/src/main/java/com/powsybl/openrao/data/raoresult/api/RaoResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package com.powsybl.openrao.data.raoresult.api;
99

10+
import com.powsybl.commons.extensions.Extendable;
1011
import com.powsybl.commons.util.ServiceLoaderCache;
1112
import com.powsybl.openrao.commons.MinOrMax;
1213
import com.powsybl.openrao.commons.OpenRaoException;
@@ -44,7 +45,7 @@
4445
*
4546
* @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
4647
*/
47-
public interface RaoResult {
48+
public interface RaoResult extends Extendable<RaoResult> {
4849
String INITIAL_INSTANT_ID = "initial";
4950

5051
/**

data/rao-result/rao-result-api/src/main/java/com/powsybl/openrao/data/raoresult/api/RaoResultClone.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package com.powsybl.openrao.data.raoresult.api;
99

10+
import com.powsybl.commons.extensions.AbstractExtendable;
1011
import com.powsybl.openrao.commons.OpenRaoException;
1112
import com.powsybl.openrao.commons.PhysicalParameter;
1213
import com.powsybl.openrao.commons.Unit;
@@ -25,7 +26,7 @@
2526
* Clone that reproduces the results obtained by another RaoResult instance. It can be used to override some methods without rewriting all the implementations
2627
* @author Mohamed Ben Rejeb {@literal <mohamed.ben-rejeb at rte-france.com>}
2728
*/
28-
public class RaoResultClone implements RaoResult {
29+
public class RaoResultClone extends AbstractExtendable<RaoResult> implements RaoResult {
2930

3031
private final RaoResult raoResult;
3132

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright (c) 2025, RTE (http://www.rte-france.com)
3+
* This Source Code Form is subject to the terms of the Mozilla Public
4+
* License, v. 2.0. If a copy of the MPL was not distributed with this
5+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
*/
7+
8+
package com.powsybl.openrao.data.raoresult.api.extension;
9+
10+
import com.powsybl.commons.extensions.AbstractExtension;
11+
import com.powsybl.openrao.data.raoresult.api.RaoResult;
12+
13+
import java.util.HashSet;
14+
import java.util.Set;
15+
16+
/**
17+
* @author Roxane Chen {@literal <roxane.chen at rte-france.com>}
18+
*/
19+
public class CriticalCnecsResult extends AbstractExtension<RaoResult> {
20+
Set<String> criticalCnecIds;
21+
22+
@Override
23+
public String getName() {
24+
return "critical-cnecs-result";
25+
}
26+
27+
public CriticalCnecsResult(Set<String> criticalCnecIds) {
28+
this.criticalCnecIds = criticalCnecIds;
29+
}
30+
31+
public CriticalCnecsResult() {
32+
this.criticalCnecIds = new HashSet<>();
33+
}
34+
35+
public Set<String> getCriticalCnecIds() {
36+
return criticalCnecIds;
37+
}
38+
39+
public void setCriticalCnecIds(Set<String> criticalCnecIds) {
40+
this.criticalCnecIds = criticalCnecIds;
41+
}
42+
}

data/rao-result/rao-result-api/src/test/java/com/powsybl/openrao/data/raoresult/api/MockRaoResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package com.powsybl.openrao.data.raoresult.api;
99

10+
import com.powsybl.commons.extensions.AbstractExtendable;
1011
import com.powsybl.iidm.network.TwoSides;
1112
import com.powsybl.openrao.commons.PhysicalParameter;
1213
import com.powsybl.openrao.commons.Unit;
@@ -24,7 +25,7 @@
2425
/**
2526
* @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>}
2627
*/
27-
public class MockRaoResult implements RaoResult {
28+
public class MockRaoResult extends AbstractExtendable<RaoResult> implements RaoResult {
2829

2930
private boolean wasExportSuccessful;
3031

data/rao-result/rao-result-impl/src/main/java/com/powsybl/openrao/data/raoresult/impl/RaoResultImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package com.powsybl.openrao.data.raoresult.impl;
88

9+
import com.powsybl.commons.extensions.AbstractExtendable;
910
import com.powsybl.openrao.commons.MinOrMax;
1011
import com.powsybl.openrao.commons.OpenRaoException;
1112
import com.powsybl.openrao.commons.PhysicalParameter;
@@ -32,7 +33,7 @@
3233
/**
3334
* @author Baptiste Seguinot {@literal <baptiste.seguinot at rte-france.com>}
3435
*/
35-
public class RaoResultImpl implements RaoResult {
36+
public class RaoResultImpl extends AbstractExtendable<RaoResult> implements RaoResult {
3637

3738
private static final FlowCnecResult DEFAULT_FLOWCNEC_RESULT = new FlowCnecResult();
3839
private static final AngleCnecResult DEFAULT_ANGLECNEC_RESULT = new AngleCnecResult();

data/rao-result/rao-result-io/rao-result-json/src/main/java/com/powsybl/openrao/data/raoresult/io/json/RaoResultJsonConstants.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ private RaoResultJsonConstants() {
128128
public static final String SECOND_PREVENTIVE_FELLBACK_TO_FIRST_PREVENTIVE_SITUATION = "Second preventive fellback to first preventive results";
129129
public static final String SECOND_PREVENTIVE_FELLBACK_TO_INITIAL_SITUATION = "Second preventive fellback to initial situation";
130130

131+
// fast rao specific field
132+
public static final String FAST_RAO = "fast-rao";
133+
public static final String CRITICAL_CNECS_SET = "critical-cnecs";
134+
131135
// manipulate version
132136
public static int getPrimaryVersionNumber(String fullVersion) {
133137
return Integer.parseInt(divideVersionNumber(fullVersion)[0]);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright (c) 2025, RTE (http://www.rte-france.com)
3+
* This Source Code Form is subject to the terms of the Mozilla Public
4+
* License, v. 2.0. If a copy of the MPL was not distributed with this
5+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
6+
*/
7+
8+
package com.powsybl.openrao.data.raoresult.io.json;
9+
10+
import com.google.common.base.Supplier;
11+
import com.google.common.base.Suppliers;
12+
import com.powsybl.commons.extensions.Extension;
13+
import com.powsybl.commons.extensions.ExtensionJsonSerializer;
14+
import com.powsybl.commons.extensions.ExtensionProviders;
15+
import com.powsybl.openrao.data.raoresult.api.RaoResult;
16+
17+
/**
18+
* @author Roxane Chen {@literal <roxane.chen at rte-france.com>}
19+
*/
20+
public final class RaoResultJsonUtils {
21+
22+
private RaoResultJsonUtils() {
23+
throw new AssertionError("Utility class should not be instantiated");
24+
}
25+
26+
public interface ExtensionSerializer<E extends Extension<RaoResult>> extends ExtensionJsonSerializer<RaoResult, E> {
27+
}
28+
29+
private static final Supplier<ExtensionProviders<ExtensionSerializer>> SUPPLIER =
30+
Suppliers.memoize(() -> ExtensionProviders.createProvider(ExtensionSerializer.class, "rao-result"));
31+
32+
public static ExtensionProviders<ExtensionSerializer> getExtensionSerializers() {
33+
return SUPPLIER.get();
34+
}
35+
}

data/rao-result/rao-result-io/rao-result-json/src/main/java/com/powsybl/openrao/data/raoresult/io/json/deserializers/RaoResultDeserializer.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
package com.powsybl.openrao.data.raoresult.io.json.deserializers;
99

10+
import com.powsybl.commons.extensions.Extension;
11+
import com.powsybl.commons.json.JsonUtil;
1012
import com.powsybl.openrao.commons.OpenRaoException;
1113
import com.powsybl.openrao.data.crac.api.Crac;
1214
import com.powsybl.openrao.data.raoresult.api.RaoResult;
@@ -15,10 +17,13 @@
1517
import com.fasterxml.jackson.core.JsonToken;
1618
import com.fasterxml.jackson.databind.DeserializationContext;
1719
import com.fasterxml.jackson.databind.JsonDeserializer;
20+
import com.powsybl.openrao.data.raoresult.io.json.RaoResultJsonUtils;
1821
import org.slf4j.Logger;
1922
import org.slf4j.LoggerFactory;
2023

2124
import java.io.IOException;
25+
import java.util.Collections;
26+
import java.util.List;
2227

2328
import static com.powsybl.openrao.data.raoresult.io.json.RaoResultJsonConstants.*;
2429
import static com.powsybl.openrao.data.raoresult.io.json.deserializers.Utils.*;
@@ -47,6 +52,7 @@ public RaoResultDeserializer(Crac crac) {
4752
public RaoResult deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
4853

4954
RaoResultImpl raoResult = new RaoResultImpl(crac);
55+
List<Extension<RaoResult>> extensions = Collections.emptyList();
5056

5157
String jsonFileVersion = isValid(jsonParser, raoResult);
5258
if (checkHeaderOnly) {
@@ -116,11 +122,15 @@ public RaoResult deserialize(JsonParser jsonParser, DeserializationContext deser
116122
case RANGEACTION_RESULTS:
117123
importRangeAction(jsonParser, raoResult, jsonFileVersion);
118124
break;
119-
125+
case "extensions":
126+
jsonParser.nextToken();
127+
extensions = JsonUtil.updateExtensions(jsonParser, deserializationContext, RaoResultJsonUtils.getExtensionSerializers(), raoResult);
128+
break;
120129
default:
121130
throw new OpenRaoException(String.format("Cannot deserialize RaoResult: unexpected field (%s)", jsonParser.getCurrentName()));
122131
}
123132
}
133+
extensions.forEach(extension -> raoResult.addExtension((Class) extension.getClass(), extension));
124134
return raoResult;
125135
}
126136

0 commit comments

Comments
 (0)