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/05/26 13:48:31 UTC
svn commit: r1901290 - in /poi/trunk/poi/src: 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: Thu May 26 13:48:30 2022
New Revision: 1901290
URL: http://svn.apache.org/viewvc?rev=1901290&view=rev
Log:
support DCOUNTA function
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCountA.java
- copied, changed from r1901258, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCountA.java
- copied, changed from r1901250, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java
Modified:
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/DCount.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java
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=1901290&r1=1901289&r2=1901290&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 Thu May 26 13:48:30 2022
@@ -210,7 +210,7 @@ public final class FunctionEval {
retval[196] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DVARP);
retval[197] = NumericFunction.TRUNC;
retval[198] = LogicalFunction.ISLOGICAL;
- // 199: DCOUNTA
+ retval[199] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DCOUNTA);
//204: USDOLLAR (YEN in BIFF3)
//205: FINDB
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java?rev=1901290&r1=1901289&r2=1901290&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java Thu May 26 13:48:30 2022
@@ -23,7 +23,7 @@ import org.apache.poi.ss.formula.eval.Va
/**
* Implementation of the DCount function:
- * Counts the value of a column in an area with given conditions.
+ * Counts the number of numeric cells in a column in an area with given conditions.
*/
public final class DCount implements IDStarAlgorithm {
private long count;
Copied: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCountA.java (from r1901258, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCountA.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCountA.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java&r1=1901258&r2=1901290&rev=1901290&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCount.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DCountA.java Thu May 26 13:48:30 2022
@@ -17,20 +17,21 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.NumericValueEval;
import org.apache.poi.ss.formula.eval.ValueEval;
/**
- * Implementation of the DCount function:
- * Counts the value of a column in an area with given conditions.
+ * Implementation of the DCountA function:
+ * Counts the number of non-blank cells in a column in an area with given conditions.
*/
-public final class DCount implements IDStarAlgorithm {
+public final class DCountA implements IDStarAlgorithm {
private long count;
@Override
public boolean processMatch(ValueEval eval) {
- if (eval instanceof NumericValueEval) {
+ if (!(eval instanceof BlankEval)) {
count++;
}
return true;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java?rev=1901290&r1=1901289&r2=1901290&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java Thu May 26 13:48:30 2022
@@ -59,6 +59,8 @@ public final class DStarRunner implement
DSUM(DSum::new),
/** @see DCount */
DCOUNT(DCount::new),
+ /** @see DCountA */
+ DCOUNTA(DCountA::new),
/** @see DAverage */
DAVERAGE(DAverage::new),
/** @see DStdev */
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java?rev=1901290&r1=1901289&r2=1901290&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java Thu May 26 13:48:30 2022
@@ -43,6 +43,9 @@ public class TestDCount {
assertDouble(fe, cell, "DCOUNT(A5:E11, \"Age\", A1:A2)", 2);
assertDouble(fe, cell, "DCOUNT(A5:E11, \"Age\", A1:F2)", 1);
assertDouble(fe, cell, "DCOUNT(A5:E11, 3, A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNT(A5:E11, 2, A1:F3)", 4);
+ assertDouble(fe, cell, "DCOUNT(A5:E11, 3, A1:F3)", 3);
+ assertDouble(fe, cell, "DCOUNT(A5:E11, 5, A1:F3)", 3);
}
}
@@ -58,7 +61,7 @@ public class TestDCount {
addRow(sheet, 6, "Pear", 12, 12, 10, 96);
addRow(sheet, 7, "Cherry", 13, 14, 9, 105);
addRow(sheet, 8, "Apple", 14, null, 10, 75);
- addRow(sheet, 9, "Pear", 9, 8, 8, 77);
+ addRow(sheet, 9, "Pear", 9, 8, 8, "$77");
addRow(sheet, 10, "Apple", 12, 11, 6, 45);
return wb;
}
Copied: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCountA.java (from r1901250, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCountA.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCountA.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java&r1=1901250&r2=1901290&rev=1901290&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCount.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDCountA.java Thu May 26 13:48:30 2022
@@ -29,20 +29,22 @@ import static org.apache.poi.ss.util.Uti
import static org.apache.poi.ss.util.Utils.assertDouble;
/**
- * Testcase for function DCOUNT()
+ * Testcase for function DCOUNTA()
*/
-public class TestDCount {
+public class TestDCountA {
- //https://support.microsoft.com/en-us/office/dcount-function-c1fc7b93-fb0d-4d8d-97db-8d5f076eaeb1
+ //https://support.microsoft.com/en-us/office/dcounta-function-00232a6d-5a66-4a01-a25b-c1653fda1244
@Test
void testMicrosoftExample1() throws IOException {
try (HSSFWorkbook wb = initWorkbook1()) {
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
- assertDouble(fe, cell, "DCOUNT(A5:E11,,A1:A2)", 3);
- assertDouble(fe, cell, "DCOUNT(A5:E11, \"Age\", A1:A2)", 2);
- assertDouble(fe, cell, "DCOUNT(A5:E11, \"Age\", A1:F2)", 1);
- assertDouble(fe, cell, "DCOUNT(A5:E11, 3, A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, \"Profit\", A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, 5, A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, , A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, \"Profit\", A1:F2)", 1);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, \"Profit\", A1:F3)", 3);
+ assertDouble(fe, cell, "DCOUNTA(A4:E10, \"Age\", A1:F3)", 2);
}
}
@@ -52,14 +54,13 @@ public class TestDCount {
addRow(sheet, 0, "Tree", "Height", "Age", "Yield", "Profit", "Height");
addRow(sheet, 1, "=Apple", ">10", null, null, null, "<16");
addRow(sheet, 2, "=Pear");
- addRow(sheet, 3);
- addRow(sheet, 4, "Tree", "Height", "Age", "Yield", "Profit");
- addRow(sheet, 5, "Apple", 18, 20, 14, 105);
- addRow(sheet, 6, "Pear", 12, 12, 10, 96);
- addRow(sheet, 7, "Cherry", 13, 14, 9, 105);
- addRow(sheet, 8, "Apple", 14, null, 10, 75);
- addRow(sheet, 9, "Pear", 9, 8, 8, 77);
- addRow(sheet, 10, "Apple", 12, 11, 6, 45);
+ addRow(sheet, 3, "Tree", "Height", "Age", "Yield", "Profit");
+ addRow(sheet, 4, "Apple", 18, 20, 14, 105);
+ addRow(sheet, 5, "Pear", 12, 12, 10, 96);
+ addRow(sheet, 6, "Cherry", 13, 14, 9, 105);
+ addRow(sheet, 7, "Apple", 14, null, 10, 75);
+ addRow(sheet, 8, "Pear", 9, 8, 8, "$77");
+ addRow(sheet, 9, "Apple", 8, 9, 6, 45);
return wb;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org