Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restored specificity in exception error messages. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1134939 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Phil Steitz 2011-06-12 15:57:32 +00:00
parent 88bd54a422
commit 61c5342b50
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/apache/commons/math/stat/inference/ChiSquareTestImpl.java
View File

@ -20,7 +20,6 @@ import org.apache.commons.math.MathException;
import org.apache.commons.math.exception.NotPositiveException; import org.apache.commons.math.exception.NotPositiveException;
import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NotStrictlyPositiveException;
import org.apache.commons.math.exception.NullArgumentException; import org.apache.commons.math.exception.NullArgumentException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.OutOfRangeException; import org.apache.commons.math.exception.OutOfRangeException;
import org.apache.commons.math.exception.DimensionMismatchException; import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.MathIllegalArgumentException; import org.apache.commons.math.exception.MathIllegalArgumentException;
@ -321,11 +320,13 @@ public class ChiSquareTestImpl implements UnknownDistributionChiSquareTest {
*/ */
private void checkArray(long[][] in) { private void checkArray(long[][] in) {
if (in.length < 2) { if (in.length < 2) {
throw new NumberIsTooSmallException(in.length, 2, true); throw new MathIllegalArgumentException(
LocalizedFormats.INSUFFICIENT_DIMENSION, in.length, 2);
} }
if (in[0].length < 2) { if (in[0].length < 2) {
throw new NumberIsTooSmallException(in[0].length, 2, true); throw new MathIllegalArgumentException(
LocalizedFormats.INSUFFICIENT_DIMENSION, in[0].length, 2);
} }
checkRectangular(in); checkRectangular(in);
@ -354,7 +355,7 @@ public class ChiSquareTestImpl implements UnknownDistributionChiSquareTest {
} }
/** /**
* Check all entries of the input array are strictly postive. * Check all entries of the input array are strictly positive.
* *
* @param in Array to be tested. * @param in Array to be tested.
* @exception NotStrictlyPositiveException if one entry is not positive. * @exception NotStrictlyPositiveException if one entry is not positive.
@ -362,7 +363,9 @@ public class ChiSquareTestImpl implements UnknownDistributionChiSquareTest {
private void checkPositive(double[] in) { private void checkPositive(double[] in) {
for (int i = 0; i < in.length; i++) { for (int i = 0; i < in.length; i++) {
if (in[i] <= 0) { if (in[i] <= 0) {
throw new NotStrictlyPositiveException(in[i]); throw new MathIllegalArgumentException(
LocalizedFormats.NOT_POSITIVE_ELEMENT_AT_INDEX,
i, in[i]);
} }
} }
} }
@ -376,7 +379,9 @@ public class ChiSquareTestImpl implements UnknownDistributionChiSquareTest {
private void checkNonNegative(long[] in) { private void checkNonNegative(long[] in) {
for (int i = 0; i < in.length; i++) { for (int i = 0; i < in.length; i++) {
if (in[i] < 0) { if (in[i] < 0) {
throw new NotPositiveException(in[i]); throw new MathIllegalArgumentException(
LocalizedFormats.NEGATIVE_ELEMENT_AT_INDEX,
i, in[i]);
} }
} }
} }
@ -391,7 +396,9 @@ public class ChiSquareTestImpl implements UnknownDistributionChiSquareTest {
for (int i = 0; i < in.length; i ++) { for (int i = 0; i < in.length; i ++) {
for (int j = 0; j < in[i].length; j++) { for (int j = 0; j < in[i].length; j++) {
if (in[i][j] < 0) { if (in[i][j] < 0) {
throw new NotPositiveException(in[i][j]); throw new MathIllegalArgumentException(
LocalizedFormats.NEGATIVE_ELEMENT_AT_2D_INDEX,
i, j, in[i][j]);
} }
} }
} }