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/25 18:43:42 UTC
svn commit: r1901253 - 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: Wed May 25 18:43:42 2022
New Revision: 1901253
URL: http://svn.apache.org/viewvc?rev=1901253&view=rev
Log:
add DAVERAGE function support
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java (with props)
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java (with props)
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/DStarRunner.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=1901253&r1=1901252&r2=1901253&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 Wed May 25 18:43:42 2022
@@ -107,7 +107,7 @@ public final class FunctionEval {
retval[39] = NumericFunction.MOD;
retval[40] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DCOUNT);
retval[41] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DSUM);
- // 42: DAVERAGE
+ retval[42] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DAVERAGE);
retval[43] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DMIN);
retval[44] = new DStarRunner(DStarRunner.DStarAlgorithmEnum.DMAX);
// 45: DSTDEV
Added: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java?rev=1901253&view=auto
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java (added)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java Wed May 25 18:43:42 2022
@@ -0,0 +1,54 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.ss.formula.functions;
+
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.NumericValueEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+
+/**
+ * Implementation of the DAverage function:
+ * Gets the average value of a column in an area with given conditions.
+ */
+public final class DAverage implements IDStarAlgorithm {
+ private int count;
+ private double total;
+
+ @Override
+ public boolean processMatch(ValueEval eval) {
+ if (eval instanceof NumericValueEval) {
+ count++;
+ total += ((NumericValueEval)eval).getNumberValue();
+ }
+ return true;
+ }
+
+ @Override
+ public ValueEval getResult() {
+ return count == 0 ? NumberEval.ZERO : new NumberEval(getAverage());
+ }
+
+ private double getAverage() {
+ return BigDecimal.valueOf(total)
+ .divide(BigDecimal.valueOf(count), MathContext.DECIMAL128)
+ .doubleValue();
+ }
+}
Propchange: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DAverage.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1901253&r1=1901252&r2=1901253&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 Wed May 25 18:43:42 2022
@@ -60,6 +60,8 @@ public final class DStarRunner implement
DSUM(DSum::new),
/** @see DCount */
DCOUNT(DCount::new),
+ /** @see DAverage */
+ DAVERAGE(DAverage::new),
;
private final Supplier<IDStarAlgorithm> implSupplier;
Added: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java?rev=1901253&view=auto
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java (added)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java Wed May 25 18:43:42 2022
@@ -0,0 +1,62 @@
+
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+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.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;
+
+/**
+ * Testcase for function DAVERAGE()
+ */
+public class TestDAverage {
+
+ //https://support.microsoft.com/en-us/office/daverage-function-a6a2d5ac-4b4b-48cd-a1d8-7b37834e5aee
+ @Test
+ void testMicrosoftExample1() throws IOException {
+ try (HSSFWorkbook wb = initWorkbook1()) {
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ HSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(12);
+ assertDouble(fe, cell, "DAVERAGE(A4:E10, \"Yield\", A1:B2)", 12);
+ assertDouble(fe, cell, "DAVERAGE(A4:E10, 3, A4:E10)", 13);
+ }
+ }
+
+ private HSSFWorkbook initWorkbook1() {
+ HSSFWorkbook wb = new HSSFWorkbook();
+ HSSFSheet sheet = wb.createSheet();
+ 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, "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, 15, 10, 75);
+ addRow(sheet, 8, "Pear", 9, 8, 8, 76.8);
+ addRow(sheet, 9, "Apple", 8, 9, 6, 45);
+ return wb;
+ }
+}
Propchange: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDAverage.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org