Author: fanningpj
Date: Fri Oct 22 09:48:30 2021
New Revision: 1894470
URL: http://svn.apache.org/viewvc?rev=1894470&view=rev
Log:
get some T.DIST tests to work (still not right on cumulative=false)
Added:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistLt.java
- copied, changed from r1894469,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TDistLt.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist2t.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TDistLt.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TDistLt.java?rev=1894470&r1=1894469&r2=1894470&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TDistLt.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TDistLt.java
Fri Oct 22 09:48:30 2021
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.commons.math3.distribution.TDistribution;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.eval.*;
@@ -49,6 +50,16 @@ public final class TDistLt extends Fixed
public static final TDistLt instance = new TDistLt();
+ private static double tdistCumulative(double x, int degreesOfFreedom) {
+ TDistribution tdist = new TDistribution(degreesOfFreedom);
+ return tdist.cumulativeProbability(x);
+ }
+
+ private static double tdistDensity(double x, int degreesOfFreedom) {
+ TDistribution tdist = new TDistribution(degreesOfFreedom);
+ return tdist.density(x);
+ }
+
@Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval
arg1, ValueEval arg2, ValueEval arg3) {
try {
@@ -64,7 +75,15 @@ public final class TDistLt extends Fixed
if (degreesOfFreedom < 1) {
return ErrorEval.NUM_ERROR;
}
- return new NumberEval(TDist.tdistOneTail(Math.abs(number1),
degreesOfFreedom));
+ Boolean cumulativeFlag = evaluateBoolean(arg3, srcRowIndex,
srcColumnIndex);
+ if (cumulativeFlag == null) {
+ return ErrorEval.VALUE_INVALID;
+ }
+ if (cumulativeFlag.booleanValue()) {
+ return new NumberEval(tdistCumulative(number1,
degreesOfFreedom));
+ } else {
+ return new NumberEval(tdistDensity(number1, degreesOfFreedom));
+ }
} catch (EvaluationException e) {
return e.getErrorEval();
}
@@ -84,4 +103,9 @@ public final class TDistLt extends Fixed
String strText1 = OperandResolver.coerceValueToString(veText);
return OperandResolver.parseDouble(strText1);
}
+
+ private static Boolean evaluateBoolean(ValueEval arg, int srcRowIndex, int
srcColumnIndex) throws EvaluationException {
+ ValueEval veText = OperandResolver.getSingleValue(arg, srcRowIndex,
srcColumnIndex);
+ return OperandResolver.coerceValueToBoolean(veText, false);
+ }
}
\ No newline at end of file
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist.java?rev=1894470&r1=1894469&r2=1894470&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist.java
Fri Oct 22 09:48:30 2021
@@ -74,8 +74,8 @@ final class TestTDist {
addRow(sheet, 2, 60, "Degrees of freedom");
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "TDIST(A2,A3,2)", 0.054644930, 0.01);
- assertDouble(fe, cell, "TDIST(A2,A3,1)", 0.027322465, 0.01);
+ assertDouble(fe, cell, "TDIST(A2,A3,2)", 0.054644930, 0.000001);
+ assertDouble(fe, cell, "TDIST(A2,A3,1)", 0.027322465, 0.000001);
}
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist2t.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist2t.java?rev=1894470&r1=1894469&r2=1894470&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist2t.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDist2t.java
Fri Oct 22 09:48:30 2021
@@ -71,7 +71,7 @@ final class TestTDist2t {
addRow(sheet, 2, 60, "Degrees of freedom");
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "T.DIST.2T(A2,A3)", 0.054644930, 0.01);
+ assertDouble(fe, cell, "T.DIST.2T(A2,A3)", 0.054644930, 0.000001);
}
}
Copied:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistLt.java
(from r1894469,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistLt.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistLt.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java&r1=1894469&r2=1894470&rev=1894470&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistLt.java
Fri Oct 22 09:48:30 2021
@@ -17,10 +17,6 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
@@ -28,77 +24,59 @@ import org.apache.poi.ss.formula.eval.St
import org.apache.poi.ss.formula.eval.ValueEval;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-
-import static org.apache.poi.ss.util.Utils.addRow;
-import static org.apache.poi.ss.util.Utils.assertDouble;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
- * Tests for {@link TDistRt}
+ * Tests for {@link TDistLt}
*/
-final class TestTDistRt {
+final class TestTDistLt {
private static final OperationEvaluationContext ec = new
OperationEvaluationContext(null, null, 0, 0, 0, null);
@Test
void testBasic() {
- confirmValue("5.968191467", "8", 0.00016754180265310392);
- confirmValue("5.968191467", "8.2", 0.00016754180265310392);
- confirmValue("5.968191467", "8.9", 0.00016754180265310392);
- confirmValue("-5.968191467", "8", 0.999832458, 0.01);
+
//https://support.microsoft.com/en-us/office/t-dist-rt-function-20a30020-86f9-4b35-af1f-7ef6ae683eda
+ confirmValue("60", "1", "TRUE", 0.99469533, 0.000001);
+ confirmValue("-60", "1", "TRUE", 0.005304674, 0.000001);
+ //confirmValue("60", "1", "FALSE", 0.00073691, 0.000001);
}
@Test
void testInvalid() {
- confirmInvalidError("A1","B2");
- confirmInvalidError("5.968191467","B2");
- confirmInvalidError("A1","8");
+ confirmInvalidError("A1","B2", "C3");
+ confirmInvalidError("5.968191467","B2", "FALSE");
+ confirmInvalidError("A1","8", "TRUE");
+ confirmInvalidError("5.968191467","8", "");
}
@Test
void testNumError() {
- confirmNumError("-5.968191467", "-8");
+ confirmNumError("-5.968191467", "-8", "TRUE");
}
-
//https://support.microsoft.com/en-us/office/t-dist-rt-function-20a30020-86f9-4b35-af1f-7ef6ae683eda
- @Test
- void testMicrosoftExample1() throws IOException {
- try (HSSFWorkbook wb = new HSSFWorkbook()) {
- HSSFSheet sheet = wb.createSheet();
- addRow(sheet, 0, "Data", "Description");
- addRow(sheet, 1, 1.959999998, "Value at which to evaluate the
distribution");
- addRow(sheet, 2, 60, "Degrees of freedom");
- HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "T.DIST.RT(A2,A3)", 0.027322465, 0.01);
- assertDouble(fe, cell, "T.DIST.RT(-A2,A3)", 0.972677535, 0.01);
- }
- }
-
- private static ValueEval invokeValue(String number1, String number2) {
- ValueEval[] args = new ValueEval[] { new StringEval(number1), new
StringEval(number2) };
- return TDistRt.instance.evaluate(args, ec);
+ private static ValueEval invokeValue(String number1, String number2,
String value3) {
+ ValueEval[] args = new ValueEval[] { new StringEval(number1), new
StringEval(number2), new StringEval(value3) };
+ return TDistLt.instance.evaluate(args, ec);
}
- private static void confirmValue(String number1, String number2, double
expected) {
- confirmValue(number1, number2, expected, 0.0);
+ private static void confirmValue(String number1, String number2, String
value3, double expected) {
+ confirmValue(number1, number2, value3, expected, 0.0);
}
- private static void confirmValue(String number1, String number2, double
expected, double tolerance) {
- ValueEval result = invokeValue(number1, number2);
+ private static void confirmValue(String number1, String number2, String
value3, double expected, double tolerance) {
+ ValueEval result = invokeValue(number1, number2, value3);
assertEquals(NumberEval.class, result.getClass());
assertEquals(expected, ((NumberEval) result).getNumberValue(),
tolerance);
}
- private static void confirmInvalidError(String number1, String number2) {
- ValueEval result = invokeValue(number1, number2);
+ private static void confirmInvalidError(String number1, String number2,
String value3) {
+ ValueEval result = invokeValue(number1, number2, value3);
assertEquals(ErrorEval.class, result.getClass());
assertEquals(ErrorEval.VALUE_INVALID, result);
}
- private static void confirmNumError(String number1, String number2) {
- ValueEval result = invokeValue(number1, number2);
+ private static void confirmNumError(String number1, String number2, String
value3) {
+ ValueEval result = invokeValue(number1, number2, value3);
assertEquals(ErrorEval.class, result.getClass());
assertEquals(ErrorEval.NUM_ERROR, result);
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java?rev=1894470&r1=1894469&r2=1894470&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTDistRt.java
Fri Oct 22 09:48:30 2021
@@ -46,7 +46,7 @@ final class TestTDistRt {
confirmValue("5.968191467", "8", 0.00016754180265310392);
confirmValue("5.968191467", "8.2", 0.00016754180265310392);
confirmValue("5.968191467", "8.9", 0.00016754180265310392);
- confirmValue("-5.968191467", "8", 0.999832458, 0.01);
+ confirmValue("-5.968191467", "8", 0.999832458, 0.000001);
}
@Test
@@ -71,8 +71,8 @@ final class TestTDistRt {
addRow(sheet, 2, 60, "Degrees of freedom");
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "T.DIST.RT(A2,A3)", 0.027322465, 0.01);
- assertDouble(fe, cell, "T.DIST.RT(-A2,A3)", 0.972677535, 0.01);
+ assertDouble(fe, cell, "T.DIST.RT(A2,A3)", 0.027322465, 0.000001);
+ assertDouble(fe, cell, "T.DIST.RT(-A2,A3)", 0.972677535, 0.000001);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
