Rename getVarConnectionsWithX(X x) into getVarConnectionsWith(X x) (#226

) Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Jun 9, 2023 · 6b384d5 · 6b384d5
1 parent 36496c8
commit 6b384d5
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 44 deletions.
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
@@ -48,10 +48,10 @@ public String getLib() {
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(load, LoadWithTransformers.class, this::getVarConnectionsWithLoadWithTransformers, context);
+        createMacroConnections(load, LoadWithTransformers.class, this::getVarConnectionsWith, context);
     }
 
-    private List<VarConnection> getVarConnectionsWithLoadWithTransformers(LoadWithTransformers connected) {
+    private List<VarConnection> getVarConnectionsWith(LoadWithTransformers connected) {
         return connected.getTapChangerVarConnections(side);
     }
 

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
@@ -70,24 +70,24 @@ public String getLib() {
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
         for (TwoWindingsTransformer transformer : transformers) {
-            createMacroConnections(transformer, TapChangerModel.class, this::getVarConnectionsWithTapChanger, context);
+            createMacroConnections(transformer, TapChangerModel.class, this::getVarConnectionsWith, context);
         }
         for (Load load : loadsWithTransformer) {
-            createMacroConnections(load, TapChangerModel.class, this::getVarConnectionsWithTapChanger, context);
+            createMacroConnections(load, TapChangerModel.class, this::getVarConnectionsWith, context);
         }
         for (String id : tapChangerAutomatonIds) {
-            createPureDynamicMacroConnections(id, TapChangerModel.class, this::getVarConnectionsWithTapChanger, context);
+            createPureDynamicMacroConnections(id, TapChangerModel.class, this::getVarConnectionsWith, context);
         }
         for (Bus bus : uMeasurements) {
-            createMacroConnections(bus.getId(), BusModel.class, this::getVarConnectionsWithBus, context);
+            createMacroConnections(bus.getId(), BusModel.class, this::getVarConnectionsWith, context);
         }
     }
 
-    private List<VarConnection> getVarConnectionsWithTapChanger(TapChangerModel connected) {
+    private List<VarConnection> getVarConnectionsWith(TapChangerModel connected) {
         return connected.getTapChangerBlockerVarConnections();
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected) {
         return connected.getUImpinVarName()
                 .map(uImpinVarName -> List.of(new VarConnection("tapChangerBlocking_UMonitored", uImpinVarName)))
                 .orElse(Collections.emptyList());

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/UnderVoltageAutomaton.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/UnderVoltageAutomaton.java
@@ -36,10 +36,10 @@ public String getLib() {
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(generator, GeneratorModel.class, this::getVarConnectionsWithGenerator, context);
+        createMacroConnections(generator, GeneratorModel.class, this::getVarConnectionsWith, context);
     }
 
-    protected List<VarConnection> getVarConnectionsWithGenerator(GeneratorModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(GeneratorModel connected) {
         return Arrays.asList(
                 new VarConnection("underVoltageAutomaton_UMonitoredPu", connected.getUPuVarName()),
                 new VarConnection("underVoltageAutomaton_switchOffSignal", connected.getSwitchOffSignalAutomatonVarName())

diff --git a/.../com/powsybl/dynawaltz/models/automatons/phaseshifters/AbstractPhaseShifterAutomaton.java b/.../com/powsybl/dynawaltz/models/automatons/phaseshifters/AbstractPhaseShifterAutomaton.java
@@ -30,8 +30,8 @@ protected AbstractPhaseShifterAutomaton(String dynamicModelId, TwoWindingsTransf
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(transformer, TransformerModel.class, this::getVarConnectionsWithTransformer, context);
+        createMacroConnections(transformer, TransformerModel.class, this::getVarConnectionsWith, context);
     }
 
-    protected abstract List<VarConnection> getVarConnectionsWithTransformer(TransformerModel connected);
+    protected abstract List<VarConnection> getVarConnectionsWith(TransformerModel connected);
 }
diff --git a/...in/java/com/powsybl/dynawaltz/models/automatons/phaseshifters/PhaseShifterIAutomaton.java b/...in/java/com/powsybl/dynawaltz/models/automatons/phaseshifters/PhaseShifterIAutomaton.java
@@ -28,7 +28,7 @@ public String getLib() {
         return "PhaseShifterI";
     }
 
-    protected List<VarConnection> getVarConnectionsWithTransformer(TransformerModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(TransformerModel connected) {
         return Arrays.asList(
                 new VarConnection("phaseShifter_tap", connected.getStepVarName()),
                 new VarConnection("phaseShifter_iMonitored", connected.getIMonitoredVarName()),

diff --git a/...in/java/com/powsybl/dynawaltz/models/automatons/phaseshifters/PhaseShifterPAutomaton.java b/...in/java/com/powsybl/dynawaltz/models/automatons/phaseshifters/PhaseShifterPAutomaton.java
@@ -28,7 +28,7 @@ public String getLib() {
         return "PhaseShifterP";
     }
 
-    protected List<VarConnection> getVarConnectionsWithTransformer(TransformerModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(TransformerModel connected) {
         return Arrays.asList(
                 new VarConnection("phaseShifter_tap", connected.getStepVarName()),
                 new VarConnection("phaseShifter_PMonitored", connected.getPMonitoredVarName()),

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariation.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariation.java
@@ -59,19 +59,19 @@ public String getName() {
         return EventActivePowerVariation.class.getSimpleName();
     }
 
-    private List<VarConnection> getVarConnectionsWithDefaultControllableEquipment(ControllableEquipment connected) {
+    private List<VarConnection> getVarConnectionsWithDefault(ControllableEquipment connected) {
         return List.of(new VarConnection("event_state1", connected.getDeltaPVarName()));
     }
 
-    private List<VarConnection> getVarConnectionsWithControllableEquipment(ControllableEquipment connected) {
+    private List<VarConnection> getVarConnectionsWith(ControllableEquipment connected) {
         return List.of(new VarConnection("step_step_value", connected.getDeltaPVarName()));
     }
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
         createMacroConnections(getEquipment(),
                 ControllableEquipment.class,
-                context.isWithoutBlackBoxDynamicModel(getEquipment()) ? this::getVarConnectionsWithDefaultControllableEquipment : this::getVarConnectionsWithControllableEquipment,
+                context.isWithoutBlackBoxDynamicModel(getEquipment()) ? this::getVarConnectionsWithDefault : this::getVarConnectionsWith,
                 context);
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventInjectionDisconnection.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventInjectionDisconnection.java
@@ -54,12 +54,12 @@ public EventInjectionDisconnection(ShuntCompensator equipment, double startTime)
         this(equipment, startTime, true);
     }
 
-    private List<VarConnection> getVarConnectionsWithInjectionModel(InjectionModel connected) {
+    private List<VarConnection> getVarConnectionsWith(InjectionModel connected) {
         return List.of(new VarConnection(DISCONNECTION_VAR_CONNECT, connected.getSwitchOffSignalEventVarName()));
     }
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(getEquipment(), InjectionModel.class, this::getVarConnectionsWithInjectionModel, context);
+        createMacroConnections(getEquipment(), InjectionModel.class, this::getVarConnectionsWith, context);
     }
 }
diff --git a/...waltz/src/main/java/com/powsybl/dynawaltz/models/events/EventQuadripoleDisconnection.java b/...waltz/src/main/java/com/powsybl/dynawaltz/models/events/EventQuadripoleDisconnection.java
@@ -42,13 +42,13 @@ public String getLib() {
         return "EventQuadripoleDisconnection";
     }
 
-    private List<VarConnection> getVarConnectionsWithQuadripoleEquipment(QuadripoleModel connected) {
+    private List<VarConnection> getVarConnectionsWith(QuadripoleModel connected) {
         return List.of(new VarConnection("event_state1_value", connected.getStateValueVarName()));
     }
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(getEquipment(), QuadripoleModel.class, this::getVarConnectionsWithQuadripoleEquipment, context);
+        createMacroConnections(getEquipment(), QuadripoleModel.class, this::getVarConnectionsWith, context);
     }
 
     @Override

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEvent.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEvent.java
@@ -45,10 +45,10 @@ public String getLib() {
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(getEquipment(), BusModel.class, this::getVarConnectionsWithBus, context);
+        createMacroConnections(getEquipment(), BusModel.class, this::getVarConnectionsWith, context);
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected) {
         return List.of(new VarConnection("fault_terminal", connected.getTerminalVarName()));
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
@@ -72,11 +72,11 @@ public void writeParameters(XMLStreamWriter writer, DynaWaltzContext context) th
         writer.writeEndElement();
     }
 
-    private List<VarConnection> getVarConnectionsWithSynchronizedGenerator(SynchronizedGeneratorModel connected) {
+    private List<VarConnection> getVarConnectionsWith(SynchronizedGeneratorModel connected) {
         return connected.getOmegaRefVarConnections();
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected) {
         return connected.getNumCCVarName()
                 .map(numCCVarName -> List.of(new VarConnection("numcc_node_@INDEX@", numCCVarName)))
                 .orElse(Collections.emptyList());
@@ -86,8 +86,8 @@ private List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
     public void createMacroConnections(DynaWaltzContext context) throws PowsyblException {
         int index = 0;
         for (SynchronizedGeneratorModel gen : synchronizedGenerators) {
-            createMacroConnections(gen, getVarConnectionsWithSynchronizedGenerator(gen), context, MacroConnectAttribute.ofIndex1(index));
-            createMacroConnections(gen.getConnectableBusId(), BusModel.class, this::getVarConnectionsWithBus, context, MacroConnectAttribute.ofIndex1(index));
+            createMacroConnections(gen, getVarConnectionsWith(gen), context, MacroConnectAttribute.ofIndex1(index));
+            createMacroConnections(gen.getConnectableBusId(), BusModel.class, this::getVarConnectionsWith, context, MacroConnectAttribute.ofIndex1(index));
             index++;
         }
     }

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/SetPoint.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/SetPoint.java
@@ -44,14 +44,14 @@ public void writeParameters(XMLStreamWriter writer, DynaWaltzContext context) th
         writer.writeEndElement();
     }
 
-    private List<VarConnection> getVarConnectionsWithSynchronizedGenerator(SynchronizedGeneratorModel connected) {
+    private List<VarConnection> getVarConnectionsWith(SynchronizedGeneratorModel connected) {
         return connected.getSetPointVarConnections();
     }
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) throws PowsyblException {
         for (SynchronizedGeneratorModel gen : synchronizedGenerators) {
-            createMacroConnections(gen, getVarConnectionsWithSynchronizedGenerator(gen), context);
+            createMacroConnections(gen, getVarConnectionsWith(gen), context);
         }
     }
 }
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorModel.java
@@ -44,10 +44,10 @@ public List<VarMapping> getVarsMapping() {
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(BusUtils.getConnectableBusStaticId(equipment), BusModel.class, this::getVarConnectionsWithBus, context);
+        createMacroConnections(BusUtils.getConnectableBusStaticId(equipment), BusModel.class, this::getVarConnectionsWith, context);
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected) {
         List<VarConnection> varConnections = new ArrayList<>(2);
         varConnections.add(new VarConnection(getTerminalVarName(), connected.getTerminalVarName()));
         connected.getSwitchOffSignalVarName()

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java
@@ -32,7 +32,7 @@ public String getLib() {
         return "Line";
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected, Side side) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected, Side side) {
         return List.of(new VarConnection(getTerminalVarName(side), connected.getTerminalVarName()));
     }
 
@@ -44,7 +44,7 @@ private String getTerminalVarName(Side side) {
     public void createMacroConnections(DynaWaltzContext context) {
         equipment.getTerminals().forEach(t -> {
             String busStaticId = BusUtils.getConnectableBusStaticId(t);
-            createMacroConnections(busStaticId, BusModel.class, this::getVarConnectionsWithBus, context, SideConverter.convert(equipment.getSide(t)));
+            createMacroConnections(busStaticId, BusModel.class, this::getVarConnectionsWith, context, SideConverter.convert(equipment.getSide(t)));
         });
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java
@@ -34,10 +34,10 @@ protected String getTerminalVarName() {
 
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
-        createMacroConnections(BusUtils.getConnectableBusStaticId(equipment), BusModel.class, this::getVarConnectionsWithBus, context);
+        createMacroConnections(BusUtils.getConnectableBusStaticId(equipment), BusModel.class, this::getVarConnectionsWith, context);
     }
 
-    abstract List<VarConnection> getVarConnectionsWithBus(BusModel connected);
+    abstract List<VarConnection> getVarConnectionsWith(BusModel connected);
 
     @Override
     public String getSwitchOffSignalEventVarName() {

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadAlphaBeta.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadAlphaBeta.java
@@ -43,7 +43,7 @@ public List<VarMapping> getVarsMapping() {
     }
 
     @Override
-    protected List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(BusModel connected) {
         List<VarConnection> varConnections = new ArrayList<>(2);
         varConnections.add(new VarConnection(getTerminalVarName(), connected.getTerminalVarName()));
         connected.getSwitchOffSignalVarName()

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java
@@ -45,7 +45,7 @@ public List<VarMapping> getVarsMapping() {
     }
 
     @Override
-    protected List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(BusModel connected) {
         List<VarConnection> varConnections = new ArrayList<>(3);
         varConnections.add(new VarConnection(getTerminalVarName(), connected.getTerminalVarName()));
         connected.getSwitchOffSignalVarName()

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java
@@ -33,8 +33,8 @@ public String getLib() {
     }
 
     @Override
-    protected List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
-        List<VarConnection> varConnections = super.getVarConnectionsWithBus(connected);
+    protected List<VarConnection> getVarConnectionsWith(BusModel connected) {
+        List<VarConnection> varConnections = super.getVarConnectionsWith(connected);
         connected.getSwitchOffSignalVarName()
                 .map(switchOff -> new VarConnection("tapChanger_switchOffSignal1", switchOff))
                 .ifPresent(varConnections::add);

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java
@@ -41,7 +41,7 @@ public String getLib() {
     }
 
     @Override
-    protected List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
+    protected List<VarConnection> getVarConnectionsWith(BusModel connected) {
         List<VarConnection> varConnections = new ArrayList<>(3);
         varConnections.add(new VarConnection(getTransformerVar(HIGH_VOLTAGE, "terminal"), connected.getTerminalVarName()));
         connected.getSwitchOffSignalVarName()

diff --git a/...altz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java b/...altz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java
@@ -34,8 +34,8 @@ public String getLib() {
     }
 
     @Override
-    protected List<VarConnection> getVarConnectionsWithBus(BusModel connected) {
-        List<VarConnection> varConnections = super.getVarConnectionsWithBus(connected);
+    protected List<VarConnection> getVarConnectionsWith(BusModel connected) {
+        List<VarConnection> varConnections = super.getVarConnectionsWith(connected);
         connected.getSwitchOffSignalVarName()
                 .ifPresent(switchOff -> {
                     varConnections.add(new VarConnection(getSwitchOffSignal(HIGH_VOLTAGE), switchOff));

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svcs/StaticVarCompensatorModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svcs/StaticVarCompensatorModel.java
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com/)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
 package com.powsybl.dynawaltz.models.svcs;
 
 import com.powsybl.dynawaltz.models.InjectionModel;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java
@@ -38,7 +38,7 @@ public String getLib() {
         return transformerLib;
     }
 
-    private List<VarConnection> getVarConnectionsWithBus(BusModel connected, Side side) {
+    private List<VarConnection> getVarConnectionsWith(BusModel connected, Side side) {
         return List.of(new VarConnection(getTerminalVarName(side), connected.getTerminalVarName()));
     }
 
@@ -50,7 +50,7 @@ private String getTerminalVarName(Side side) {
     public void createMacroConnections(DynaWaltzContext context) {
         equipment.getTerminals().forEach(t -> {
             String busStaticId = BusUtils.getConnectableBusStaticId(t);
-            createMacroConnections(busStaticId, BusModel.class, this::getVarConnectionsWithBus, context, SideConverter.convert(equipment.getSide(t)));
+            createMacroConnections(busStaticId, BusModel.class, this::getVarConnectionsWith, context, SideConverter.convert(equipment.getSide(t)));
         });
     }