Author: fanningpj
Date: Fri Feb 4 09:49:44 2022
New Revision: 1897752
URL: http://svn.apache.org/viewvc?rev=1897752&view=rev
Log:
add dollarde function
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
- copied, changed from r1897726,
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
- copied, changed from r1897726,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormDist.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.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=1897752&r1=1897751&r2=1897752&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
Fri Feb 4 09:49:44 2022
@@ -102,7 +102,7 @@ public final class AnalysisToolPak imple
r(m, "DEC2OCT", null);
r(m, "DELTA", Delta.instance);
r(m, "DISC", null);
- r(m, "DOLLARDE", null);
+ r(m, "DOLLARDE", DollarDe.instance);
r(m, "DOLLARFR", null);
r(m, "DURATION", null);
r(m, "EDATE", EDate.instance);
Copied:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
(from r1897726,
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java&r1=1897726&r2=1897752&rev=1897752&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DollarDe.java
Fri Feb 4 09:49:44 2022
@@ -24,26 +24,18 @@ import org.apache.poi.ss.formula.eval.Nu
import org.apache.poi.ss.formula.eval.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.text.NumberFormat;
+
/**
- * Implementation for Excel DELTA() function.
- * <p>
- * <b>Syntax</b>:<br> <b>DELTA </b>(<b>number1</b>,<b>number2</b> )<br>
+ * Implementation for Excel DOLLARDE() function.
* <p>
- * Tests whether two values are equal. Returns 1 if number1 = number2; returns
0 otherwise.
- * Use this function to filter a set of values. For example, by summing
several DELTA functions
- * you calculate the count of equal pairs. This function is also known as the
Kronecker Delta function.
- *
- * <ul>
- * <li>If number1 is nonnumeric, DELTA returns the #VALUE! error
value.</li>
- * <li>If number2 is nonnumeric, DELTA returns the #VALUE! error
value.</li>
- * </ul>
+ *
<https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
*/
-public final class Delta extends Fixed2ArgFunction implements FreeRefFunction {
+public final class DollarDe extends Fixed2ArgFunction implements
FreeRefFunction {
- public static final FreeRefFunction instance = new Delta();
-
- private static final NumberEval ONE = new NumberEval(1);
- private static final NumberEval ZERO = new NumberEval(0);
+ public static final FreeRefFunction instance = new DollarDe();
@Override
public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval
arg1, ValueEval arg2) {
@@ -56,8 +48,32 @@ public final class Delta extends Fixed2A
if (number2 == null) {
return ErrorEval.VALUE_INVALID;
}
+ int fraction = number2.intValue();
+ if (fraction < 0) {
+ return ErrorEval.NUM_ERROR;
+ } else if (fraction == 0) {
+ return ErrorEval.DIV_ZERO;
+ }
+
+ long valueLong = number1.longValue();
+ double valueFractional = number1 - valueLong;
+ if (valueFractional == 0.0) {
+ return new NumberEval(valueLong);
+ }
+ int iterations = 0;
+ final int maxIterations = 100;
+ while (valueFractional < fraction && iterations < maxIterations) {
+ valueFractional = valueFractional * 10;
+ iterations++;
+ }
+ if (iterations == maxIterations && valueFractional < fraction) {
+ return new NumberEval(valueLong);
+ }
+ BigDecimal calc = new BigDecimal((long)valueFractional)
+ .divide(BigDecimal.valueOf(10), MathContext.DECIMAL128)
+ .divide(BigDecimal.valueOf(fraction),
MathContext.DECIMAL128);
- return (number1.compareTo(number2) == 0) ? ONE : ZERO;
+ return new
NumberEval(calc.add(BigDecimal.valueOf(valueLong)).doubleValue());
} catch (EvaluationException e) {
return e.getErrorEval();
}
Copied:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
(from r1897726,
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormDist.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormDist.java&r1=1897726&r2=1897752&rev=1897752&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormDist.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDollarDe.java
Fri Feb 4 09:49:44 2022
@@ -19,10 +19,10 @@ package org.apache.poi.ss.formula.functi
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
+import org.apache.poi.hssf.usermodel.HSSFRow;
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.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
@@ -37,69 +37,71 @@ import static org.apache.poi.ss.util.Uti
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
- * Tests for {@link NormDist}
+ * Tests for {@link DollarDe}
*/
-final class TestNormDist {
+final class TestDollarDe {
private static final OperationEvaluationContext ec = new
OperationEvaluationContext(null, null, 0, 0, 0, null);
@Test
- void testBasic() {
- confirmValue("42", "40", "1.5", true, 0.908788780274132);
- confirmValue("42", "40", "1.5", false, 0.109340049783996);
+ void testInvalid() {
+ confirmInvalidError("A1","B2");
}
@Test
- void testInvalid() {
- confirmInvalidError("A1","B2","C2", false);
+ void testNumError() {
+ confirmNumError("22.5","-40");
}
@Test
- void testNumError() {
- confirmNumError("42","40","0", false);
- confirmNumError("42","40","0", true);
- confirmNumError("42","40","-0.1", false);
- confirmNumError("42","40","-0.1", true);
+ void testDiv0() {
+ confirmDiv0("22.5","0");
+ confirmDiv0("22.5","0.9");
+ confirmDiv0("22.5","-0.9");
}
-
//https://support.microsoft.com/en-us/office/normdist-function-126db625-c53e-4591-9a22-c9ff422d6d58
-
//https://support.microsoft.com/en-us/office/norm-dist-function-edb1cc14-a21c-4e53-839d-8082074c9f8d
+
//https://support.microsoft.com/en-us/office/dollarde-function-db85aab0-1677-428a-9dfd-a38476693427
@Test
void testMicrosoftExample1() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet sheet = wb.createSheet();
- addRow(sheet, 0, "Data", "Description");
- addRow(sheet, 1, 42, "Value for which you want the distribution");
- addRow(sheet, 2, 40, "Arithmetic mean of the distribution");
- addRow(sheet, 3, 1.5, "Standard deviation of the distribution");
+ HSSFRow row = sheet.createRow(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "NORMDIST(A2,A3,A4,TRUE)",
0.908788780274132, 0.00000000000001);
- assertDouble(fe, cell, "NORM.DIST(A2,A3,A4,TRUE)",
0.908788780274132, 0.00000000000001);
+ HSSFCell cell = row.createCell(0);
+ assertDouble(fe, cell, "DOLLARDE(1.02,16)", 1.125,
0.00000000000001);
+ assertDouble(fe, cell, "DOLLARDE(1.02,16.9)", 1.125,
0.00000000000001);
+ assertDouble(fe, cell, "DOLLARDE(1.1,32)", 1.3125,
0.00000000000001);
+ assertDouble(fe, cell, "DOLLARDE(1.1,32.1)", 1.3125,
0.00000000000001);
}
}
- private static ValueEval invokeValue(String number1, String number2,
String number3, boolean cumulative) {
- ValueEval[] args = new ValueEval[] { new StringEval(number1), new
StringEval(number2), new StringEval(number3), BoolEval.valueOf(cumulative)};
- return NormDist.instance.evaluate(args, ec);
+ private static ValueEval invokeValue(String number1, String number2) {
+ ValueEval[] args = new ValueEval[] { new StringEval(number1), new
StringEval(number2) };
+ return DollarDe.instance.evaluate(args, ec);
}
- private static void confirmValue(String number1, String number2, String
number3, boolean cumulative, double expected) {
- ValueEval result = invokeValue(number1, number2, number3, cumulative);
+ private static void confirmValue(String number1, String number2, double
expected) {
+ ValueEval result = invokeValue(number1, number2);
assertEquals(NumberEval.class, result.getClass());
assertEquals(expected, ((NumberEval) result).getNumberValue(),
0.00000000000001);
}
- private static void confirmInvalidError(String number1, String number2,
String number3, boolean cumulative) {
- ValueEval result = invokeValue(number1, number2, number3, cumulative);
+ private static void confirmInvalidError(String number1, String number2) {
+ ValueEval result = invokeValue(number1, number2);
assertEquals(ErrorEval.class, result.getClass());
assertEquals(ErrorEval.VALUE_INVALID, result);
}
- private static void confirmNumError(String number1, String number2, String
number3, boolean cumulative) {
- ValueEval result = invokeValue(number1, number2, number3, cumulative);
+ private static void confirmNumError(String number1, String number2) {
+ ValueEval result = invokeValue(number1, number2);
assertEquals(ErrorEval.class, result.getClass());
assertEquals(ErrorEval.NUM_ERROR, result);
}
+ private static void confirmDiv0(String number1, String number2) {
+ ValueEval result = invokeValue(number1, number2);
+ assertEquals(ErrorEval.class, result.getClass());
+ assertEquals(ErrorEval.DIV_ZERO, result);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
