You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/01/25 23:42:27 UTC
svn commit: r1897480 - in /poi/trunk/poi/src: main/java/org/apache/poi/ss/formula/atp/ main/java/org/apache/poi/ss/formula/eval/ main/java/org/apache/poi/ss/formula/functions/ test/java/org/apache/poi/ss/formula/functions/
Author: fanningpj
Date: Tue Jan 25 23:42:27 2022
New Revision: 1897480
URL: http://svn.apache.org/viewvc?rev=1897480&view=rev
Log:
normsinv function
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSInv.java
- copied, changed from r1897477, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSInv.java
- copied, changed from r1897477, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSDist.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java?rev=1897480&r1=1897479&r2=1897480&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java Tue Jan 25 23:42:27 2022
@@ -152,6 +152,7 @@ public final class AnalysisToolPak imple
r(m, "NORM.DIST", NormDist.instance);
r(m, "NORM.S.DIST", NormSDist.instance);
r(m, "NORM.INV", NormInv.instance);
+ r(m, "NORM.S.INV", NormSInv.instance);
r(m, "NUMBERVALUE", NumberValueFunction.instance);
r(m, "OCT2BIN", null);
r(m, "OCT2DEC", Oct2Dec.instance);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java?rev=1897480&r1=1897479&r2=1897480&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java Tue Jan 25 23:42:27 2022
@@ -275,7 +275,7 @@ public final class FunctionEval {
retval[293] = NormDist.instance;
retval[294] = NormSDist.instance;
retval[295] = NormInv.instance;
- // 296: NORMSINV
+ retval[296] = NormSInv.instance;
// 297: STANDARDIZE
retval[298] = NumericFunction.ODD;
// 299: PERMUT
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java?rev=1897480&r1=1897479&r2=1897480&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java Tue Jan 25 23:42:27 2022
@@ -25,7 +25,7 @@ import org.apache.poi.ss.formula.eval.Op
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel NORMSDIST() function.<p>
+ * Implementation for Excel NORMSDIST() and NORM.S.DIST functions.<p>
* <ul>
* <li>https://support.microsoft.com/en-us/office/normsdist-function-463369ea-0345-445d-802a-4ff0d6ce7cac</li>
* <li>https://support.microsoft.com/en-us/office/norm-s-dist-function-1e787282-3832-4520-a9ae-bd2a8d99ba88</li>
Copied: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSInv.java (from r1897477, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSInv.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSInv.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java&r1=1897477&r2=1897480&rev=1897480&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSDist.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/NormSInv.java Tue Jan 25 23:42:27 2022
@@ -25,27 +25,27 @@ import org.apache.poi.ss.formula.eval.Op
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation for Excel NORMSDIST() function.<p>
+ * Implementation for Excel NORMSINV() and NORM.S.INV() functions.<p>
* <ul>
- * <li>https://support.microsoft.com/en-us/office/normsdist-function-463369ea-0345-445d-802a-4ff0d6ce7cac</li>
- * <li>https://support.microsoft.com/en-us/office/norm-s-dist-function-1e787282-3832-4520-a9ae-bd2a8d99ba88</li>
+ * <li>https://support.microsoft.com/en-us/office/normsinv-function-8d1bce66-8e4d-4f3b-967c-30eed61f019d</li>
+ * <li>https://support.microsoft.com/en-us/office/norm-s-inv-function-d6d556b4-ab7f-49cd-b526-5a20918452b1</li>
* </ul>
*/
-public final class NormSDist extends Fixed1ArgFunction implements FreeRefFunction {
+public final class NormSInv extends Fixed1ArgFunction implements FreeRefFunction {
- public static final NormSDist instance = new NormSDist();
+ public static final NormSInv instance = new NormSInv();
@Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg1) {
try {
- Double xval = evaluateValue(arg1, srcRowIndex, srcColumnIndex);
- if (xval == null) {
+ Double probability = evaluateValue(arg1, srcRowIndex, srcColumnIndex);
+ if (probability == null) {
return ErrorEval.VALUE_INVALID;
- } else if (xval < 0) {
+ } else if (probability <= 0 || probability >= 1) {
return ErrorEval.NUM_ERROR;
}
- return new NumberEval(NormDist.probability(xval.doubleValue(), 0, 1, true));
+ return new NumberEval(NormInv.inverse(probability.doubleValue(), 0, 1));
} catch (EvaluationException e) {
return e.getErrorEval();
}
Copied: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSInv.java (from r1897477, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSDist.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSInv.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSInv.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSDist.java&r1=1897477&r2=1897480&rev=1897480&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSDist.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormSInv.java Tue Jan 25 23:42:27 2022
@@ -23,7 +23,6 @@ import org.apache.poi.hssf.usermodel.HSS
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.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
@@ -32,20 +31,19 @@ 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 NormSDist}
+ * Tests for {@link NormSInv}
*/
-final class TestNormSDist {
+final class TestNormSInv {
private static final OperationEvaluationContext ec = new OperationEvaluationContext(null, null, 0, 0, 0, null);
@Test
void testBasic() {
- confirmValue("1.333333", 0.908788726);
+ confirmValue("0.9088", 1.3334);
}
@Test
@@ -53,8 +51,16 @@ final class TestNormSDist {
confirmInvalidError("A1");
}
- //https://support.microsoft.com/en-us/office/normsdist-function-463369ea-0345-445d-802a-4ff0d6ce7cac
- //https://support.microsoft.com/en-us/office/norm-s-dist-function-1e787282-3832-4520-a9ae-bd2a8d99ba88
+ @Test
+ void testNumError() {
+ confirmNumError("0");
+ confirmNumError("-0.5");
+ confirmNumError("1");
+ confirmNumError("1.5");
+ }
+
+ //https://support.microsoft.com/en-us/office/normsinv-function-8d1bce66-8e4d-4f3b-967c-30eed61f019d</li>
+ //https://support.microsoft.com/en-us/office/norm-s-inv-function-d6d556b4-ab7f-49cd-b526-5a20918452b1</li>
@Test
void testMicrosoftExample1() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
@@ -62,20 +68,20 @@ final class TestNormSDist {
HSSFRow row = sheet.createRow(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = row.createCell(0);
- assertDouble(fe, cell, "NORMSDIST(1.333333)", 0.908788726, 0.000001);
- assertDouble(fe, cell, "NORM.S.DIST(1.333333)", 0.908788726, 0.000001);
+ assertDouble(fe, cell, "NORMSINV(0.9088)", 1.3334, 0.00001);
+ assertDouble(fe, cell, "NORM.S.INV(0.9088)", 1.3334, 0.00001);
}
}
private static ValueEval invokeValue(String number1) {
ValueEval[] args = new ValueEval[] { new StringEval(number1)};
- return NormSDist.instance.evaluate(args, ec);
+ return NormSInv.instance.evaluate(args, ec);
}
private static void confirmValue(String number1, double expected) {
ValueEval result = invokeValue(number1);
assertEquals(NumberEval.class, result.getClass());
- assertEquals(expected, ((NumberEval) result).getNumberValue(), 0.0000001);
+ assertEquals(expected, ((NumberEval) result).getNumberValue(), 0.00001);
}
private static void confirmInvalidError(String number1) {
@@ -84,4 +90,10 @@ final class TestNormSDist {
assertEquals(ErrorEval.VALUE_INVALID, result);
}
+ private static void confirmNumError(String number1) {
+ ValueEval result = invokeValue(number1);
+ assertEquals(ErrorEval.class, result.getClass());
+ assertEquals(ErrorEval.NUM_ERROR, result);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org