Add reporter to MacroConnectionsAdder

Signed-off-by: lisrte <[email protected]>
powsybl · Nov 24, 2023 · f35843b · f35843b
1 parent 108678b
commit f35843b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
@@ -47,7 +47,6 @@ public class DynaWaltzContext {
     private static final String MODEL_ID_EXCEPTION = "The model identified by the static id %s does not match the expected model (%s)";
     private static final String MODEL_ID_LOG = "The model identified by the static id {} does not match the expected model ({})";
 
-    private final Reporter reporter;
     private final Network network;
     private final String workingVariantId;
     private final DynamicSimulationParameters parameters;
@@ -72,20 +71,20 @@ public DynaWaltzContext(Network network, String workingVariantId, List<BlackBoxM
     public DynaWaltzContext(Network network, String workingVariantId, List<BlackBoxModel> dynamicModels, List<BlackBoxModel> eventModels,
                             List<Curve> curves, DynamicSimulationParameters parameters, DynaWaltzParameters dynaWaltzParameters, Reporter reporter) {
 
-        this.reporter = DynawaltzReports.createDynaWaltzContextReporter(reporter);
+        Reporter contextReporter = DynawaltzReports.createDynaWaltzContextReporter(reporter);
         this.network = Objects.requireNonNull(network);
         this.workingVariantId = Objects.requireNonNull(workingVariantId);
 
         this.dynamicModels = Objects.requireNonNull(dynamicModels).stream()
-                .filter(distinctByDynamicId(reporter).and(distinctByStaticId(reporter)))
+                .filter(distinctByDynamicId(contextReporter).and(distinctByStaticId(contextReporter)))
                 .toList();
         this.staticIdBlackBoxModelMap = getInputBlackBoxDynamicModelStream()
                 .filter(EquipmentBlackBoxModel.class::isInstance)
                 .map(EquipmentBlackBoxModel.class::cast)
                 .collect(Collectors.toMap(EquipmentBlackBoxModel::getStaticId, Function.identity()));
 
         this.eventModels = Objects.requireNonNull(eventModels).stream()
-                .filter(distinctByDynamicId())
+                .filter(distinctByDynamicId(contextReporter))
                 .map(setLateInitEventField())
                 .toList();
 
@@ -96,7 +95,8 @@ public DynaWaltzContext(Network network, String workingVariantId, List<BlackBoxM
         this.macroConnectionsAdder = new MacroConnectionsAdder(this::getDynamicModel,
                 this::getPureDynamicModel,
                 macroConnectList::add,
-                macroConnectorsMap::computeIfAbsent);
+                macroConnectorsMap::computeIfAbsent,
+                contextReporter);
 
         for (BlackBoxModel bbm : getBlackBoxDynamicModelStream().toList()) {
             macroStaticReferences.computeIfAbsent(bbm.getName(), k -> new MacroStaticReference(k, bbm.getVarsMapping()));
@@ -261,8 +261,4 @@ public List<ParametersSet> getDynamicModelsParameters() {
     public String getSimulationParFile() {
         return getNetwork().getId() + ".par";
     }
-
-    public Reporter getReporter() {
-        return reporter;
-    }
 }
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerAutomaton.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerAutomaton.java
@@ -64,7 +64,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) {
             boolean isSkipped = adder.createMacroConnectionsOrSkip(this, load, LoadWithTransformers.class, this::getVarConnectionsWith);
             if (isSkipped) {
                 connection = ConnectionState.NOT_CONNECTED;
-                DynawaltzReports.reportEmptyTapChanger(context.getReporter(), getDynamicModelId());
+                DynawaltzReports.reportEmptyTapChanger(adder.getReporter(), getDynamicModelId());
             } else {
                 connection = ConnectionState.CONNECTED;
             }

diff --git a/...tz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java b/...tz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
@@ -103,7 +103,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) {
             }
         } else {
             isConnected = false;
-            DynawaltzReports.reportEmptyTapChangerBlockingAutomaton(context.getReporter(), getDynamicModelId());
+            DynawaltzReports.reportEmptyTapChangerBlockingAutomaton(adder.getReporter(), getDynamicModelId());
         }
     }
 

diff --git a/...tz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionsAdder.java b/...tz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionsAdder.java
@@ -7,6 +7,7 @@
  */
 package com.powsybl.dynawaltz.models.macroconnections;
 
+import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.dynawaltz.models.BlackBoxModel;
 import com.powsybl.dynawaltz.models.Model;
 import com.powsybl.dynawaltz.models.Side;
@@ -22,7 +23,10 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.*;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -41,17 +45,19 @@ public interface PureDynamicModelGetter {
         <T extends Model> T getPureDynamicModel(String dynamicId, Class<T> connectableClass, boolean throwException);
     }
 
+    private final Reporter reporter;
     private final DynamicModelGetter dynamicModelGetter;
     private final PureDynamicModelGetter pureDynamicModelGetter;
     private Consumer<MacroConnect> macroConnectAdder;
     private BiConsumer<String, Function<String, MacroConnector>> macroConnectorAdder;
 
-    public MacroConnectionsAdder(DynamicModelGetter dynamicModelGetter, PureDynamicModelGetter pureDynamicModelGetter,
-                                 Consumer<MacroConnect> macroConnectAdder, BiConsumer<String, Function<String, MacroConnector>> macroConnectorAdder) {
+    public MacroConnectionsAdder(DynamicModelGetter dynamicModelGetter, PureDynamicModelGetter pureDynamicModelGetter, Consumer<MacroConnect> macroConnectAdder,
+                                 BiConsumer<String, Function<String, MacroConnector>> macroConnectorAdder, Reporter reporter) {
         this.dynamicModelGetter = dynamicModelGetter;
         this.pureDynamicModelGetter = pureDynamicModelGetter;
         this.macroConnectAdder = macroConnectAdder;
         this.macroConnectorAdder = macroConnectorAdder;
+        this.reporter = reporter;
     }
 
     /**
@@ -224,4 +230,8 @@ public void setMacroConnectAdder(Consumer<MacroConnect> macroConnectAdder) {
     public void setMacroConnectorAdder(BiConsumer<String, Function<String, MacroConnector>> macroConnectorAdder) {
         this.macroConnectorAdder = macroConnectorAdder;
     }
+
+    public Reporter getReporter() {
+        return reporter;
+    }
 }