Skip to content

Fix perf cgmes measurement postproc #3433

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −10
Open

Fix perf cgmes measurement postproc #3433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
896786d
Avoid linear scanning of the list of bay propertyBag by using a map i…
laurgarn Apr 30, 2025
848663e
Restore previous interface, as deprecated, to make this PR a non brea…
laurgarn May 5, 2025
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
18 changes: 15 additions & 3 deletions ...s-measurements/src/main/java/com/powsybl/cgmes/measurements/CgmesAnalogPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.*;
import com.powsybl.triplestore.api.PropertyBag;
import com.powsybl.triplestore.api.PropertyBags;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Map;
import java.util.stream.Collectors;

import static com.powsybl.iidm.network.extensions.Measurement.Type.*;
import com.powsybl.triplestore.api.PropertyBags;

/**
* @author Miora Ralambotiana {@literal <miora.ralambotiana at rte-france.com>}
Expand All @@ -26,7 +28,17 @@ public final class CgmesAnalogPostProcessor {

private static final Logger LOG = LoggerFactory.getLogger(CgmesAnalogPostProcessor.class);

public static void process(Network network, String id, String terminalId, String powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {
@Deprecated
public static void process(Network network, String id, String terminalId, String
powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {

Map<String, PropertyBag> m = bays.stream().collect(Collectors.toMap(b -> b.getId("Bay"), b -> b));
process(network, id, terminalId, powerSystemResourceId, measurementType, m, typesMapping);
}

public static void process(Network network, String id, String terminalId,
String powerSystemResourceId, String measurementType,
Map<String, PropertyBag> idToBayBag, Map<String, String> typesMapping) {
if (terminalId != null) {
Identifiable<?> identifiable = network.getIdentifiable(terminalId);
if (identifiable != null) {
Expand All @@ -40,7 +52,7 @@ public static void process(Network network, String id, String terminalId, String
createMeas(identifiable, id, terminalId, measurementType, typesMapping);
return;
}
PropertyBag bay = bays.stream().filter(b -> b.getId("Bay").equals(powerSystemResourceId)).findFirst().orElse(null);
PropertyBag bay = idToBayBag.get(powerSystemResourceId);
if (bay != null) {
String voltageLevelId = bay.getId("VoltageLevel");
LOG.info("Power resource system {} of Analog {} is a Bay: Analog is attached to the associated voltage level {}",
Expand Down
18 changes: 15 additions & 3 deletions ...measurements/src/main/java/com/powsybl/cgmes/measurements/CgmesDiscretePostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.*;
import com.powsybl.triplestore.api.PropertyBag;
import com.powsybl.triplestore.api.PropertyBags;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static com.powsybl.iidm.network.extensions.DiscreteMeasurement.Type.*;
import com.powsybl.triplestore.api.PropertyBags;

/**
* @author Miora Ralambotiana {@literal <miora.ralambotiana at rte-france.com>}
Expand All @@ -27,7 +29,17 @@ public final class CgmesDiscretePostProcessor {

private static final Logger LOG = LoggerFactory.getLogger(CgmesDiscretePostProcessor.class);

public static void process(Network network, String id, String terminalId, String powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {
@Deprecated
public static void process(Network network, String id, String terminalId, String
powerSystemResourceId, String measurementType, PropertyBags bays, Map<String, String> typesMapping) {

Map<String, PropertyBag> m = bays.stream().collect(Collectors.toMap(b -> b.getId("Bay"), b -> b));
process(network, id, terminalId, powerSystemResourceId, measurementType, m, typesMapping);
}

public static void process(Network network, String id, String terminalId,
String powerSystemResourceId, String measurementType,
Map<String, PropertyBag> idToBayBag, Map<String, String> typesMapping) {
if (terminalId != null) {
Identifiable<?> identifiable = network.getIdentifiable(terminalId);
if (identifiable != null) {
Expand All @@ -41,7 +53,7 @@ public static void process(Network network, String id, String terminalId, String
createDisMeas(identifiable, id, measurementType, typesMapping);
return;
}
PropertyBag bay = bays.stream().filter(b -> b.getId("Bay").equals(powerSystemResourceId)).findFirst().orElse(null);
PropertyBag bay = idToBayBag.get(powerSystemResourceId);
if (bay != null) {
String voltageLevelId = bay.getId("VoltageLevel");
LOG.info("Power resource system {} of Discrete {} is a Bay: Discrete is attached to the associated voltage level {}",
Expand Down
13 changes: 9 additions & 4 deletions ...urements/src/main/java/com/powsybl/cgmes/measurements/CgmesMeasurementsPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,24 @@ public String getName() {
public void process(Network network, TripleStore tripleStore) {
CgmesMeasurementsModel model = new CgmesMeasurementsModel(tripleStore);
PropertyBags bays = model.bays();
Map<String, PropertyBag> idToBayBag = bays.stream().collect(Collectors.toMap(b -> b.getId("Bay"), b -> b));
Map<String, String> analogTypesMapping = createTypesMapping(
Parameter.readStringList("CGMES", null, ANALOG_TYPES_MAPPING_PARAMETER, defaultValueConfig));
for (PropertyBag analog : model.analogs()) {
CgmesAnalogPostProcessor.process(network, analog.getId("Analog"), analog.getId("Terminal"),
analog.getId("powerSystemResource"),
analog.getId("type"),
bays,
createTypesMapping(Parameter.readStringList("CGMES", null, ANALOG_TYPES_MAPPING_PARAMETER, defaultValueConfig)));
idToBayBag,
analogTypesMapping);
}
Map<String, String> discreteTypesMapping = createTypesMapping(
Parameter.readStringList("CGMES", null, DISCRETE_TYPES_MAPPING_PARAMETER, defaultValueConfig));
for (PropertyBag discrete : model.discretes()) {
CgmesDiscretePostProcessor.process(network, discrete.getId("Discrete"), discrete.getId("Terminal"),
discrete.getId("powerSystemResource"),
discrete.getId("type"),
bays,
createTypesMapping(Parameter.readStringList("CGMES", null, DISCRETE_TYPES_MAPPING_PARAMETER, defaultValueConfig)));
idToBayBag,
discreteTypesMapping);
}
}

Expand Down