You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2019/09/29 14:07:20 UTC
[commons-numbers] branch master updated (85d79ed -> c3c7c1d)
This is an automated email from the ASF dual-hosted git repository.
erans pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git.
from 85d79ed Named constant.
new eefcd5f Exceptions must be "Serializable".
new 3b0c988 Useless use of "return" and braces.
new f0358f4 Make default constructor "private".
new 80ddc95 Useless assignment.
new dc0de56 Diamond operator (generics).
new c3c7c1d Simplify.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../combinatorics/CombinatoricsException.java | 19 +++++-----------
.../apache/commons/numbers/complex/Complex.java | 26 ++++++++--------------
.../commons/numbers/core/ArithmeticUtils.java | 11 +--------
.../numbers/fraction/ContinuedFraction.java | 2 +-
.../numbers/fraction/FractionException.java | 14 +-----------
.../commons/numbers/gamma/GammaException.java | 11 +--------
.../commons/numbers/gamma/RegularizedGamma.java | 6 +++++
.../apache/commons/numbers/primes/SmallPrimes.java | 2 +-
.../commons/numbers/quaternion/Quaternion.java | 21 +++++++++--------
.../numbers/rootfinder/SolverException.java | 12 +---------
10 files changed, 36 insertions(+), 88 deletions(-)
[commons-numbers] 03/06: Make default constructor "private".
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit f0358f4c8a48b7fc21c51686d957a23f35c50e7a
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 15:53:40 2019 +0200
Make default constructor "private".
Reported by "SonarQube".
---
.../java/org/apache/commons/numbers/gamma/RegularizedGamma.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/RegularizedGamma.java b/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/RegularizedGamma.java
index 8451196..e3eb69a 100644
--- a/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/RegularizedGamma.java
+++ b/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/RegularizedGamma.java
@@ -41,6 +41,9 @@ public class RegularizedGamma {
* Class is immutable.
*/
public static class P {
+ /** Prevent instantiation. */
+ private P() {}
+
/**
* Computes the regularized gamma function \( P(a, x) \).
*
@@ -125,6 +128,9 @@ public class RegularizedGamma {
* Class is immutable.
*/
public static class Q {
+ /** Prevent instantiation. */
+ private Q() {}
+
/**
* Computes the regularized gamma function \( Q(a, x) = 1 - P(a, x) \).
*
[commons-numbers] 05/06: Diamond operator (generics).
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit dc0de568f22370739cf8e45ad17fa7d3fac3d034
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 15:59:52 2019 +0200
Diamond operator (generics).
Reported by "SonarQube".
---
.../src/main/java/org/apache/commons/numbers/complex/Complex.java | 2 +-
.../src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
index 28db64e..b0e71ef 100644
--- a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
+++ b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
@@ -1313,7 +1313,7 @@ public final class Complex implements Serializable {
throw new IllegalArgumentException("cannot compute zeroth root");
}
- final List<Complex> result = new ArrayList<Complex>();
+ final List<Complex> result = new ArrayList<>();
// nth root of abs -- faster / more accurate to use a solver here?
final double nthRootOfAbs = Math.pow(abs(), 1d / n);
diff --git a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java
index 77676a6..badc11c 100644
--- a/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java
+++ b/commons-numbers-primes/src/main/java/org/apache/commons/numbers/primes/SmallPrimes.java
@@ -223,7 +223,7 @@ class SmallPrimes {
* @return the list of prime factors of {@code n}.
*/
static List<Integer> trialDivision(int n) {
- final List<Integer> factors = new ArrayList<Integer>(32);
+ final List<Integer> factors = new ArrayList<>(32);
n = smallTrialDivision(n, factors);
if (1 == n) {
return factors;
[commons-numbers] 06/06: Simplify.
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit c3c7c1d3a987b0c26bbea38b3970fbf50758b01f
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 16:06:22 2019 +0200
Simplify.
Reported by "SonarQube".
---
.../apache/commons/numbers/complex/Complex.java | 24 ++++++++--------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
index b0e71ef..9c55c53 100644
--- a/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
+++ b/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex/Complex.java
@@ -188,32 +188,24 @@ public final class Complex implements Serializable {
/**
* Returns true if either real or imaginary component of the Complex
- * is NaN
+ * is NaN.
*
- * @return {@code boolean}
+ * @return {@code true} is this instance contains NaN.
*/
public boolean isNaN() {
- if (Double.isNaN(real) ||
- Double.isNaN(imaginary)) {
- return true;
- } else {
- return false;
- }
+ return Double.isNaN(real) ||
+ Double.isNaN(imaginary);
}
/**
* Returns true if either real or imaginary component of the Complex
- * is Infinite
+ * is infinite.
*
- * @return {@code boolean}
+ * @return {@code true} if this instance contains an infinite value.
*/
public boolean isInfinite() {
- if (Double.isInfinite(real) ||
- Double.isInfinite(imaginary)) {
- return true;
- } else {
- return false;
- }
+ return Double.isInfinite(real) ||
+ Double.isInfinite(imaginary);
}
/**
[commons-numbers] 04/06: Useless assignment.
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit 80ddc95073a938faf147f59fac97cd60078014cc
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 15:59:20 2019 +0200
Useless assignment.
Reported by "SonarQube".
---
.../java/org/apache/commons/numbers/fraction/ContinuedFraction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/ContinuedFraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/ContinuedFraction.java
index 121b573..a95a64b 100644
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/ContinuedFraction.java
+++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/ContinuedFraction.java
@@ -129,7 +129,7 @@ public abstract class ContinuedFraction {
int n = 1;
double dPrev = 0.0;
double cPrev = hPrev;
- double hN = hPrev;
+ double hN;
while (n <= maxIterations) {
final double a = getA(n, x);
[commons-numbers] 01/06: Exceptions must be "Serializable".
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit eefcd5f64158e7da2764a63be5b9fd7734146af8
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 15:38:10 2019 +0200
Exceptions must be "Serializable".
Reported by "SonarQube".
---
.../numbers/combinatorics/CombinatoricsException.java | 19 +++++--------------
.../apache/commons/numbers/core/ArithmeticUtils.java | 11 +----------
.../commons/numbers/fraction/FractionException.java | 14 +-------------
.../apache/commons/numbers/gamma/GammaException.java | 11 +----------
.../commons/numbers/rootfinder/SolverException.java | 12 +-----------
5 files changed, 9 insertions(+), 58 deletions(-)
diff --git a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/CombinatoricsException.java b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/CombinatoricsException.java
index 6514293..2543254 100644
--- a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/CombinatoricsException.java
+++ b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/CombinatoricsException.java
@@ -32,24 +32,15 @@ class CombinatoricsException extends IllegalArgumentException {
/** Serializable version identifier. */
private static final long serialVersionUID = 20170515L;
- /** Arguments for formatting the message. */
- protected Object[] formatArguments;
-
/**
* Create an exception where the message is constructed by applying
* the {@code format()} method from {@code java.text.MessageFormat}.
*
- * @param message the exception message with replaceable parameters
- * @param formatArguments the arguments for formatting the message
+ * @param message Exception message with replaceable parameters.
+ * @param formatArguments 1rguments for formatting the message.
*/
- CombinatoricsException(String message, Object... formatArguments) {
- super(message);
- this.formatArguments = formatArguments;
- }
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return MessageFormat.format(super.getMessage(), formatArguments);
+ CombinatoricsException(String message,
+ Object... formatArguments) {
+ super(MessageFormat.format(message, formatArguments));
}
}
diff --git a/commons-numbers-core/src/main/java/org/apache/commons/numbers/core/ArithmeticUtils.java b/commons-numbers-core/src/main/java/org/apache/commons/numbers/core/ArithmeticUtils.java
index b6bbc45..af72311 100644
--- a/commons-numbers-core/src/main/java/org/apache/commons/numbers/core/ArithmeticUtils.java
+++ b/commons-numbers-core/src/main/java/org/apache/commons/numbers/core/ArithmeticUtils.java
@@ -538,8 +538,6 @@ public final class ArithmeticUtils {
private static class NumbersArithmeticException extends ArithmeticException {
/** Serializable version Id. */
private static final long serialVersionUID = 20180130L;
- /** Argument to construct a message. */
- private final Object[] formatArguments;
/**
* Default constructor.
@@ -556,14 +554,7 @@ public final class ArithmeticUtils {
* @param args Arguments.
*/
NumbersArithmeticException(String message, Object ... args) {
- super(message);
- this.formatArguments = args;
- }
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return MessageFormat.format(super.getMessage(), formatArguments);
+ super(MessageFormat.format(message, args));
}
}
}
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionException.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionException.java
index 1831477..4ce0a69 100644
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionException.java
+++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/FractionException.java
@@ -35,9 +35,6 @@ class FractionException extends ArithmeticException {
/** Serializable version identifier. */
private static final long serialVersionUID = 201701191744L;
- /** Arguments for formatting the message. */
- protected Object[] formatArguments;
-
/**
* Create an exception where the message is constructed by applying
* the {@code format()} method from {@code java.text.MessageFormat}.
@@ -46,15 +43,6 @@ class FractionException extends ArithmeticException {
* @param formatArguments the arguments for formatting the message
*/
FractionException(String message, Object... formatArguments) {
- super(message);
- this.formatArguments = formatArguments;
- }
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return MessageFormat.format(super.getMessage(), formatArguments);
+ super(MessageFormat.format(message, formatArguments));
}
-
-
}
diff --git a/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/GammaException.java b/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/GammaException.java
index 7122f2e..13e9276 100644
--- a/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/GammaException.java
+++ b/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma/GammaException.java
@@ -30,9 +30,6 @@ class GammaException extends IllegalArgumentException {
/** Serializable version identifier. */
private static final long serialVersionUID = 20170505L;
- /** Arguments for formatting the message. */
- protected Object[] formatArguments;
-
/**
* Create an exception where the message is constructed by applying
* the {@code format()} method from {@code java.text.MessageFormat}.
@@ -41,12 +38,6 @@ class GammaException extends IllegalArgumentException {
* @param formatArguments the arguments for formatting the message
*/
GammaException(String message, Object... formatArguments) {
- super(message);
- this.formatArguments = formatArguments;
- }
-
- @Override
- public String getMessage() {
- return MessageFormat.format(super.getMessage(), formatArguments);
+ super(MessageFormat.format(message, formatArguments));
}
}
diff --git a/commons-numbers-rootfinder/src/main/java/org/apache/commons/numbers/rootfinder/SolverException.java b/commons-numbers-rootfinder/src/main/java/org/apache/commons/numbers/rootfinder/SolverException.java
index c35f2fe..32412f2 100644
--- a/commons-numbers-rootfinder/src/main/java/org/apache/commons/numbers/rootfinder/SolverException.java
+++ b/commons-numbers-rootfinder/src/main/java/org/apache/commons/numbers/rootfinder/SolverException.java
@@ -32,9 +32,6 @@ class SolverException extends IllegalArgumentException {
/** Serializable version identifier. */
private static final long serialVersionUID = 20190602L;
- /** Arguments for formatting the message. */
- private final Object[] formatArguments;
-
/**
* Create an exception where the message is constructed by applying
* the {@code format()} method from {@code java.text.MessageFormat}.
@@ -43,13 +40,6 @@ class SolverException extends IllegalArgumentException {
* @param formatArguments the arguments for formatting the message
*/
SolverException(String message, Object... formatArguments) {
- super(message);
- this.formatArguments = formatArguments;
- }
-
- /** {@inheritDoc} */
- @Override
- public String getMessage() {
- return MessageFormat.format(super.getMessage(), formatArguments);
+ super(MessageFormat.format(message, formatArguments));
}
}
[commons-numbers] 02/06: Useless use of "return" and braces.
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erans pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit 3b0c9883a737f3057494c785d1271956440b0b62
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Sun Sep 29 15:47:43 2019 +0200
Useless use of "return" and braces.
Reported by "SonarQube".
---
.../commons/numbers/quaternion/Quaternion.java | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java
index 859cf78..08683d2 100644
--- a/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java
+++ b/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion/Quaternion.java
@@ -88,25 +88,24 @@ public final class Quaternion implements Serializable {
/** Default implementations. */
private static final class Default {
/** {@link Quaternion#normSq()}. */
- static final ToDoubleFunction<Quaternion> NORMSQ = q -> {
- return q.w * q.w + q.x * q.x + q.y * q.y + q.z * q.z;
- };
+ static final ToDoubleFunction<Quaternion> NORMSQ = q ->
+ q.w * q.w + q.x * q.x + q.y * q.y + q.z * q.z;
+
/** {@link Quaternion#norm()}. */
- private static final ToDoubleFunction<Quaternion> NORM = q -> {
- return Math.sqrt(NORMSQ.applyAsDouble(q));
- };
+ private static final ToDoubleFunction<Quaternion> NORM = q ->
+ Math.sqrt(NORMSQ.applyAsDouble(q));
+
/** {@link Quaternion#isUnit()}. */
- private static final BiPredicate<Quaternion, Double> IS_UNIT = (q, eps) -> {
- return Precision.equals(NORM.applyAsDouble(q), 1d, eps);
- };
- };
+ private static final BiPredicate<Quaternion, Double> IS_UNIT = (q, eps) ->
+ Precision.equals(NORM.applyAsDouble(q), 1d, eps);
+ }
/** Implementations for normalized quaternions. */
private static final class Normalized {
/** {@link Quaternion#norm()} returns 1. */
static final ToDoubleFunction<Quaternion> NORM = q -> 1;
/** {@link Quaternion#isUnit()} returns 1. */
static final BiPredicate<Quaternion, Double> IS_UNIT = (q, eps) -> true;
- };
+ }
/** {@link Quaternion#normSq()}. */
private final ToDoubleFunction<Quaternion> normSq;