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

Various refactors #345

Merged
merged 5 commits into from
May 15, 2024
Merged

Various refactors #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cd07a3
Add equipment id to default model warning/report
Lisrte Apr 19, 2024
0f9c5e1
Remove deprecated and other minors errors
Lisrte Apr 24, 2024
6794c32
Refactor ModelConfigsJsonDeserializer
Lisrte Apr 25, 2024
698bba3
Fix test, checkstyle
Lisrte Apr 25, 2024
0043d38
Merge branch 'main' into misc_refactors
flo-dup May 14, 2024
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
2 changes: 1 addition & 1 deletion commons/src/main/java/com/powsybl/dynawo/commons/dynawologs/LogUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private LogUtils() {

public static Optional<LogEntry> createLog(String severity, String message) {
if (severity == null) {
LOGGER.warn("Inconsistent log entry (modelName: '{}', message: '{}')", severity, message);
LOGGER.warn("Inconsistent log entry (message: '{}')", message);
} else {
if (emptyMessage(message)) {
LOGGER.debug("Empty message, the entry will be skipped : {}", message);
Expand Down
36 changes: 18 additions & 18 deletions dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void checkAllParametersAssignedToString() {
@Test
void defaultParametersSerialization() throws IOException {
LoadFlowParameters lfParameters = LoadFlowParameters.load(platformConfig);
lfParameters.setNoGeneratorReactiveLimits(true);
lfParameters.setUseReactiveLimits(false);
lfParameters.setPhaseShifterRegulationOn(false);

DynaFlowParameters dynaFlowParameters = new DynaFlowParameters();
Expand All @@ -212,25 +212,25 @@ void defaultParametersSerialization() throws IOException {
@Test
void parametersSerialization() throws IOException {
LoadFlowParameters lfParameters = LoadFlowParameters.load(platformConfig);
lfParameters.setNoGeneratorReactiveLimits(true);
lfParameters.setUseReactiveLimits(false);
lfParameters.setPhaseShifterRegulationOn(false);

DynaFlowParameters dynaFlowParameters = new DynaFlowParameters();
dynaFlowParameters.setSvcRegulationOn(true);
dynaFlowParameters.setShuntRegulationOn(false);
dynaFlowParameters.setAutomaticSlackBusOn(true);
dynaFlowParameters.setDsoVoltageLevel(32.4);
dynaFlowParameters.setActivePowerCompensation(ActivePowerCompensation.P);
dynaFlowParameters.setSettingPath("path/to/settingFile");
dynaFlowParameters.setAssemblingPath("path/to/assemblingFile");
dynaFlowParameters.setStartTime(0.);
dynaFlowParameters.setStopTime(100.);
dynaFlowParameters.setPrecision(0.);
dynaFlowParameters.setTimeOfEvent(10.);
dynaFlowParameters.setChosenOutputs(Collections.singletonList(OutputTypes.STEADYSTATE.name()));
dynaFlowParameters.setTimeStep(2.6);
dynaFlowParameters.setStartingPointMode(StartingPointMode.WARM);
dynaFlowParameters.setMergeLoads(false);
DynaFlowParameters dynaFlowParameters = new DynaFlowParameters()
.setSvcRegulationOn(true)
.setShuntRegulationOn(false)
.setAutomaticSlackBusOn(true)
.setDsoVoltageLevel(32.4)
.setActivePowerCompensation(ActivePowerCompensation.P)
.setSettingPath("path/to/settingFile")
.setAssemblingPath("path/to/assemblingFile")
.setStartTime(0.)
.setStopTime(100.)
.setPrecision(0.)
.setTimeOfEvent(10.)
.setChosenOutputs(Collections.singletonList(OutputTypes.STEADYSTATE.name()))
.setTimeStep(2.6)
.setStartingPointMode(StartingPointMode.WARM)
.setMergeLoads(false);
lfParameters.addExtension(DynaFlowParameters.class, dynaFlowParameters);

Path workingDir = fileSystem.getPath("dynaflow/workingDir");
Expand Down
8 changes: 5 additions & 3 deletions dynaflow/src/test/java/com/powsybl/dynaflow/DynaFlowProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@

import static com.powsybl.commons.test.ComparisonUtils.compareXml;
import static com.powsybl.dynaflow.DynaFlowConstants.*;
import static com.powsybl.loadflow.LoadFlowResult.Status.FAILED;
import static com.powsybl.loadflow.LoadFlowResult.Status.FULLY_CONVERGED;
import static org.junit.jupiter.api.Assertions.*;

/**
Expand Down Expand Up @@ -134,7 +136,7 @@ void testWithoutMergeLoads() throws Exception {
ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(fileSystem.getPath("/working-dir"), 1), commandExecutor, ForkJoinPool.commonPool());
LoadFlowResult result = dynaFlowSimulation.run(network, computationManager, params);
assertNotNull(result);
assertTrue(result.isOk());
assertEquals(FULLY_CONVERGED, result.getStatus());

InputStream pReferenceOutput = getClass().getResourceAsStream("/output.xiidm");
Network expectedNetwork = NetworkSerDe.read(pReferenceOutput);
Expand All @@ -155,7 +157,7 @@ void testWithMergeLoads() throws Exception {
ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(fileSystem.getPath("/working-dir"), 1), commandExecutor, ForkJoinPool.commonPool());
LoadFlowResult result = dynaFlowSimulation.run(network, computationManager, params);
assertNotNull(result);
assertTrue(result.isOk());
assertEquals(FULLY_CONVERGED, result.getStatus());

InputStream pReferenceOutput = getClass().getResourceAsStream("/output.xiidm");
Network expectedNetwork = NetworkSerDe.read(pReferenceOutput);
Expand All @@ -175,7 +177,7 @@ void testFail() throws Exception {
ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(fileSystem.getPath("/working-dir"), 1), commandExecutor, ForkJoinPool.commonPool());
LoadFlowResult result = dynaFlowSimulation.run(network, computationManager, params);
assertNotNull(result);
assertFalse(result.isOk());
assertEquals(FAILED, result.getStatus());
}

@Test
Expand Down
32 changes: 16 additions & 16 deletions dynaflow/src/test/java/com/powsybl/dynaflow/json/JsonDynaFlowParametersSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,24 +69,24 @@ void roundTripParameters() throws IOException {
InMemoryPlatformConfig platformConfig = new InMemoryPlatformConfig(fileSystem);

LoadFlowParameters parameters = LoadFlowParameters.load(platformConfig);
parameters.setNoGeneratorReactiveLimits(true);
parameters.setUseReactiveLimits(false);
parameters.setPhaseShifterRegulationOn(false);

DynaFlowParameters params = new DynaFlowParameters();
params.setSvcRegulationOn(true);
params.setShuntRegulationOn(false);
params.setAutomaticSlackBusOn(true);
params.setDsoVoltageLevel(54.23);
params.setActivePowerCompensation(DynaFlowConstants.ActivePowerCompensation.P);
params.setSettingPath("path/to/settingFile");
params.setAssemblingPath("path/to/assemblingFile");
params.setStartTime(0.);
params.setStopTime(100.);
params.setPrecision(0.);
params.setTimeOfEvent(10.);
params.setChosenOutputs(Collections.singletonList(DynaFlowConstants.OutputTypes.STEADYSTATE.name()));
params.setTimeStep(2.6);
params.setStartingPointMode(DynaFlowConstants.StartingPointMode.WARM);
DynaFlowParameters params = new DynaFlowParameters()
.setSvcRegulationOn(true)
.setShuntRegulationOn(false)
.setAutomaticSlackBusOn(true)
.setDsoVoltageLevel(54.23)
.setActivePowerCompensation(DynaFlowConstants.ActivePowerCompensation.P)
.setSettingPath("path/to/settingFile")
.setAssemblingPath("path/to/assemblingFile")
.setStartTime(0.)
.setStopTime(100.)
.setPrecision(0.)
.setTimeOfEvent(10.)
.setChosenOutputs(Collections.singletonList(DynaFlowConstants.OutputTypes.STEADYSTATE.name()))
.setTimeStep(2.6)
.setStartingPointMode(DynaFlowConstants.StartingPointMode.WARM);

parameters.addExtension(DynaFlowParameters.class, params);

Expand Down
2 changes: 1 addition & 1 deletion dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DslReports.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
package com.powsybl.dynawaltz.dsl

import com.powsybl.commons.report.ReportNode;
import com.powsybl.commons.report.ReportNode

/**
* @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
Expand Down
2 changes: 1 addition & 1 deletion dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynaWaltzGroovyCurvesSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private static Stream<Arguments> provideFileError() {
private List<CurveGroovyExtension> validateGroovyExtension() {
List<CurveGroovyExtension> extensions = GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME);
assertEquals(1, extensions.size());
assertTrue(extensions.get(0) instanceof DynaWaltzCurveGroovyExtension);
assertInstanceOf(DynaWaltzCurveGroovyExtension.class, extensions.get(0));
return extensions;
}

Expand Down
2 changes: 1 addition & 1 deletion dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ faultTime should be strictly positive (0.0)
'staticId' field value 'SVC2' not found for equipment type(s) GENERATOR/LOAD
'deltaP' field is not set
Model Step_SVC2 cannot be instantiated
"""),
"""),
Arguments.of("/eventWarnings/missingDisconnectionEquipment.groovy", EurostagTutorialExample1Factory.create(),
"""
+ DSL tests
Expand Down
96 changes: 43 additions & 53 deletions dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.powsybl.commons.json.JsonUtil;

import java.io.IOException;
import java.util.*;

import static com.fasterxml.jackson.core.JsonToken.VALUE_STRING;

/**
* @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
*/
Expand All @@ -32,69 +31,60 @@ public Map<String, ModelConfigs> deserialize(JsonParser parser, DeserializationC
while (parser.nextToken() != JsonToken.END_OBJECT) {
String category = parser.getCurrentName();
parser.nextToken();
configMap.put(category, deserializeModelConfigs(parser));
configMap.put(category, parseModelConfigs(parser));
}
return configMap;
}

private ModelConfigs deserializeModelConfigs(JsonParser parser) throws IOException {
String defaultLib = null;
Map<String, ModelConfig> libs = null;
while (parser.nextToken() != JsonToken.END_OBJECT) {
switch (parser.getCurrentName()) {
case "defaultLib":
defaultLib = parser.getValueAsString();
break;
case "libs":
libs = deserializeLibsMap(parser);
break;
default:
throw new IllegalStateException("Unexpected field: " + parser.getCurrentName());
private static ModelConfigs parseModelConfigs(JsonParser parser) {
var parsingContext = new Object() {
String defaultLib = null;
final Map<String, ModelConfig> libs = new HashMap<>();
};
JsonUtil.parseObject(parser, name ->
switch (name) {
case "defaultLib" -> {
parsingContext.defaultLib = parser.nextTextValue();
yield true;
}
case "libs" -> {
JsonUtil.parseObjectArray(parser, mc -> parsingContext.libs.put(mc.name(), mc), ModelConfigsJsonDeserializer::parseModelConfig);
yield true;
}
default -> false;
}
}
return new ModelConfigs(libs, defaultLib);
);
return new ModelConfigs(parsingContext.libs, parsingContext.defaultLib);
}

private Map<String, ModelConfig> deserializeLibsMap(JsonParser parser) throws IOException {
Map<String, ModelConfig> libs = new HashMap<>();
while (parser.nextToken() != JsonToken.END_ARRAY) {
parser.nextToken();
private static ModelConfig parseModelConfig(JsonParser parser) {
var parsingContext = new Object() {
String lib = null;
String alias = null;
String internalModelPrefix = null;
List<String> properties = Collections.emptyList();
while (parser.nextToken() != JsonToken.END_OBJECT) {
switch (parser.getCurrentName()) {
case "lib":
lib = parser.getValueAsString();
break;
case "properties":
properties = deserializeProperties(parser);
break;
case "internalModelPrefix":
internalModelPrefix = parser.getValueAsString();
break;
case "alias":
alias = parser.getValueAsString();
break;
default:
throw new IllegalStateException("Unexpected field: " + parser.getCurrentName());
};
JsonUtil.parseObject(parser, name ->
switch (parser.getCurrentName()) {
case "lib" -> {
parsingContext.lib = parser.nextTextValue();
yield true;
}
case "properties" -> {
parsingContext.properties = JsonUtil.parseStringArray(parser);
yield true;
}
case "internalModelPrefix" -> {
parsingContext.internalModelPrefix = parser.nextTextValue();
yield true;
}
case "alias" -> {
parsingContext.alias = parser.nextTextValue();
yield true;
}
default -> false;
}
ModelConfig modelConfig = new ModelConfig(lib, alias, internalModelPrefix, properties);
libs.put(modelConfig.name(), modelConfig);
}
return libs;
}

private List<String> deserializeProperties(JsonParser parser) throws IOException {
List<String> properties = new ArrayList<>();
JsonToken token;
while ((token = parser.nextToken()) != JsonToken.END_ARRAY) {
if (token == VALUE_STRING) {
properties.add(parser.getValueAsString().toUpperCase());
}
}
return properties;
);
return new ModelConfig(parsingContext.lib, parsingContext.alias, parsingContext.internalModelPrefix, parsingContext.properties);
}
}
4 changes: 2 additions & 2 deletions dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public <T extends Model> T getDefaultModel(Identifiable<?> equipment, Class<T> c
return connectableClass.cast(defaultModel);
}
if (throwException) {
throw new PowsyblException("Default model " + defaultModel.getClass().getSimpleName() + " does not implement " + connectableClass.getSimpleName() + " interface");
throw new PowsyblException("Default model " + defaultModel.getClass().getSimpleName() + " for " + equipment.getId() + " does not implement " + connectableClass.getSimpleName() + " interface");
} else {
LOGGER.warn("Default model {} does not implement {} interface", defaultModel.getClass().getSimpleName(), connectableClass.getSimpleName());
LOGGER.warn("Default model {} for {} does not implement {} interface", defaultModel.getClass().getSimpleName(), equipment.getId(), connectableClass.getSimpleName());
return null;
}
}
Expand Down
Loading
Loading