From b71e2ab9366f9edbb26f8f21ba12fe618a3dab26 Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Thu, 5 Aug 2021 19:38:56 +0200 Subject: [PATCH] * Simplify bitwise * Simplify boolean expression * Simplify conditional expression * Redundant 'if' statement --- .../org/apache/commons/math4/legacy/core/MathArrays.java | 8 ++++---- .../org/apache/commons/math4/legacy/core/dfp/Dfp.java | 5 +---- .../apache/commons/math4/legacy/core/dfp/DfpMath.java | 6 +----- .../legacy/analysis/polynomials/PolynomialFunction.java | 5 +---- .../commons/math4/legacy/fitting/SimpleCurveFitter.java | 6 +----- .../commons/math4/legacy/ode/events/EventState.java | 2 +- .../commons/math4/legacy/ode/events/FieldEventState.java | 2 +- .../math4/legacy/optim/linear/SolutionCallback.java | 2 +- .../optim/nonlinear/scalar/noderiv/CMAESOptimizer.java | 2 +- .../org/apache/commons/math4/legacy/stat/Frequency.java | 9 +-------- .../stat/descriptive/moment/VectorialCovariance.java | 5 +---- .../legacy/stat/descriptive/moment/VectorialMean.java | 5 +---- .../legacy/stat/descriptive/rank/PSquarePercentile.java | 4 ++-- .../legacy/stat/inference/KolmogorovSmirnovTest.java | 6 +----- 14 files changed, 18 insertions(+), 49 deletions(-) diff --git a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/MathArrays.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/MathArrays.java index 0c77bf2c14..ba72623574 100644 --- a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/MathArrays.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/MathArrays.java @@ -617,7 +617,7 @@ public static void checkNonNegative(final long[][] in) { */ public static boolean equals(float[] x, float[] y) { if (x == null || y == null) { - return !((x == null) ^ (y == null)); + return (x == null) == (y == null); } if (x.length != y.length) { return false; @@ -643,7 +643,7 @@ public static boolean equals(float[] x, float[] y) { */ public static boolean equalsIncludingNaN(float[] x, float[] y) { if (x == null || y == null) { - return !((x == null) ^ (y == null)); + return (x == null) == (y == null); } if (x.length != y.length) { return false; @@ -668,7 +668,7 @@ public static boolean equalsIncludingNaN(float[] x, float[] y) { */ public static boolean equals(double[] x, double[] y) { if (x == null || y == null) { - return !((x == null) ^ (y == null)); + return (x == null) == (y == null); } if (x.length != y.length) { return false; @@ -694,7 +694,7 @@ public static boolean equals(double[] x, double[] y) { */ public static boolean equalsIncludingNaN(double[] x, double[] y) { if (x == null || y == null) { - return !((x == null) ^ (y == null)); + return (x == null) == (y == null); } if (x.length != y.length) { return false; diff --git a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java index ceffa21ae9..41f15c9115 100644 --- a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/Dfp.java @@ -2351,10 +2351,7 @@ public Dfp nextAfter(final Dfp x) { } // if this is greater than x - boolean up = false; - if (this.lessThan(x)) { - up = true; - } + boolean up = this.lessThan(x); if (compare(this, x) == 0) { return newInstance(x); diff --git a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/DfpMath.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/DfpMath.java index f831603d59..4503fb02f6 100644 --- a/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/DfpMath.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/dfp/DfpMath.java @@ -941,11 +941,7 @@ public static Dfp asin(final Dfp a) { */ public static Dfp acos(Dfp a) { Dfp result; - boolean negative = false; - - if (a.lessThan(a.getZero())) { - negative = true; - } + boolean negative = a.lessThan(a.getZero()); a = Dfp.copySign(a, a.getOne()); // absolute value diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/polynomials/PolynomialFunction.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/polynomials/PolynomialFunction.java index dd382dddb6..d9884c8a30 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/polynomials/PolynomialFunction.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/polynomials/PolynomialFunction.java @@ -371,10 +371,7 @@ public boolean equals(Object obj) { return false; } PolynomialFunction other = (PolynomialFunction) obj; - if (!Arrays.equals(coefficients, other.coefficients)) { - return false; - } - return true; + return Arrays.equals(coefficients, other.coefficients); } /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/SimpleCurveFitter.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/SimpleCurveFitter.java index 671150d3b4..012c913ef0 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/SimpleCurveFitter.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/SimpleCurveFitter.java @@ -186,11 +186,7 @@ public int compare(WeightedObservedPoint p1, if (comp != 0) { return comp; } - comp = Double.compare(p1.getWeight(), p2.getWeight()); - if (comp != 0) { - return comp; - } - return 0; + return Double.compare(p1.getWeight(), p2.getWeight()); } }; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/EventState.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/EventState.java index 832067abdf..eeec951c89 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/EventState.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/EventState.java @@ -365,7 +365,7 @@ public void stepAccepted(final double t, final double[] y) { // force the sign to its value "just after the event" previousEventTime = t; g0Positive = increasing; - nextAction = handler.eventOccurred(t, y, !(increasing ^ forward)); + nextAction = handler.eventOccurred(t, y, increasing == forward); } else { g0Positive = g0 >= 0; nextAction = EventHandler.Action.CONTINUE; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/FieldEventState.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/FieldEventState.java index 3bf39e7a76..e91bacc366 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/FieldEventState.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/events/FieldEventState.java @@ -301,7 +301,7 @@ public void stepAccepted(final FieldODEStateAndDerivative state) { // force the sign to its value "just after the event" previousEventTime = state.getTime(); g0Positive = increasing; - nextAction = handler.eventOccurred(state, !(increasing ^ forward)); + nextAction = handler.eventOccurred(state, increasing == forward); } else { g0Positive = g0.getReal() >= 0; nextAction = Action.CONTINUE; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SolutionCallback.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SolutionCallback.java index 4d2b542cdd..cdccdbd2bf 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SolutionCallback.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/linear/SolutionCallback.java @@ -57,6 +57,6 @@ public PointValuePair getSolution() { * @return {@code true} if the solution is optimal, {@code false} otherwise */ public boolean isSolutionOptimal() { - return tableau != null ? tableau.isOptimal() : false; + return tableau != null && tableau.isOptimal(); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java index 38f7919279..cfee773f9a 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java @@ -896,7 +896,7 @@ public boolean equals(Object other) { @Override public int hashCode() { long bits = Double.doubleToLongBits(value); - return (int) ((1438542 ^ (bits >>> 32) ^ bits) & 0xffffffff); + return (int) ((1438542 ^ (bits >>> 32) ^ bits)); } } /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/Frequency.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/Frequency.java index 5b9f510023..e79858bbe1 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/Frequency.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/Frequency.java @@ -376,14 +376,7 @@ public boolean equals(Object obj) { return false; } Frequency other = (Frequency) obj; - if (freqTable == null) { - if (other.freqTable != null) { - return false; - } - } else if (!freqTable.equals(other.freqTable)) { - return false; - } - return true; + return freqTable.equals(other.freqTable); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialCovariance.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialCovariance.java index dfa0d716b3..c8b5b5aa64 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialCovariance.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialCovariance.java @@ -148,10 +148,7 @@ public boolean equals(Object obj) { if (!Arrays.equals(productsSums, other.productsSums)) { return false; } - if (!Arrays.equals(sums, other.sums)) { - return false; - } - return true; + return Arrays.equals(sums, other.sums); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialMean.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialMean.java index d00b49a781..ade4be441c 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialMean.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/moment/VectorialMean.java @@ -96,10 +96,7 @@ public boolean equals(Object obj) { return false; } VectorialMean other = (VectorialMean) obj; - if (!Arrays.equals(means, other.means)) { - return false; - } - return true; + return Arrays.equals(means, other.means); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java index 603da76146..ed064a9965 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/descriptive/rank/PSquarePercentile.java @@ -908,7 +908,7 @@ private static class FixedCapacityList extends ArrayList implements Serial */ @Override public boolean add(final E e) { - return size() < capacity ? super.add(e) : false; + return size() < capacity && super.add(e); } /** @@ -924,7 +924,7 @@ public boolean addAll(Collection collection) { boolean isCollectionLess = collection != null && collection.size() + size() <= capacity; - return isCollectionLess ? super.addAll(collection) : false; + return isCollectionLess && super.addAll(collection); } } diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/inference/KolmogorovSmirnovTest.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/inference/KolmogorovSmirnovTest.java index 14ccc1a8bc..44cb2c607f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/inference/KolmogorovSmirnovTest.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/inference/KolmogorovSmirnovTest.java @@ -1132,11 +1132,7 @@ private static boolean hasTies(double[] x, double[] y) { throw new InsufficientDataException(); } - if (values.length == x.length + y.length) { - return false; // There are no ties. - } - - return true; + return values.length != x.length + y.length; // There are no ties. } /**