From 120dee38b0f14bb00878fa530a5765a62d06e308 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 20 Jan 2022 17:08:36 +0100 Subject: [PATCH 1/3] fix code smells --- .../edu/ie3/datamodel/utils/ContainerUtils.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java b/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java index ec7401d5f..0e6668b9e 100644 --- a/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java @@ -222,29 +222,24 @@ private static void addImpedanceGraphEdge( NodeInput nodeA = connectorInput.getNodeA(); NodeInput nodeB = connectorInput.getNodeB(); /* Add an edge if it is not a switch or the switch is closed */ - if (!(connectorInput instanceof SwitchInput) || ((SwitchInput) connectorInput).isClosed()) + if (!(connectorInput instanceof SwitchInput sw) || ((SwitchInput) connectorInput).isClosed()) graph.addEdge(nodeA, nodeB); - if (connectorInput instanceof LineInput) { - LineInput line = (LineInput) connectorInput; + if (connectorInput instanceof LineInput line) { graph.setEdgeWeightQuantity( graph.getEdge(nodeA, nodeB), calcImpedance(line.getType().getR(), line.getType().getX(), line.getLength())); } - if (connectorInput instanceof SwitchInput) { - SwitchInput sw = (SwitchInput) connectorInput; + if (connectorInput instanceof SwitchInput sw && sw.isClosed()) { // assumption: closed switch has a resistance of 1 OHM - if (sw.isClosed()) graph.setEdgeWeightQuantity(graph.getEdge(nodeA, nodeB), Quantities.getQuantity(1d, OHM)); } - if (connectorInput instanceof Transformer2WInput) { - Transformer2WInput trafo2w = (Transformer2WInput) connectorInput; + if (connectorInput instanceof Transformer2WInput trafo2w) { graph.setEdgeWeightQuantity( graph.getEdge(nodeA, nodeB), calcImpedance(trafo2w.getType().getrSc(), trafo2w.getType().getxSc())); } - if (connectorInput instanceof Transformer3WInput) { - Transformer3WInput trafo3w = (Transformer3WInput) connectorInput; + if (connectorInput instanceof Transformer3WInput trafo3w) { graph.addEdge(nodeA, trafo3w.getNodeC()); graph.setEdgeWeightQuantity( From 6d4b7f99178cd97af0cc00c4f1d413ab7df3d61b Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 20 Jan 2022 17:14:07 +0100 Subject: [PATCH 2/3] more code smells --- .../java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java index f01bbb54a..ada822c8a 100644 --- a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java +++ b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java @@ -52,7 +52,7 @@ public void setEdgeWeightQuantity( * ComparableQuantity)} instead, as it provides means for proper unit handling */ @Override - @Deprecated + @Deprecated(since=("Deprecated since 2.1.0. See Javadocs for more information.")) public void setEdgeWeight(ImpedanceWeightedEdge edge, double impedanceInOhm) { super.setEdgeWeight(edge, impedanceInOhm); } From 68cc7ab4c39872c5866697e84a32e37aa418c894 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 20 Jan 2022 17:14:59 +0100 Subject: [PATCH 3/3] fmt --- .../java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java | 2 +- src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java index ada822c8a..b5e437baa 100644 --- a/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java +++ b/src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java @@ -52,7 +52,7 @@ public void setEdgeWeightQuantity( * ComparableQuantity)} instead, as it provides means for proper unit handling */ @Override - @Deprecated(since=("Deprecated since 2.1.0. See Javadocs for more information.")) + @Deprecated(since = ("Deprecated since 2.1.0. See Javadocs for more information.")) public void setEdgeWeight(ImpedanceWeightedEdge edge, double impedanceInOhm) { super.setEdgeWeight(edge, impedanceInOhm); } diff --git a/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java b/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java index 0e6668b9e..e9255bb9f 100644 --- a/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java +++ b/src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java @@ -232,7 +232,7 @@ private static void addImpedanceGraphEdge( } if (connectorInput instanceof SwitchInput sw && sw.isClosed()) { // assumption: closed switch has a resistance of 1 OHM - graph.setEdgeWeightQuantity(graph.getEdge(nodeA, nodeB), Quantities.getQuantity(1d, OHM)); + graph.setEdgeWeightQuantity(graph.getEdge(nodeA, nodeB), Quantities.getQuantity(1d, OHM)); } if (connectorInput instanceof Transformer2WInput trafo2w) { graph.setEdgeWeightQuantity(