CGMES: fix performance regression checking for condensers (#2933)

Signed-off-by: Luma <zamarrenolm@aia.es>
powsybl · Mar 15, 2024 · 9df658f · 9df658f
1 parent 3438b06
commit 9df658f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/cgmes/cgmes-model/src/main/resources/CIM16.sparql b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
@@ -818,7 +818,14 @@ WHERE {
         cim:IdentifiedObject.name ?name ;
         cim:SynchronousMachine.type ?type ;
         cim:RotatingMachine.GeneratingUnit ?GeneratingUnit .
-    FILTER (!REGEX(STR(?type), "Kind.condenser"))
+    VALUES ?type {
+        cim:SynchronousMachineKind.generator
+        cim:SynchronousMachineKind.generatorOrCondenser
+        cim:SynchronousMachineKind.motor
+        cim:SynchronousMachineKind.generatorOrMotor
+        cim:SynchronousMachineKind.motorOrCondenser
+        cim:SynchronousMachineKind.generatorOrMotorOrCondenser
+    }
     OPTIONAL {
         ?SynchronousMachine cim:RotatingMachine.ratedS ?ratedS
     }

diff --git a/matpower/matpower-converter/src/test/resources/be.json b/matpower/matpower-converter/src/test/resources/be.json
@@ -184,12 +184,12 @@
     "minimumVoltageMagnitude" : 0.0
   } ],
   "generators" : [ {
-    "number" : 3,
-    "realPowerOutput" : 118.0,
-    "reactivePowerOutput" : 18.720301,
-    "maximumReactivePowerOutput" : 200.0,
-    "minimumReactivePowerOutput" : -200.0,
-    "voltageMagnitudeSetpoint" : 1.047,
+    "number" : 1,
+    "realPowerOutput" : 90.0,
+    "reactivePowerOutput" : 100.256,
+    "maximumReactivePowerOutput" : 210.0,
+    "minimumReactivePowerOutput" : -210.0,
+    "voltageMagnitudeSetpoint" : 1.05,
     "totalMbase" : 300.0,
     "status" : 1,
     "maximumRealPowerOutput" : 200.0,
@@ -206,12 +206,12 @@
     "rampQ" : 0.0,
     "apf" : 0.0
   }, {
-    "number" : 1,
-    "realPowerOutput" : 90.0,
-    "reactivePowerOutput" : 100.256,
-    "maximumReactivePowerOutput" : 210.0,
-    "minimumReactivePowerOutput" : -210.0,
-    "voltageMagnitudeSetpoint" : 1.05,
+    "number" : 3,
+    "realPowerOutput" : 118.0,
+    "reactivePowerOutput" : 18.720301,
+    "maximumReactivePowerOutput" : 200.0,
+    "minimumReactivePowerOutput" : -200.0,
+    "voltageMagnitudeSetpoint" : 1.047,
     "totalMbase" : 300.0,
     "status" : 1,
     "maximumRealPowerOutput" : 200.0,