AMPL executor #2455
Merged
AMPL executor #2455
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
January 24, 2023 14:27
extract modifications to the network Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
basic AmplConfig and AmplResult Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas PIERRE <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
…ustomization Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
geofjamg
requested changes
Mar 13, 2023
ampl-converter/src/main/java/com/powsybl/ampl/converter/AbstractNetworkApplierFactory.java
Outdated
Show resolved
Hide resolved
ampl-converter/src/main/java/com/powsybl/ampl/converter/AbstractNetworkApplierFactory.java
Outdated
Show resolved
Hide resolved
ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplNetworkReader.java
Outdated
Show resolved
Hide resolved
ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplNetworkReader.java
Outdated
Show resolved
Hide resolved
ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplReadableElement.java
Outdated
Show resolved
Hide resolved
ampl-executor/src/test/java/com/powsybl/ampl/executor/DummyAmplModel.java
Outdated
Show resolved
Hide resolved
ampl-executor/src/test/java/com/powsybl/ampl/executor/AmplModelExecutionHandlerTest.java
Outdated
Show resolved
Hide resolved
ampl-executor/src/test/java/com/powsybl/ampl/executor/AmplConfigTest.java
Outdated
Show resolved
Hide resolved
ampl-executor/src/test/java/com/powsybl/ampl/executor/AmplConfigTest.java
Outdated
Show resolved
Hide resolved
| * @param networkAmplMapper Mapper to convert {@link com.powsybl.iidm.network.Network} IDs to Ampl IDs | ||
| * and vice versa | ||
| */ | ||
| void read(Path outputPath, StringToIntMapper<AmplSubset> networkAmplMapper) throws IOException; |
There was a problem hiding this comment.
Are you sure we need to known the file name here? why not just
void read(Path workingDir, StringToIntMapper<AmplSubset> networkAmplMapper) throws IOException
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
|
PR can be checked again for merge. @geofjamg |
geofjamg
requested changes
Mar 14, 2023
| @@ -0,0 +1,9 @@ | |||
| package com.powsybl.ampl.converter; | |||
| */ | ||
| public interface AmplNetworkUpdater { | ||
|
|
||
| void applyGenerators(Generator g, int busNum, boolean vregul, double targetV, double targetP, double targetQ, |
ampl-executor/pom.xml
Outdated
| @@ -0,0 +1,100 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!-- | |||
| Copyright (c) 2017, RTE (http://www.rte-france.com) | |||
| moduleConfig.setStringProperty("homeDir", "/home/test/ampl"); | ||
| AmplConfig cfg = AmplConfig.load(platformConfig); | ||
| assertEquals("/home/test/ampl", cfg.getAmplHome(), "Error parsing Ampl Home"); | ||
| fs.close(); |
There was a problem hiding this comment.
Could you close it with try(...) ?
| assertTrue(amplState.isSuccess(), "AmplResult must be OK."); | ||
| } | ||
| // Test cleaning | ||
| fs.close(); |
There was a problem hiding this comment.
Could you close it with try(...) ?
…t, try with ressources Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
geofjamg
approved these changes
Mar 14, 2023
|
Kudos, SonarCloud Quality Gate passed! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements (please use
'[x]'to check the checkboxes, or submit the PR and then click the checkboxes)Does this PR already have an issue describing the problem ? If so, link to this issue using
'#XXX'and skip the restNot yet, but one might be created.
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
feature
What is the new behavior (if this is a feature change)?
We want to have a flexible way to run a AMPL model on a network and apply the results on the network.
The current interface is :
IAmplModelto tell how the model works and interface itself with the import/export functions of the ampl-converter moduleAmplModelRunnerSee here for use case.