Reverting changes inadvertently committed in r1405634.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1405635 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6e40b488fd
commit
387e7f9fa9
|
@ -47,9 +47,6 @@ public class TestUtils {
|
||||||
/** Singleton OneWayAnova instance. */
|
/** Singleton OneWayAnova instance. */
|
||||||
private static final OneWayAnova ONE_WAY_ANANOVA = new OneWayAnova();
|
private static final OneWayAnova ONE_WAY_ANANOVA = new OneWayAnova();
|
||||||
|
|
||||||
/** Singleton G-Test instance. */
|
|
||||||
private static final GTest G_TEST = new GTest();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prevent instantiation.
|
* Prevent instantiation.
|
||||||
*/
|
*/
|
||||||
|
@ -365,83 +362,6 @@ public class TestUtils {
|
||||||
return ONE_WAY_ANANOVA.anovaTest(categoryData, alpha);
|
return ONE_WAY_ANANOVA.anovaTest(categoryData, alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#gValueGoodnessOfFit(double[], long[])
|
|
||||||
*/
|
|
||||||
public static double gValue(final double[] expected, final long[] observed)
|
|
||||||
throws NotPositiveException, NotStrictlyPositiveException,
|
|
||||||
DimensionMismatchException {
|
|
||||||
return G_TEST.gValueGoodnessOfFit(expected, observed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#gTestGoodnessOfFitPValue( double[], long[] )
|
|
||||||
*/
|
|
||||||
public static double gTest_pValue(final double[] expected, final long[] observed)
|
|
||||||
throws NotPositiveException, NotStrictlyPositiveException,
|
|
||||||
DimensionMismatchException, MaxCountExceededException {
|
|
||||||
return G_TEST.gTestGoodnessOfFitPValue(expected, observed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#gTestGoodnessOfFitIntrinsicPValue(double[], long[] )
|
|
||||||
*/
|
|
||||||
public static double gTestIntrinsic_pValue(final double[] expected, final long[] observed)
|
|
||||||
throws NotPositiveException, NotStrictlyPositiveException,
|
|
||||||
DimensionMismatchException, MaxCountExceededException {
|
|
||||||
return G_TEST.gTestGoodnessOfFitIntrinsicPValue(expected, observed);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#gTestGoodnessOfFit( double[],long[],double)
|
|
||||||
*/
|
|
||||||
public static boolean gTest(final double[] expected, final long[] observed,
|
|
||||||
final double alpha)
|
|
||||||
throws NotPositiveException, NotStrictlyPositiveException,
|
|
||||||
DimensionMismatchException, OutOfRangeException, MaxCountExceededException {
|
|
||||||
return G_TEST.gTestGoodnessOfFit(expected, observed, alpha);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#gValueDataSetsComparison(long[], long[])
|
|
||||||
*/
|
|
||||||
public static double gValueDataSetsComparison(final long[] observed1,
|
|
||||||
final long[] observed2)
|
|
||||||
throws DimensionMismatchException, NotPositiveException, ZeroException {
|
|
||||||
return G_TEST.gValueDataSetsComparison(observed1, observed2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.GTest#rootLogLikelihoodRatio(long, long, long, long)
|
|
||||||
*/
|
|
||||||
public static double rootLogLikelihoodRatio(final long k11, final long k12, final long k21, final long k22)
|
|
||||||
throws DimensionMismatchException, NotPositiveException, ZeroException {
|
|
||||||
return G_TEST.rootLogLikelihoodRatio(k11, k12, k21, k22);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.ChiSquareTest#gTestDataSetsComparisonPValue(long[], long[])
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public static double gTestDataSetsComparison_pValue(final long[] observed1,
|
|
||||||
final long[] observed2)
|
|
||||||
throws DimensionMismatchException, NotPositiveException, ZeroException,
|
|
||||||
MaxCountExceededException {
|
|
||||||
return G_TEST.gTestDataSetsComparisonPValue(observed1, observed2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @see org.apache.commons.math3.stat.inference.ChiSquareTest#gTestDataSetsComparison(double[],long[],double)
|
|
||||||
*/
|
|
||||||
public static boolean gTestDataSetsComparison(final long[] observed1,
|
|
||||||
final long[] observed2,
|
|
||||||
final double alpha)
|
|
||||||
throws DimensionMismatchException, NotPositiveException,
|
|
||||||
ZeroException, OutOfRangeException, MaxCountExceededException {
|
|
||||||
return G_TEST.gTestDataSetsComparison(observed1, observed2, alpha);
|
|
||||||
}
|
|
||||||
|
|
||||||
// CHECKSTYLE: resume JavadocMethodCheck
|
// CHECKSTYLE: resume JavadocMethodCheck
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue