commit | 7ab58cc1d403611d1869847260953d0302154acc | [log] [tgz] |
---|---|---|
author | aherbert <aherbert@apache.org> | Mon Jun 29 15:52:45 2020 +0100 |
committer | aherbert <aherbert@apache.org> | Mon Jun 29 16:24:21 2020 +0100 |
tree | 3ab097b722bc0ac5f2c5f11ab4f83aff70b40bd8 | |
parent | 7983d34b7b3fab4dbaf21c04dad427555b498539 [diff] |
Fix SonarCloud: Remove nested ternary
diff --git a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/FactorialDouble.java b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/FactorialDouble.java index 32cd5d1..f3c34dc 100644 --- a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/FactorialDouble.java +++ b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/FactorialDouble.java
@@ -54,9 +54,14 @@ } final int beginCopy = 2; - final int endCopy = cache == null || cache.length <= beginCopy ? - beginCopy : cache.length <= numValues ? - cache.length : numValues; + int endCopy; + if (cache == null || cache.length <= beginCopy) { + endCopy = beginCopy; + } else if (cache.length <= numValues) { + endCopy = cache.length; + } else { + endCopy = numValues; + } // Copy available values. for (int i = beginCopy; i < endCopy; i++) {
diff --git a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/LogFactorial.java b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/LogFactorial.java index 00b6813..76af8a2 100644 --- a/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/LogFactorial.java +++ b/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics/LogFactorial.java
@@ -52,9 +52,14 @@ logFactorials = new double[numValues]; final int beginCopy = 2; - final int endCopy = cache == null || cache.length <= beginCopy ? - beginCopy : cache.length <= numValues ? - cache.length : numValues; + int endCopy; + if (cache == null || cache.length <= beginCopy) { + endCopy = beginCopy; + } else if (cache.length <= numValues) { + endCopy = cache.length; + } else { + endCopy = numValues; + } // Copy available values. for (int i = beginCopy; i < endCopy; i++) {