Skip to content

To/#508 fix code smells #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 20, 2022
Merged

To/#508 fix code smells #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
120dee3
fix code smells
t-ober Jan 20, 2022
6d4b7f9
more code smells
t-ober Jan 20, 2022
68cc7ab
fmt
t-ober Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/graph/ImpedanceWeightedGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Copy link
Contributor

@sonatype-lift sonatype-lift bot Jan 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UnnecessaryParentheses: These grouping parentheses are unnecessary; it is unlikely the code will be misinterpreted without them (details)
(at-me in a reply with help or ignore)

public void setEdgeWeight(ImpedanceWeightedEdge edge, double impedanceInOhm) {
super.setEdgeWeight(edge, impedanceInOhm);
}
Expand Down
17 changes: 6 additions & 11 deletions src/main/java/edu/ie3/datamodel/utils/ContainerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
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(
Expand Down