From 47f857390c0c883a439a26c608867fd18730ed6c Mon Sep 17 00:00:00 2001 From: Nicolas Rol Date: Tue, 9 Jan 2024 16:38:49 +0100 Subject: [PATCH] fix typo in class name AbstractBinaryNodeCalc Signed-off-by: Nicolas Rol --- .../java/com/powsybl/timeseries/ast/AbstractBinaryMinMax.java | 2 +- ...AbstractBinaryNodeCal.java => AbstractBinaryNodeCalc.java} | 4 ++-- .../main/java/com/powsybl/timeseries/ast/BinaryOperation.java | 2 +- .../com/powsybl/timeseries/ast/DefaultNodeCalcVisitor.java | 2 +- .../main/java/com/powsybl/timeseries/ast/NodeCalcCloner.java | 2 +- .../java/com/powsybl/timeseries/ast/NodeCalcEvaluator.java | 2 +- .../java/com/powsybl/timeseries/ast/NodeCalcModifier.java | 4 ++-- .../main/java/com/powsybl/timeseries/ast/NodeCalcPrinter.java | 2 +- .../main/java/com/powsybl/timeseries/ast/NodeCalcVisitor.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/{AbstractBinaryNodeCal.java => AbstractBinaryNodeCalc.java} (95%) diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryMinMax.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryMinMax.java index bd6493b2e64..5bc0c1da11c 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryMinMax.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryMinMax.java @@ -17,7 +17,7 @@ /** * @author Nicolas Rol {@literal } */ -public abstract class AbstractBinaryMinMax extends AbstractBinaryNodeCal { +public abstract class AbstractBinaryMinMax extends AbstractBinaryNodeCalc { protected AbstractBinaryMinMax(NodeCalc left, NodeCalc right) { super(left, right); diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCal.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCalc.java similarity index 95% rename from time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCal.java rename to time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCalc.java index caa02436c4c..c35d1a9905c 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCal.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/AbstractBinaryNodeCalc.java @@ -15,12 +15,12 @@ /** * @author Nicolas Rol {@literal } */ -public abstract class AbstractBinaryNodeCal implements NodeCalc { +public abstract class AbstractBinaryNodeCalc implements NodeCalc { protected NodeCalc left; protected NodeCalc right; - protected AbstractBinaryNodeCal(NodeCalc left, NodeCalc right) { + protected AbstractBinaryNodeCalc(NodeCalc left, NodeCalc right) { this.left = Objects.requireNonNull(left); this.right = Objects.requireNonNull(right); } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/BinaryOperation.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/BinaryOperation.java index 1c9f0099f13..d11b671018f 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/BinaryOperation.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/BinaryOperation.java @@ -17,7 +17,7 @@ /** * @author Geoffroy Jamgotchian {@literal } */ -public class BinaryOperation extends AbstractBinaryNodeCal { +public class BinaryOperation extends AbstractBinaryNodeCalc { static final String NAME = "binaryOp"; diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/DefaultNodeCalcVisitor.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/DefaultNodeCalcVisitor.java index 9b0820c156e..c4df49f033a 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/DefaultNodeCalcVisitor.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/DefaultNodeCalcVisitor.java @@ -98,7 +98,7 @@ public R visit(BinaryMaxCalc nodeCalc, A arg, R left, R right) { } @Override - public Pair iterate(AbstractBinaryNodeCal nodeCalc, A arg) { + public Pair iterate(AbstractBinaryNodeCalc nodeCalc, A arg) { return Pair.of(nodeCalc.getLeft(), nodeCalc.getRight()); } } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcCloner.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcCloner.java index 0cc852453a9..988533ecb56 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcCloner.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcCloner.java @@ -98,7 +98,7 @@ public NodeCalc visit(BinaryMaxCalc nodeCalc, A arg, NodeCalc left, NodeCalc rig } @Override - public Pair iterate(AbstractBinaryNodeCal nodeCalc, A arg) { + public Pair iterate(AbstractBinaryNodeCalc nodeCalc, A arg) { return Pair.of(nodeCalc.getLeft(), nodeCalc.getRight()); } } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcEvaluator.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcEvaluator.java index f0b9026fd86..28c1594ebf1 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcEvaluator.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcEvaluator.java @@ -131,7 +131,7 @@ public Double visit(BinaryMaxCalc nodeCalc, DoubleMultiPoint multiPoint, Double } @Override - public Pair iterate(AbstractBinaryNodeCal nodeCalc, DoubleMultiPoint multiPoint) { + public Pair iterate(AbstractBinaryNodeCalc nodeCalc, DoubleMultiPoint multiPoint) { return Pair.of(nodeCalc.getLeft(), nodeCalc.getRight()); } } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcModifier.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcModifier.java index 382885f0e20..8cb4aa71a5e 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcModifier.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcModifier.java @@ -109,7 +109,7 @@ public NodeCalc visit(BinaryMaxCalc nodeCalc, A arg, NodeCalc left, NodeCalc rig return visitBinaryNodeCalc(nodeCalc, left, right); } - private NodeCalc visitBinaryNodeCalc(AbstractBinaryNodeCal nodeCalc, NodeCalc left, NodeCalc right) { + private NodeCalc visitBinaryNodeCalc(AbstractBinaryNodeCalc nodeCalc, NodeCalc left, NodeCalc right) { if (left != null) { nodeCalc.setLeft(left); } @@ -120,7 +120,7 @@ private NodeCalc visitBinaryNodeCalc(AbstractBinaryNodeCal nodeCalc, NodeCalc le } @Override - public Pair iterate(AbstractBinaryNodeCal nodeCalc, A arg) { + public Pair iterate(AbstractBinaryNodeCalc nodeCalc, A arg) { return Pair.of(nodeCalc.getLeft(), nodeCalc.getRight()); } } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcPrinter.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcPrinter.java index 90ad8fd20c8..23fc8703e19 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcPrinter.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcPrinter.java @@ -103,7 +103,7 @@ public NodeCalc iterate(MaxNodeCalc nodeCalc, Void arg) { } @Override - public Pair iterate(AbstractBinaryNodeCal nodeCalc, Void arg) { + public Pair iterate(AbstractBinaryNodeCalc nodeCalc, Void arg) { return Pair.of(nodeCalc.getLeft(), nodeCalc.getRight()); } } diff --git a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcVisitor.java b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcVisitor.java index 7d6f6118609..f9dc4728d40 100644 --- a/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcVisitor.java +++ b/time-series/time-series-api/src/main/java/com/powsybl/timeseries/ast/NodeCalcVisitor.java @@ -55,5 +55,5 @@ public interface NodeCalcVisitor { R visit(BinaryMaxCalc nodeCalc, A arg, R left, R right); - Pair iterate(AbstractBinaryNodeCal nodeCalc, A arg); + Pair iterate(AbstractBinaryNodeCalc nodeCalc, A arg); }