Reduce code duplication.
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/rank/Percentile.java b/src/main/java/org/apache/commons/math4/stat/descriptive/rank/Percentile.java
index ec28da8..9bd7e62 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/rank/Percentile.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/rank/Percentile.java
@@ -214,29 +214,17 @@
}
/**
* Set the data array.
- * @param values data array to store
- * @param sampleWeights corresponding positive and non-NaN weights of values
- * @throws MathIllegalArgumentException if lengths of values and weights are not equal or values or weights is null
+ * @param values Data array.
+ * Cannot be {@code null}.
+ * @param sampleWeights corresponding positive and non-NaN weights.
+ * Cannot be {@code null}.
+ * @throws MathIllegalArgumentException if lengths of values and weights are not equal.
* @throws org.apache.commons.math4.exception.NotANumberException if any weight is NaN
* @throws org.apache.commons.math4.exception.NotStrictlyPositiveException if any weight is not positive
*/
- public void setData(final double[] values, final double[] sampleWeights) {
- if (values == null || sampleWeights == null) {
- throw new MathIllegalArgumentException(LocalizedFormats.NULL_NOT_ALLOWED);
- }
-
- /** Check length */
- if (values.length != sampleWeights.length) {
- throw new MathIllegalArgumentException(LocalizedFormats.LENGTH,
- values, sampleWeights);
- }
- cachedPivots = new int[PIVOTS_HEAP_LENGTH];
- Arrays.fill(cachedPivots, -1);
-
- MathArrays.checkPositive(sampleWeights);
- MathArrays.checkNotNaN(sampleWeights);
- super.setData(values);
- weights = sampleWeights.clone();
+ public void setData(final double[] values,
+ final double[] sampleWeights) {
+ setData(values, sampleWeights, 0, values.length);
}
/** {@inheritDoc} */
@@ -252,8 +240,10 @@
}
/**
* Set the data and weights arrays. The input array is copied, not referenced.
- * @param values data array to store
- * @param sampleWeights corresponding positive and non-NaN weights of values
+ * @param values Data array.
+ * Cannot be {@code null}.
+ * @param sampleWeights corresponding positive and non-NaN weights.
+ * Cannot be {@code null}.
* @param begin the index of the first element to include
* @param length the number of elements to include
* @throws MathIllegalArgumentException if lengths of values and weights are not equal or values or weights is null
@@ -279,7 +269,7 @@
begin + length, values.length, true);
}
- if (values == null || sampleWeights == null) {
+ if (sampleWeights == null) {
throw new MathIllegalArgumentException(LocalizedFormats.NULL_NOT_ALLOWED);
}
cachedPivots = new int[PIVOTS_HEAP_LENGTH];
diff --git a/src/test/java/org/apache/commons/math4/stat/descriptive/rank/PercentileTest.java b/src/test/java/org/apache/commons/math4/stat/descriptive/rank/PercentileTest.java
index 0bf956b..b47aa8d 100644
--- a/src/test/java/org/apache/commons/math4/stat/descriptive/rank/PercentileTest.java
+++ b/src/test/java/org/apache/commons/math4/stat/descriptive/rank/PercentileTest.java
@@ -954,7 +954,7 @@
new Percentile().setData(dataset, weights, 0, dataset.length+1);
}
- @Test(expected=MathIllegalArgumentException.class)
+ @Test(expected=NullPointerException.class)
public void testsetDataInputNull() {
new Percentile().setData(null, null);
new Percentile().setData(null, null, 0, 0);
@@ -1043,4 +1043,4 @@
p.evaluate(dataset, weights, 0, dataset.length + 1);
p.evaluate(dataset, weights, 0, dataset.length + 1, 50);
}
-}
\ No newline at end of file
+}
