Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/comm…

…ons-math

src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java

@@ -113,7 +113,7 @@ public double doSolve()
 
         // Reduce interval if min and initial bracket the root.
         if (yInitial * yMin < 0) {
-            return laguerre(min, initial, yMin, yInitial);
+            return laguerre(min, initial);
         }
 
         // Return the second endpoint if it is good enough.
@@ -124,7 +124,7 @@ public double doSolve()
 
         // Reduce interval if initial and max bracket the root.
         if (yInitial * yMax < 0) {
-            return laguerre(initial, max, yInitial, yMax);
+            return laguerre(initial, max);
         }
 
         throw new NoBracketingException(min, max, yMin, yMax);
@@ -144,12 +144,9 @@ public double doSolve()
      *
      * @param lo Lower bound of the search interval.
      * @param hi Higher bound of the search interval.
-     * @param fLo Function value at the lower bound of the search interval.
-     * @param fHi Function value at the higher bound of the search interval.
      * @return the point at which the function value is zero.
      */
-    private double laguerre(double lo, double hi,
-                            double fLo, double fHi) {
+    private double laguerre(double lo, double hi) {
         final Complex c[] = ComplexUtils.convertToComplex(getCoefficients());
 
         final Complex initial = new Complex(0.5 * (lo + hi), 0);

src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java

@@ -556,14 +556,16 @@ protected void parseOptimizationData(OptimizationData... optData) {
      * Checks dimensions and values of boundaries and inputSigma if defined.
      */
     private void checkParameters() {
-        final double[] init = getStartPoint();
-        final double[] lB = getLowerBound();
-        final double[] uB = getUpperBound();
-
         if (inputSigma != null) {
+            final double[] init = getStartPoint();
+
             if (inputSigma.length != init.length) {
                 throw new DimensionMismatchException(inputSigma.length, init.length);
             }
+
+            final double[] lB = getLowerBound();
+            final double[] uB = getUpperBound();
+
             for (int i = 0; i < init.length; i++) {
                 if (inputSigma[i] > uB[i] - lB[i]) {
                     throw new OutOfRangeException(inputSigma[i], 0, uB[i] - lB[i]);

src/main/java/org/apache/commons/math4/random/AbstractWell.java

@@ -134,7 +134,7 @@ private void setSeedInternal(final int seed) {
      */
     private void setSeedInternal(final int[] seed) {
         if (seed == null) {
-            setSeed(System.currentTimeMillis() + System.identityHashCode(this));
+            setSeedInternal(System.currentTimeMillis() + System.identityHashCode(this));
             return;
         }
 

src/main/java/org/apache/commons/math4/random/BaseRandomGenerator.java

@@ -228,17 +228,17 @@ public void nextBytes(byte[] bytes,
      * </p>
      *
      * @param bytes Array in which to put the generated bytes. Cannot be {@code null}.
-     * @param position Index at which to start inserting the generated bytes.
-     * @param length Number of bytes to insert.
+     * @param start Index at which to start inserting the generated bytes.
+     * @param len Number of bytes to insert.
      */
     private void nextBytesFill(byte[] bytes,
-                               int position,
-                               int length) {
-        int index = position; // Index of first insertion.
+                               int start,
+                               int len) {
+        int index = start; // Index of first insertion.
 
         // Index of first insertion plus multiple 4 part of length (i.e. length
         // with two least significant bits unset).
-        final int indexLoopLimit = index + (length & 0x7ffffffc);
+        final int indexLoopLimit = index + (len & 0x7ffffffc);
 
         // Start filling in the byte array, 4 bytes at a time.
         while (index < indexLoopLimit) {
@@ -249,7 +249,7 @@ private void nextBytesFill(byte[] bytes,
             bytes[index++] = (byte) (random >>> 24);
         }
 
-        final int indexLimit = position + length; // Index of last insertion + 1.
+        final int indexLimit = start + len; // Index of last insertion + 1.
 
         // Fill in the remaining bytes.
         if (index < indexLimit) {

src/main/java/org/apache/commons/math4/random/ISAACRandom.java

@@ -131,7 +131,7 @@ public void setSeed(long seed) {
      * @param seed Seed.
      */
     private void setSeedInternal(int seed) {
-        setSeed(new int[]{seed});
+        setSeedInternal(new int[] { seed });
     }
 
     /**
@@ -140,7 +140,7 @@ private void setSeedInternal(int seed) {
      * @param seed Seed.
      */
     private void setSeedInternal(long seed) {
-        setSeed(new int[]{(int) (seed >>> 32), (int) (seed & 0xffffffffL)});
+        setSeedInternal(new int[] { (int) (seed >>> 32), (int) (seed & 0xffffffffL) });
     }
 
     /**
@@ -150,7 +150,7 @@ private void setSeedInternal(long seed) {
      */
     private void setSeedInternal(int[] seed) {
         if (seed == null) {
-            setSeed(System.currentTimeMillis() + System.identityHashCode(this));
+            setSeedInternal(System.currentTimeMillis() + System.identityHashCode(this));
             return;
         }
         final int seedLen = seed.length;

src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java

@@ -159,7 +159,7 @@ public boolean equals(Object o) {
         boolean result = false;
         if (this == o) {
             result = true;
-        } else if (o != null && o instanceof PSquarePercentile) {
+        } else if (o instanceof PSquarePercentile) {
             PSquarePercentile that = (PSquarePercentile) o;
             boolean isNotNull = markers != null && that.markers != null;
             boolean isNull = markers == null && that.markers == null;
@@ -410,7 +410,7 @@ public boolean equals(Object o) {
             boolean result = false;
             if (this == o) {
                 result = true;
-            } else if (o != null && o instanceof Markers) {
+            } else if (o instanceof Markers) {
                 Markers that = (Markers) o;
                 result = Arrays.deepEquals(markerArray, that.markerArray);
             }
@@ -802,7 +802,7 @@ public boolean equals(Object o) {
             boolean result = false;
             if (this == o) {
                 result = true;
-            } else if (o != null && o instanceof Marker) {
+            } else if (o instanceof Marker) {
                 Marker that = (Marker) o;
 
                 result = Double.compare(markerHeight, that.markerHeight) == 0;

src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java

@@ -39,16 +39,16 @@ public ConfidenceInterval createInterval(int numberOfTrials, int numberOfSuccess
 
         final FDistribution distributionLowerBound = new FDistribution(2 * (numberOfTrials - numberOfSuccesses + 1),
                                                                        2 * numberOfSuccesses);
-        final double fValueLowerBound = distributionLowerBound.inverseCumulativeProbability(1 - alpha);
         if (numberOfSuccesses > 0) {
+            final double fValueLowerBound = distributionLowerBound.inverseCumulativeProbability(1 - alpha);
             lowerBound = numberOfSuccesses /
                          (numberOfSuccesses + (numberOfTrials - numberOfSuccesses + 1) * fValueLowerBound);
         }
 
         final FDistribution distributionUpperBound = new FDistribution(2 * (numberOfSuccesses + 1),
                                                                        2 * (numberOfTrials - numberOfSuccesses));
-        final double fValueUpperBound = distributionUpperBound.inverseCumulativeProbability(1 - alpha);
         if (numberOfSuccesses > 0) {
+            final double fValueUpperBound = distributionUpperBound.inverseCumulativeProbability(1 - alpha);
             upperBound = (numberOfSuccesses + 1) * fValueUpperBound /
                          (numberOfTrials - numberOfSuccesses + (numberOfSuccesses + 1) * fValueUpperBound);
         }

src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java

@@ -650,7 +650,7 @@ public static BigInteger pow(final BigInteger k, BigInteger e) throws NotPositiv
      */
      private static long addAndCheck(long a, long b, Localizable pattern) throws MathArithmeticException {
          final long result = a + b;
-         if (!((a ^ b) < 0 | (a ^ result) >= 0)) {
+         if (!((a ^ b) < 0 || (a ^ result) >= 0)) {
              throw new MathArithmeticException(pattern, a, b);
          }
          return result;