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

Refactor parameters input #210

Merged
merged 21 commits into from
Apr 21, 2023
Merged

Refactor parameters input #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
180052d
Read parameters instead of just passing path
flo-dup Apr 5, 2023
746fd2b
Fix parameters serialization
flo-dup Apr 18, 2023
121bc59
Parameters files are in config dir if specified
flo-dup Apr 18, 2023
a5a5f4c
Fix serialization test
flo-dup Apr 18, 2023
3be5f42
Fix integration tests calls
flo-dup Apr 18, 2023
0972287
Fix tests
flo-dup Apr 20, 2023
06129c3
Fix wrong model parameter file references
flo-dup Apr 20, 2023
3b55758
Write parameters and add references entries support
flo-dup Apr 20, 2023
6f123e2
Refactor inner classes into separate classes
flo-dup Apr 20, 2023
9e92a22
Delete ParametersSet class
flo-dup Apr 21, 2023
4178ae3
Delete Solver and Network classes
flo-dup Apr 21, 2023
6b8c0f6
Rename Set to ParametersSet
flo-dup Apr 21, 2023
6c7ff4d
Fix parameters serialization
flo-dup Apr 21, 2023
45829a6
Fix output par files names
flo-dup Apr 21, 2023
cd8c757
Fix dsl unit tests
flo-dup Apr 21, 2023
6daa261
Fix after quick review
flo-dup Apr 21, 2023
313f559
Renaming path input constants
flo-dup Apr 21, 2023
41e3534
Fix integration tests
flo-dup Apr 21, 2023
caf4497
Fix code smells
flo-dup Apr 21, 2023
040fade
Merge branch 'main' into parametersSet
flo-dup Apr 21, 2023
2d1cbad
Fix import
flo-dup Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/AbstractIeeeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import com.powsybl.computation.local.LocalComputationManager;
import com.powsybl.dynamicsimulation.*;
import com.powsybl.dynamicsimulation.groovy.*;
import com.powsybl.dynamicsimulation.json.JsonDynamicSimulationParameters;
import com.powsybl.dynawaltz.DynaWaltzParameters;
import com.powsybl.dynawaltz.DynaWaltzProvider;
import com.powsybl.dynawaltz.xml.ParametersXml;
import com.powsybl.iidm.network.Network;
import org.junit.jupiter.api.AfterEach;

Expand Down Expand Up @@ -51,20 +51,14 @@ void tearDown() throws IOException {

public abstract String getWorkingDirName();

protected void setup(String parametersFile, String networkParametersFile, String solverParametersFile, String networkFile,
String dynamicModelsFile, String eventModelsFile, String curvesFile, String parametersJson) throws IOException {
protected void setup(String parametersFile, String networkParametersFile, String networkParametersId, String solverParametersFile, String solverParametersId, String networkFile,
String dynamicModelsFile, String eventModelsFile, String curvesFile, int startTime, int stopTime) throws IOException {

// The parameter files are copied into the PlatformConfig filesystem,
// that filesystem is the one that DynaWaltzContext and ParametersXml will use to read the parameters
fileSystem = PlatformConfig.defaultConfig().getConfigDir().map(Path::getFileSystem).orElseThrow(AssertionError::new);
workingDir = Files.createDirectory(fileSystem.getPath(getWorkingDirName()));

// Copy parameter files
Path configDir = Files.createDirectory(workingDir.resolve("config"));
Files.copy(getClass().getResourceAsStream(parametersFile), configDir.resolve("models.par"));
Files.copy(getClass().getResourceAsStream(networkParametersFile), configDir.resolve("network.par"));
Files.copy(getClass().getResourceAsStream(solverParametersFile), configDir.resolve("solvers.par"));

// Load network
Files.copy(getClass().getResourceAsStream(networkFile), workingDir.resolve("network.iidm"));
network = Network.read(workingDir.resolve("network.iidm"));
Expand Down Expand Up @@ -96,9 +90,15 @@ protected void setup(String parametersFile, String networkParametersFile, String
curvesSupplier = CurvesSupplier.empty();
}

// Parameters
Files.copy(getClass().getResourceAsStream(parametersJson), workingDir.resolve("dynaWaltzParameters.json"));
parameters = JsonDynamicSimulationParameters.read(workingDir.resolve("dynaWaltzParameters.json"));
parameters = new DynamicSimulationParameters()
.setStartTime(startTime)
.setStopTime(stopTime);
DynaWaltzParameters dynaWaltzParameters = new DynaWaltzParameters();
parameters.addExtension(DynaWaltzParameters.class, dynaWaltzParameters);
dynaWaltzParameters.setModelsParameters(ParametersXml.load(getClass().getResourceAsStream(parametersFile)))
.setNetworkParameters(ParametersXml.load(getClass().getResourceAsStream(networkParametersFile), networkParametersId))
.setSolverParameters(ParametersXml.load(getClass().getResourceAsStream(solverParametersFile), solverParametersId))
.setSolverType(DynaWaltzParameters.SolverType.IDA);
}

protected DynaWaltzParameters getDynaWaltzSimulationParameters(DynamicSimulationParameters parameters) {
Expand Down
6 changes: 3 additions & 3 deletions ...waltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/DynaWaltzLocalCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ protected void validateInputs(Path workingDir) throws IOException {
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.xiidm"), Files.newInputStream(workingDir.resolve(NETWORK_FILENAME)));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.jobs"), Files.newInputStream(workingDir.resolve(JOBS_FILENAME)));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.dyd"), Files.newInputStream(workingDir.resolve(DYD_FILENAME)));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/models.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(dynaWaltzParameters.getParametersFile()).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/network.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(dynaWaltzParameters.getNetwork().getParametersFile()).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/solvers.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(dynaWaltzParameters.getSolver().getParametersFile()).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/models.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.MODELS_OUTPUT_PARAMETERS_FILE).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/network.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.NETWORK_OUTPUT_PARAMETERS_FILE).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/solvers.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.SOLVER_OUTPUT_PARAMETERS_FILE).getFileName().toString())));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/" + networkId + ".par"), Files.newInputStream(workingDir.resolve(networkId + ".par")));
compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.crv"), Files.newInputStream(workingDir.resolve(CRV_FILENAME)));
}
Expand Down
6 changes: 3 additions & 3 deletions ...z-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14CurrentLimitAutomatonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class Ieee14CurrentLimitAutomatonTest extends AbstractIeeeTest {
void setup() throws IOException {
super.setup(
"/ieee14-currentlimitautomaton/config/models.par",
"/ieee14-currentlimitautomaton/config/network.par",
"/ieee14-currentlimitautomaton/config/solvers.par",
"/ieee14-currentlimitautomaton/config/network.par", "8",
"/ieee14-currentlimitautomaton/config/solvers.par", "2",
"/ieee14-currentlimitautomaton/powsybl-inputs/IEEE14.iidm",
"/ieee14-currentlimitautomaton/powsybl-inputs/dynamicModels.groovy",
"/ieee14-currentlimitautomaton/powsybl-inputs/eventModels.groovy",
"/ieee14-currentlimitautomaton/powsybl-inputs/curves.groovy",
"/ieee14-currentlimitautomaton/powsybl-inputs/dynaWaltzParameters.json"
0, 50
);
}

Expand Down
6 changes: 3 additions & 3 deletions dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DisconnectLineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class Ieee14DisconnectLineTest extends AbstractIeeeTest {
public void setup() throws IOException {
super.setup(
"/ieee14-disconnectline/config/models.par",
"/ieee14-disconnectline/config/network.par",
"/ieee14-disconnectline/config/solvers.par",
"/ieee14-disconnectline/config/network.par", "8",
"/ieee14-disconnectline/config/solvers.par", "2",
"/ieee14-disconnectline/powsybl-inputs/IEEE14.iidm",
"/ieee14-disconnectline/powsybl-inputs/dynamicModels.groovy",
"/ieee14-disconnectline/powsybl-inputs/eventModels.groovy",
"/ieee14-disconnectline/powsybl-inputs/curves.groovy",
"/ieee14-disconnectline/powsybl-inputs/dynaWaltzParameters.json");
0, 30);
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14MacroConnectsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class Ieee14MacroConnectsTest extends AbstractIeeeTest {
void setup() throws IOException {
super.setup(
"/ieee14-macroconnects/config/models.par",
"/ieee14-macroconnects/config/network.par",
"/ieee14-macroconnects/config/solvers.par",
"/ieee14-macroconnects/config/network.par", "8",
"/ieee14-macroconnects/config/solvers.par", "2",
"/ieee14-macroconnects/powsybl-inputs/IEEE14.iidm",
"/ieee14-macroconnects/powsybl-inputs/dynamicModels.groovy",
null,
"/ieee14-macroconnects/powsybl-inputs/curves.groovy",
"/ieee14-macroconnects/powsybl-inputs/dynaWaltzParameters.json"
0, 100
);
}

Expand Down
6 changes: 3 additions & 3 deletions ...ltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee57/Ieee57DisconnectGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ class Ieee57DisconnectGeneratorTest extends AbstractIeeeTest {
void setup() throws IOException {
super.setup(
"/ieee57-disconnectgenerator/config/models.par",
"/ieee57-disconnectgenerator/config/network.par",
"/ieee57-disconnectgenerator/config/solvers.par",
"/ieee57-disconnectgenerator/config/network.par", "51",
"/ieee57-disconnectgenerator/config/solvers.par", "2",
"/ieee57-disconnectgenerator/powsybl-inputs/IEEE57.iidm",
"/ieee57-disconnectgenerator/powsybl-inputs/dynamicModels.groovy",
"/ieee57-disconnectgenerator/powsybl-inputs/eventModels.groovy",
"/ieee57-disconnectgenerator/powsybl-inputs/curves.groovy",
"/ieee57-disconnectgenerator/powsybl-inputs/dynaWaltzParameters.json");
0, 30);
}

@Test
Expand Down
43 changes: 0 additions & 43 deletions dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/dynawaltz-inputs/solvers.par
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<parametersSet xmlns="http://www.rte-france.com/dynawo">
<!-- IDA order 1 solver-->
<set id="1">
<par type="INT" name="order" value="1"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- IDA order 2 solver -->
<set id="2">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
Expand All @@ -18,37 +8,4 @@
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- Simplified solver without step recalculation -->
<set id="3">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="false"/>
</set>
<!-- Simplified solver with step recalculation -->
<set id="4">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="true"/>
</set>
<!-- IDA order 2 solver with higher accuracy requirements -->
<set id="5">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-6"/>
<par type="DOUBLE" name="relAccuracy" value="1e-6"/>
</set>
</parametersSet>
19 changes: 0 additions & 19 deletions ...l/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/dynaWaltzParameters.json
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/solvers.par
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<parametersSet xmlns="http://www.rte-france.com/dynawo">
<!-- IDA order 1 solver-->
<set id="1">
<par type="INT" name="order" value="1"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- IDA order 2 solver -->
<set id="2">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
Expand All @@ -18,37 +8,4 @@
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- Simplified solver without step recalculation -->
<set id="3">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="false"/>
</set>
<!-- Simplified solver with step recalculation -->
<set id="4">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="true"/>
</set>
<!-- IDA order 2 solver with higher accuracy requirements -->
<set id="5">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-6"/>
<par type="DOUBLE" name="relAccuracy" value="1e-6"/>
</set>
</parametersSet>
19 changes: 0 additions & 19 deletions ...altz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/dynaWaltzParameters.json
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/solvers.par
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<parametersSet xmlns="http://www.rte-france.com/dynawo">
<!-- IDA order 1 solver-->
<set id="1">
<par type="INT" name="order" value="1"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- IDA order 2 solver -->
<set id="2">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
Expand All @@ -18,37 +8,4 @@
<par type="DOUBLE" name="absAccuracy" value="1e-4"/>
<par type="DOUBLE" name="relAccuracy" value="1e-4"/>
</set>
<!-- Simplified solver without step recalculation -->
<set id="3">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="false"/>
</set>
<!-- Simplified solver with step recalculation -->
<set id="4">
<par type="DOUBLE" name="hMin" value="0.000001"/>
<par type="DOUBLE" name="hMax" value="1"/>
<par type="DOUBLE" name="kReduceStep" value="0.5"/>
<par type="INT" name="nEff" value="10"/>
<par type="INT" name="nDeadband" value="2"/>
<par type="INT" name="maxRootRestart" value="3"/>
<par type="INT" name="maxNewtonTry" value="10"/>
<par type="STRING" name="linearSolverName" value="KLU"/>
<par type="BOOL" name="recalculateStep" value="true"/>
</set>
<!-- IDA order 2 solver with higher accuracy requirements -->
<set id="5">
<par type="INT" name="order" value="2"/>
<par type="DOUBLE" name="initStep" value="0.000001"/>
<par type="DOUBLE" name="minStep" value="0.000001"/>
<par type="DOUBLE" name="maxStep" value="10"/>
<par type="DOUBLE" name="absAccuracy" value="1e-6"/>
<par type="DOUBLE" name="relAccuracy" value="1e-6"/>
</set>
</parametersSet>
19 changes: 0 additions & 19 deletions ...waltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/dynaWaltzParameters.json
View file
Open in desktop

This file was deleted.

Loading