Skip to content

Marmot melting pot: Marmot multithreading, p0RespectsConstraints in ICSImporter, LazyNetwork closing in Marmot#1688

Draft
Godelaine wants to merge 69 commits intomainfrom
idcc/debug
Draft

Marmot melting pot: Marmot multithreading, p0RespectsConstraints in ICSImporter, LazyNetwork closing in Marmot#1688
Godelaine wants to merge 69 commits intomainfrom
idcc/debug

Conversation

@Godelaine
Copy link
Copy Markdown
Collaborator

@Godelaine Godelaine commented Apr 9, 2026 •
edited by bqth29
Loading

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)
  • A PR or issue has been opened in all impacted repositories (if any)

Does this PR already have an issue describing the problem?

What kind of change does this PR introduce?

  • Fixes handling of LazyNetwork in Marmot : to prevent memory issues, networks need to be closed regularly to avoid having too many networks in memory
  • IcsImporter : p0RespectsConstraints feature : now, only generators respecting implemented constraints in the GeneratorFiller are imported. Gradients are now only checked when p0 above pMin.
  • Multithreading in MARMOT : many steps in Marmot are now multithreaded, from indepedant topological optimizations to input creation for linear problem in Marmot to sensi computations on different timestamps.

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:

LazyNetwork now implement AutoClosable to manipulate networks in try-with-resources contexts. When the network has been used it is automatically closed.

RoxaneChen02 and others added 30 commits March 17, 2026 17:55
@RoxaneChen02
wip
3c9cb33 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
first version of the code
e13e8ec 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
clean up the code
4bb418c 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
start test
839ae63 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
Merge branch 'main' into feat/ics_reader
8b1d8d0
@Godelaine
WIP - initiate p0RespectsGradients function
eeb5fe7 
Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com>
@RoxaneChen02
add ics data importer
1094f0b 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
complete
574e733 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
wip icsdatatest
47f8037 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
remove unecessary test
1ee0c18 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
test
58394c5 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update test
b4d71c7 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update log
18bdbb9 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update pom
368e40e 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
remove icsImporterTest
0b54b58 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
validate
e5f6ef1 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
wip
5f26d8c 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@Godelaine
Merge branch 'main' into idcc/debug
f00e4e8
@RoxaneChen02
Merge branch 'main' into feat/ics_reader
4aeb5ee 
# Conflicts:
#	data/crac/crac-util/pom.xml
#	data/crac/crac-util/src/main/java/com/powsybl/openrao/data/crac/util/IcsImporter.java
#	data/crac/crac-util/src/test/java/com/powsybl/openrao/data/crac/util/IcsImporterTest.java
#	tests/src/test/java/com/powsybl/openrao/tests/steps/TimeCoupledRaoSteps.java
@RoxaneChen02
add ics util test
42b0a3f 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
add ics full process
1b36cea 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
gsk is optional !
1626c79 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update steps
726030f 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
remove gsk if ra only defined on a node
6001ba5 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
remove old code
f96a3b5 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
revert update to be moved in other PR
f63232b 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update doc
8a05188 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update doc
bc03c9d 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
use default functions
d8d5594 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
validate
e220785 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
RoxaneChen02 and others added 24 commits April 2, 2026 11:19
@RoxaneChen02
update pom ?
442681c 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update pom ?
3dcb4aa 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@bqth29
fix MARMOT with lazy networls
9271ef0 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@RoxaneChen02
fix
feb43c8 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
add a test
5727f6e 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
remove file not used
557b51b 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
validate
7c9e7e2 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@RoxaneChen02
update doc
47a8a14 
Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
@bqth29
close LazyNetworks
6f76e2c 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@Godelaine
p0RespectsConstraints method
15434ed
@bqth29
add multi-threading (need to fix concurrent access to LF parameters)
3ccf480 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@Godelaine
missing logback and crac test files
d77d1fb
@Godelaine
Merge remote-tracking branch 'origin/feat/ics_reader' into idcc/debug
b8b53db 
# Conflicts:
#	data/crac/crac-util/src/main/java/com/powsybl/openrao/data/crac/util/IcsImporter.java
#	data/crac/crac-util/src/test/java/com/powsybl/openrao/data/crac/util/IcsImporterTest.java
#	data/ics-importer/src/test/resources/crac/crac-0230.json
#	data/ics-importer/src/test/resources/crac/crac-0330.json
#	data/ics-importer/src/test/resources/crac/crac-0430.json
#	data/ics-importer/src/test/resources/crac/crac-0530.json
#	data/ics-importer/src/test/resources/crac/crac-0630.json
#	data/ics-importer/src/test/resources/crac/crac-0730.json
#	data/ics-importer/src/test/resources/ics/static.csv
@bqth29
mark LazyNetwork as beta feature
359207e 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
duplicate RaoParameters to concurrent accesses
4147744 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
use ConcurrentHashMaps for TemporalDataImpl
cf930fb 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@bqth29
smart use of threads
fd050a8 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@Godelaine
fix existing UT
4ec7f91
@Godelaine
Merge branch 'main' into idcc/debug
340080e 
# Conflicts:
#	data/crac/crac-util/src/main/java/com/powsybl/openrao/data/crac/util/IcsImporter.java
#	data/crac/crac-util/src/test/java/com/powsybl/openrao/data/crac/util/IcsImporterTest.java
#	data/ics-importer/src/main/java/com/powsybl/openrao/data/icsimporter/IcsData.java
#	data/ics-importer/src/main/java/com/powsybl/openrao/data/icsimporter/IcsDataImporter.java
#	data/ics-importer/src/main/java/com/powsybl/openrao/data/icsimporter/IcsUtil.java
#	data/ics-importer/src/test/java/com/powsybl/openrao/data/icsimporter/IcsDataImporterTest.java
#	data/ics-importer/src/test/java/com/powsybl/openrao/data/icsimporter/IcsDataTest.java
#	data/ics-importer/src/test/resources/ics/static.csv
#	data/ics-importer/src/test/resources/ics/static_with_two_ra.csv
#	data/ics-importer/src/test/resources/ics/static_with_two_ra_wrong_node.csv
@Godelaine
remove print lp
0d64c43
@Godelaine
WIP
0c1ce9e
@Godelaine
WIP to make GeneratorConstraintsFillerTest pass
1c4e5ae
@bqth29
rollback GeneratorConstraintsFiller
cb7bef2 
Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
@Godelaine
Merge branch 'feature/refine-usage-of-lazy-networks' into idcc/debug …
c19bdb2 
…+ small fixes

# Conflicts:
#	data/crac/crac-util/src/main/java/com/powsybl/openrao/data/crac/util/IcsImporter.java
#	data/crac/crac-util/src/test/java/com/powsybl/openrao/data/crac/util/IcsImporterTest.java
#	ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/LazyNetwork.java
#	ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/marmot/Marmot.java
#	ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/marmot/MarmotUtils.java
#	tests/src/test/java/com/powsybl/openrao/tests/steps/TimeCoupledRaoSteps.java
@Godelaine Godelaine changed the title Idcc/debug Marmot melting pot: Marmot multithreading, p0RespectsConstraints in ICSImporter, LazyNetwork closing in Marmot Apr 13, 2026
@Godelaine
Merge branch 'main' into idcc/debug
9ad4c4c
@Godelaine
add UT for p0RespectsConstraints
c4955b5
@Godelaine
revert deleting cracs
e9f6422
@Godelaine
sonar
a754036 
Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com>
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Apr 13, 2026

Quality Gate Passed Quality Gate passed

Issues
15 New issues
0 Accepted issues

Measures
0 Security Hotspots
87.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Godelaine @RoxaneChen02 @bqth29