Refactor default model factory (#311)

* Refactor default model factory * Use the default model factory for EquipmentConnectionPoint * Use MacroConnectionsAdder instead of AbstractBlackBoxModel methods for macro connections creation * Replace call to context with late init final field in event model * Add reporter to MacroConnectionsAdder Signed-off-by: lisrte <[email protected]>
powsybl · Dec 13, 2023 · c96f529 · c96f529
1 parent 88a8161
commit c96f529
Show file tree

Hide file tree

Showing 56 changed files with 760 additions and 496 deletions.
diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java
@@ -62,7 +62,7 @@ void assertEventModel(AbstractEvent em, String dynamicId, String equipmentStatic
             assertEquals(lib, em.getLib());
         } else {
             Exception e = assertThrows(PowsyblException.class, em::getLib);
-            assertEquals("The associated library depends on context", e.getMessage());
+            assertEquals("Field has not been initialized", e.getMessage());
         }
     }
 

diff --git a/...sl/src/test/resources/ieee14-currentlimitautomaton/dynawaltz-inputs/powsybl_dynawaltz.dyd b/...sl/src/test/resources/ieee14-currentlimitautomaton/dynawaltz-inputs/powsybl_dynawaltz.dyd
@@ -76,7 +76,7 @@
         <dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
     </dyn:macroConnector>
-    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfEquipment">
+    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">
         <dyn:connect var1="numcc_node_@INDEX@" var2="@@NAME@@@NODE@_numcc"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations">
@@ -123,14 +123,14 @@
     <dyn:macroConnect connector="MC_CurrentLimitAutomatonMeasureSide2-DefaultLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
     <dyn:macroConnect connector="MC_CurrentLimitAutomatonControl-DefaultLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="0" id2="_GEN____1_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="1" id2="_GEN____2_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="2" id2="_GEN____3_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="3" id2="_GEN____6_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="4" id2="_GEN____8_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
     <dyn:macroConnect connector="MC_EventQuadripoleDisconnection-DefaultLine" id1="Disconnect__BUS____1-BUS____5-1_AC" id2="NETWORK" name2="_BUS____1-BUS____5-1_AC"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/...waltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.dyd b/...waltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.dyd
@@ -67,7 +67,7 @@
         <dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
     </dyn:macroConnector>
-    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfEquipment">
+    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">
         <dyn:connect var1="numcc_node_@INDEX@" var2="@@NAME@@@NODE@_numcc"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations">
@@ -110,14 +110,14 @@
     <dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____6_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____8_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="0" id2="_GEN____1_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="1" id2="_GEN____2_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="2" id2="_GEN____3_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="3" id2="_GEN____6_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="4" id2="_GEN____8_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
     <dyn:macroConnect connector="MC_EventQuadripoleDisconnection-DefaultLine" id1="Disconnect__BUS____1-BUS____5-1_AC" id2="NETWORK" name2="_BUS____1-BUS____5-1_AC"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.dyd b/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.dyd
@@ -66,7 +66,7 @@
         <dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
     </dyn:macroConnector>
-    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfEquipment">
+    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">
         <dyn:connect var1="numcc_node_@INDEX@" var2="@@NAME@@@NODE@_numcc"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations">
@@ -106,13 +106,13 @@
     <dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____6_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____8_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="0" id2="_GEN____1_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____1_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="1" id2="_GEN____2_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____2_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="2" id2="_GEN____3_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN____3_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="3" id2="_GEN____6_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____6_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="4" id2="_GEN____8_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____8_SM"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/...-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.dyd b/...-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.dyd
@@ -32,7 +32,7 @@
         <dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
     </dyn:macroConnector>
-    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfEquipment">
+    <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">
         <dyn:connect var1="numcc_node_@INDEX@" var2="@@NAME@@@NODE@_numcc"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_EventInjectionDisconnection-GeneratorSynchronousFourWindingsProportionalRegulations">
@@ -51,18 +51,18 @@
     <dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____9_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultEquipmentConnectionPoint" id1="_GEN____2_SM" id2="NETWORK"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="0" id2="_GEN____6_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____6_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_GEN____6_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="1" id2="_GEN____8_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____8_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_GEN____8_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="2" id2="_GEN___12_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN___12_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_GEN___12_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="3" id2="_GEN____1_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____1_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_GEN____1_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="4" id2="_GEN____3_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____3_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_GEN____3_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="5" id2="_GEN____9_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="5" id2="NETWORK" name2="_GEN____9_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="5" id2="NETWORK" name2="_GEN____9_SM"/>
     <dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="6" id2="_GEN____2_SM"/>
-    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfEquipment" id1="FREQ_SYNC" index1="6" id2="NETWORK" name2="_GEN____2_SM"/>
+    <dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized" id1="FREQ_SYNC" index1="6" id2="NETWORK" name2="_GEN____2_SM"/>
     <dyn:macroConnect connector="MC_EventInjectionDisconnection-GeneratorSynchronousFourWindingsProportionalRegulations" id1="Disconnect__GEN___12_SM" id2="_GEN___12_SM"/>
 </dyn:dynamicModelsArchitecture>