Author: fanningpj
Date: Fri Apr 29 22:28:35 2022
New Revision: 1900406
URL: http://svn.apache.org/viewvc?rev=1900406&view=rev
Log:
support gcd function
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java
(with props)
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestGcd.java
- copied, changed from r1900393,
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=1900406&r1=1900405&r2=1900406&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 Apr 29 22:28:35 2022
@@ -112,7 +112,7 @@ public final class AnalysisToolPak imple
r(m, "ERFC", null);
r(m, "FACTDOUBLE", FactDouble.instance);
r(m, "FVSCHEDULE", null);
- r(m, "GCD", null);
+ r(m, "GCD", Gcd.instance);
r(m, "GESTEP", null);
r(m, "HEX2BIN", null);
r(m, "HEX2DEC", Hex2Dec.instance);
Added: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java?rev=1900406&view=auto
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java
(added)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java
Fri Apr 29 22:28:35 2022
@@ -0,0 +1,69 @@
+/* ====================================================================
+ 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.commons.math3.util.ArithmeticUtils;
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.ValueEval;
+
+import java.util.ArrayList;
+
+public class Gcd implements FreeRefFunction {
+
+ public static final Gcd instance = new Gcd();
+
+ @Override
+ public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec)
{
+ if (args.length < 1) {
+ return ErrorEval.VALUE_INVALID;
+ } else if (args.length == 1) {
+ try {
+ ValueEval v1 = OperandResolver.getSingleValue(args[0],
ec.getRowIndex(), ec.getColumnIndex());
+ long l = (long)OperandResolver.coerceValueToDouble(v1);
+ if (l < 0) {
+ return ErrorEval.NUM_ERROR;
+ }
+ return new NumberEval(l);
+ } catch (EvaluationException ee) {
+ return ErrorEval.VALUE_INVALID;
+ }
+ } else {
+ try {
+ ArrayList<Long> evals = new ArrayList<>();
+ for (int i = 0; i < args.length; i++) {
+ ValueEval ve = OperandResolver.getSingleValue(args[i],
ec.getRowIndex(), ec.getColumnIndex());
+ long l = (long)OperandResolver.coerceValueToDouble(ve);
+ if (l < 0) {
+ return ErrorEval.NUM_ERROR;
+ }
+ evals.add(l);
+ }
+ long result = evals.get(0);
+ for (int i = 1; i < evals.size(); i++) {
+ result = ArithmeticUtils.gcd(result, evals.get(i));
+ }
+ return new NumberEval(result);
+ } catch (EvaluationException ee) {
+ return ErrorEval.VALUE_INVALID;
+ }
+ }
+ }
+}
Propchange:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Gcd.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestGcd.java
(from r1900393,
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/TestGcd.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestGcd.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNormDist.java&r1=1900393&r2=1900406&rev=1900406&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/TestGcd.java
Fri Apr 29 22:28:35 2022
@@ -22,7 +22,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.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;
@@ -31,75 +30,56 @@ import org.apache.poi.ss.formula.eval.Va
import org.junit.jupiter.api.Test;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
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 NormDist}
+ * Tests for {@link Gcd}
*/
-final class TestNormDist {
+final class TestGcd {
private static final OperationEvaluationContext ec = new
OperationEvaluationContext(null, null, 0, 0, 0, null);
+
//https://support.microsoft.com/en-us/office/gcd-function-d5107a51-69e3-461f-8e4c-ddfc21b5073a
@Test
void testBasic() {
- confirmValue("42", "40", "1.5", true, 0.908788780274132);
- confirmValue("42", "40", "1.5", false, 0.109340049783996);
- }
-
- @Test
- void testInvalid() {
- confirmInvalidError("A1","B2","C2", false);
+ confirmValue(Arrays.asList(5, 2), 1.0);
+ confirmValue(Arrays.asList(24, 36), 12.0);
+ confirmValue(Arrays.asList(7, 1), 1.0);
+ confirmValue(Arrays.asList(5, 0), 5.0);
+ confirmValue(Arrays.asList(10, 5, 0), 5.0);
+ confirmValue(Arrays.asList(10.9, 5, 0), 5.0);
}
@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);
+ confirmNumError(Arrays.asList(-1));
+ confirmNumError(Arrays.asList(10, -1));
}
-
//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
- @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");
- 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);
+ private static ValueEval invokeValue(List<Number> numberList) {
+ ValueEval[] args = new ValueEval[numberList.size()];
+ int i = 0;
+ for (Number num : numberList) {
+ args[i++] = new NumberEval(num.doubleValue());
}
+ return Gcd.instance.evaluate(args, ec);
}
- 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 void confirmValue(String number1, String number2, String
number3, boolean cumulative, double expected) {
- ValueEval result = invokeValue(number1, number2, number3, cumulative);
+ private static void confirmValue(List<Number> numberList, double expected)
{
+ ValueEval result = invokeValue(numberList);
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);
- 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(List<Number> numberList) {
+ ValueEval result = invokeValue(numberList);
assertEquals(ErrorEval.class, result.getClass());
assertEquals(ErrorEval.NUM_ERROR, result);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
