Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Features/inter temporal sensitivity #1235

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open

Features/inter temporal sensitivity #1235

wants to merge 33 commits into from
+1,260 −4

Conversation

RoxaneChen02
Copy link
Contributor

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem?

Fixes #1226

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change or deprecate an API?

  • Yes
  • No

If yes, please check if the following requirements are fulfilled

  • The Breaking Change or Deprecated label has been added
  • The migration steps are described in the following section

What changes might users need to make in their application due to this PR? (migration steps)

Other information:

CHEN Roxane and others added 7 commits December 10, 2024 16:47
create class InterTemporalRaoInput
c784265 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
removed parameters from input class
4a3ee38 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
Merge branch 'main' into features/InterTemporalSensitivity
218582b
WIP Beginning of InterTemporal Sensitivity Analysis
cb1b85d 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@bqth29
add LF and sensi values in test
d14c18a 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
Fixed sensi computation in parallel
1a0e329 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
add InterTemporalParameters
ff7c80a 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02 RoxaneChen02 marked this pull request as draft December 12, 2024 14:50
bqth29 and others added 7 commits December 12, 2024 17:03
@bqth29
Merge branch 'main' into features/InterTemporalSensitivity
f590971
@bqth29
more relevant tests
18eda9c 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
merge head
9118bf0 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
add json for inter temporal parameter
5db3cbe 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
fix conflict
2d0d2a0 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
fix style
751ec91 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@bqth29
fix tests
5f81d1f 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29 bqth29 added feature New feature or request intertemporality Encompasses the use of multi-time-steps optimization and intertemporal constraints labels Dec 13, 2024
@bqth29 bqth29 marked this pull request as ready for review December 13, 2024 09:45
@bqth29 bqth29 requested a review from Godelaine December 13, 2024 09:46
@bqth29 bqth29 mentioned this pull request Dec 13, 2024
Open
@bqth29
parallel RAOs
73ad3a8 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
use right Pait class
4c9b880 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
intertemporal pool
44e255f 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
Merge branch 'feature/multi-ts-topological-optimization' into feature…
481fe3e 
…s/InterTemporalSensitivity
@bqth29
use of inter-temporal pool for parallel computation
ee64c9c 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29 bqth29 added the PR: waiting-for-review This PR is waiting to be reviewed label Dec 13, 2024
Godelaine
Godelaine reviewed Dec 19, 2024
View reviewed changes
ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/InterTemporalRaoInput.java Show resolved Hide resolved
...in/java/com/powsybl/openrao/raoapi/json/extensions/JsonInterTemporalParametersExtension.java Outdated Show resolved Hide resolved
ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/InterTemporalRaoInputTest.java Show resolved Hide resolved
ra-optimisation/rao-api/src/test/resources/RaoParameters_with_InterTemporalExtension.json Outdated Show resolved Hide resolved
tests/src/test/resources/logback.xml Outdated Show resolved Hide resolved
...ava/com/powsybl/openrao/searchtreerao/castor/algorithm/InterTemporalSensitivityAnalysis.java Outdated Show resolved Hide resolved
...ava/com/powsybl/openrao/searchtreerao/castor/algorithm/InterTemporalSensitivityAnalysis.java Outdated Show resolved Hide resolved
...ava/com/powsybl/openrao/searchtreerao/castor/algorithm/InterTemporalSensitivityAnalysis.java Outdated Show resolved Hide resolved
phiedw
phiedw reviewed Dec 20, 2024
View reviewed changes
util/src/main/java/com/powsybl/openrao/util/InterTemporalPool.java
/**
* @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>}
*/
public class InterTemporalPool extends ForkJoinPool {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May need to check what happens if each task has their own children subthreads. (This class might think the task is no longer being run while the task is waiting for its subthreads to finish, and start running new tasks. I'm not 100% sure how fork join pools work in details.)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked using ForkJoinPool and got problems: for instance, when InterTemporalPools are nested - for instance a parent pool with 2 threads creates children pools with 3 threads each - tasks are run without paying attention to the number of threads of the parent pool.

Instead, I replaced the multi-threading system by ThreadPoolExecutor and it now works better.

bqth29 added 2 commits January 2, 2025 16:09
@bqth29
Merge branch 'main' into features/InterTemporalSensitivity
e2e0dd4 
# Conflicts:
#	ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/InterTemporalRaoInput.java
@bqth29
some fixes
49129bd 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
bqth29 and others added 5 commits January 2, 2025 17:37
@bqth29
refactored inputs
c9f5777 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
changes after comments
ae8b9ff 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
Merge branch 'main' into features/InterTemporalSensitivity
c9a1419
@bqth29
use ThreadPoolExecutor for more relevant nested inter temporal pools
0819feb 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
Merge branch 'features/InterTemporalSensitivity' of https://github.co…
ec84aac 
…m/powsybl/powsybl-open-rao into features/InterTemporalSensitivity
@Godelaine Godelaine added PR: waiting-for-correction This PR is waiting to be corrected by its author and removed PR: waiting-for-review This PR is waiting to be reviewed labels Jan 6, 2025
@bqth29 bqth29 mentioned this pull request Jan 6, 2025
Open
7 tasks
bqth29 added 2 commits January 6, 2025 17:16
@bqth29
remove inter-temporal extension of parameters
d5abe3a 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
fix tests
2e31413 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
Godelaine
Godelaine reviewed Jan 14, 2025
View reviewed changes
Copy link
Collaborator

@Godelaine Godelaine left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add "UT" (logs only) validating that ThreadPoolExecutor works
In new PR, try substituting ThreadPoolExecutor by a specially configured ForkJoinPool

CHEN Roxane and others added 4 commits January 14, 2025 14:54
add unit test
8d00373 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
fix style
d6730df 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@bqth29
use ForkJoinPool again
c32b8c9 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
Merge branch 'main' into features/InterTemporalSensitivity
7d36b3f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Godelaine Godelaine Godelaine left review comments

@bqth29 bqth29 bqth29 left review comments

@phiedw phiedw phiedw left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
feature New feature or request intertemporality Encompasses the use of multi-time-steps optimization and intertemporal constraints PR: waiting-for-correction This PR is waiting to be corrected by its author
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Intertemporal sensitivity computation
4 participants
@RoxaneChen02 @phiedw @bqth29 @Godelaine