Get curveData by curveId instead of all in a Map

Signed-off-by: Romain Courtier <[email protected]>
powsybl · Dec 9, 2024 · 4ed9550 · 4ed9550
1 parent 1bb1bc8
commit 4ed9550
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 29 deletions.
diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Context.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Context.java
@@ -17,12 +17,9 @@
 import com.powsybl.iidm.network.IdentifiableType;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.Terminal;
-import com.powsybl.triplestore.api.PropertyBags;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.function.Supplier;
 
@@ -56,8 +53,6 @@ public Context(CgmesModel cgmes, Config config, Network network, ReportNode repo
         loadingLimitsMapping = new LoadingLimitsMapping(this);
         regulatingControlMapping = new RegulatingControlMapping(this);
         nodeMapping = new NodeMapping(this);
-
-        reactiveCapabilityCurveData = new HashMap<>();
     }
 
     public CgmesModel cgmes() {
@@ -132,21 +127,6 @@ public static String boundarySubstationId(String nodeId) {
         return nodeId + "_S";
     }
 
-    public void loadReactiveCapabilityCurveData() {
-        PropertyBags rccdata = cgmes.reactiveCapabilityCurveData();
-        if (rccdata == null) {
-            return;
-        }
-        rccdata.forEach(p -> {
-            String curveId = p.getId("ReactiveCapabilityCurve");
-            reactiveCapabilityCurveData.computeIfAbsent(curveId, cid -> new PropertyBags()).add(p);
-        });
-    }
-
-    public PropertyBags reactiveCapabilityCurveData(String curveId) {
-        return reactiveCapabilityCurveData.get(curveId);
-    }
-
     // Handling issues found during conversion
 
     public ReportNode getReportNode() {
@@ -255,7 +235,5 @@ private static void logIssue(ConversionIssueCategory category, String what, Supp
     private final LoadingLimitsMapping loadingLimitsMapping;
     private final RegulatingControlMapping regulatingControlMapping;
 
-    private final Map<String, PropertyBags> reactiveCapabilityCurveData;
-
     private static final Logger LOG = LoggerFactory.getLogger(Context.class);
 }
diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Conversion.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Conversion.java
@@ -472,7 +472,6 @@ private Network createNetwork() {
     private Context createContext(Network network, ReportNode reportNode) {
         Context context = new Context(cgmes, config, network, reportNode);
         context.dc().initialize();
-        context.loadReactiveCapabilityCurveData();
         return context;
     }
 

diff --git a/...ain/java/com/powsybl/cgmes/conversion/elements/AbstractReactiveLimitsOwnerConversion.java b/...ain/java/com/powsybl/cgmes/conversion/elements/AbstractReactiveLimitsOwnerConversion.java
@@ -64,7 +64,7 @@ protected void convertReactiveLimits(ReactiveLimitsHolder g) {
         // ReactiveCapabilityCurve.
         if (p.containsKey("ReactiveCapabilityCurve")) {
             String curveId = p.getId("ReactiveCapabilityCurve");
-            PropertyBags curveData = context.reactiveCapabilityCurveData(curveId);
+            PropertyBags curveData = context.cgmes().curveData(curveId);
 
             Map<Double, Range<Double>> qRanges = new HashMap<>();
             curveData.forEach(d -> getReactiveCapabilityCurveData(d, qRanges));

diff --git a/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/AbstractCgmesModel.java b/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/AbstractCgmesModel.java
@@ -83,6 +83,14 @@ public PropertyBags phaseTapChangerTablePoints(String tableId) {
         return cachedGroupedPhaseTapChangerTablePoints.getOrDefault(tableId, new PropertyBags());
     }
 
+    @Override
+    public PropertyBags curveData(String curveId) {
+        if (cachedGroupedCurveData == null) {
+            cachedGroupedCurveData = computeGroupedCurveData();
+        }
+        return cachedGroupedCurveData.getOrDefault(curveId, new PropertyBags());
+    }
+
     @Override
     public Collection<CgmesTerminal> computedTerminals() {
         if (cachedTerminals == null) {
@@ -256,6 +264,17 @@ private Map<String, PropertyBags> computeGroupedPhaseTapChangerTablePoints() {
         return groupedPhaseTapChangerTablePoints;
     }
 
+    private Map<String, PropertyBags> computeGroupedCurveData() {
+        Map<String, PropertyBags> groupedCurveData = new HashMap<>();
+        curveData()
+                .forEach(data -> {
+                    String curveId = data.getId("ReactiveCapabilityCurve");
+                    groupedCurveData.computeIfAbsent(curveId, bag -> new PropertyBags())
+                            .add(data);
+                });
+        return groupedCurveData;
+    }
+
     protected void cacheNodes() {
         if (!cachedNodes) {
             cachedConnectivityNodes = connectivityNodes();
@@ -355,6 +374,7 @@ protected void invalidateCaches() {
         cachedGroupedTransformerEnds = null;
         cachedGroupedRatioTapChangers = null;
         cachedGroupedPhaseTapChangers = null;
+        cachedGroupedCurveData = null;
         cachedTerminals = null;
         cachedContainers = null;
         cachedBaseVoltages = null;
@@ -375,6 +395,7 @@ protected void invalidateCaches() {
     private Map<String, PropertyBags> cachedGroupedRatioTapChangerTablePoints;
     private Map<String, PropertyBags> cachedGroupedPhaseTapChangers;
     private Map<String, PropertyBags> cachedGroupedPhaseTapChangerTablePoints;
+    private Map<String, PropertyBags> cachedGroupedCurveData;
     private Map<String, CgmesTerminal> cachedTerminals;
     private Map<String, CgmesContainer> cachedContainers;
     private Map<String, Double> cachedBaseVoltages;

diff --git a/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesModel.java b/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesModel.java
@@ -166,7 +166,9 @@ default PropertyBags synchronousMachinesAll() {
 
     PropertyBags asynchronousMachines();
 
-    PropertyBags reactiveCapabilityCurveData();
+    PropertyBags curveData();
+
+    PropertyBags curveData(String curveId);
 
     PropertyBags controlAreas();
 

diff --git a/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/InMemoryCgmesModel.java b/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/InMemoryCgmesModel.java
@@ -523,7 +523,13 @@ public PropertyBags modelProfiles() {
     }
 
     @Override
-    public PropertyBags reactiveCapabilityCurveData() {
+    public PropertyBags curveData() {
+        // FakeCgmesModel does not implement reactive capability curve
+        return new PropertyBags();
+    }
+
+    @Override
+    public PropertyBags curveData(String curveId) {
         // FakeCgmesModel does not implement reactive capability curve
         return new PropertyBags();
     }

diff --git a/.../cgmes-model/src/main/java/com/powsybl/cgmes/model/triplestore/CgmesModelTripleStore.java b/.../cgmes-model/src/main/java/com/powsybl/cgmes/model/triplestore/CgmesModelTripleStore.java
@@ -548,8 +548,8 @@ public PropertyBags asynchronousMachines() {
     }
 
     @Override
-    public PropertyBags reactiveCapabilityCurveData() {
-        return namedQuery("reactiveCapabilityCurveData");
+    public PropertyBags curveData() {
+        return namedQuery("curveData");
     }
 
     @Override

diff --git a/cgmes/cgmes-model/src/main/resources/CIM16.sparql b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
@@ -945,7 +945,7 @@ WHERE {
 }}
 }
 
-# query: reactiveCapabilityCurveData
+# query: curveData
 SELECT *
 WHERE {
     ?CurveData