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/23 13:49:51 UTC
svn commit: r1901171 - in /poi/trunk/poi/src: main/java/org/apache/poi/ss/formula/atp/ main/java/org/apache/poi/ss/formula/functions/ test/java/org/apache/poi/ss/formula/functions/
Author: fanningpj
Date: Mon May 23 13:49:50 2022
New Revision: 1901171
URL: http://svn.apache.org/viewvc?rev=1901171&view=rev
Log:
partial implementation FLOOR.MATH function (needs more testing and bad param support)
Added:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FloorMath.java
- copied, changed from r1901169, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFloorMath.java
- copied, changed from r1901167, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.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/functions/CeilingMath.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.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=1901171&r1=1901170&r2=1901171&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 Mon May 23 13:49:50 2022
@@ -112,6 +112,7 @@ public final class AnalysisToolPak imple
r(m, "ERF", null);
r(m, "ERFC", null);
r(m, "FACTDOUBLE", FactDouble.instance);
+ r(m, "FLOOR.MATH", FloorMath.instance);
r(m, "FVSCHEDULE", null);
r(m, "GCD", Gcd.instance);
r(m, "GESTEP", null);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java?rev=1901171&r1=1901170&r2=1901171&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java Mon May 23 13:49:50 2022
@@ -24,9 +24,10 @@ 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.RoundingMode;
+import static org.apache.poi.ss.formula.functions.MathX.scaledRoundUsingBigDecimal;
+
/**
* Implementation for Excel CEILING.MATH() function.
* <ul>
@@ -61,12 +62,12 @@ public final class CeilingMath implement
}
if (roundNegativeNumsDown && xval < 0.0) {
if (multiplier != 1.0) {
- return new NumberEval(roundUsingBigDecimal(xval, multiplier, RoundingMode.FLOOR));
+ return new NumberEval(scaledRoundUsingBigDecimal(xval, multiplier, RoundingMode.FLOOR));
}
return new NumberEval(Math.floor(xval));
}
if (multiplier != 1.0) {
- return new NumberEval(roundUsingBigDecimal(xval, multiplier, RoundingMode.CEILING));
+ return new NumberEval(scaledRoundUsingBigDecimal(xval, multiplier, RoundingMode.CEILING));
}
return new NumberEval(Math.ceil(xval));
} catch (EvaluationException evaluationException) {
@@ -74,14 +75,6 @@ public final class CeilingMath implement
}
}
- private double roundUsingBigDecimal(double xval, double multiplier, RoundingMode mode) {
- BigDecimal multiplierDecimal = BigDecimal.valueOf(multiplier);
- BigDecimal bd = BigDecimal.valueOf(xval).divide(multiplierDecimal)
- .setScale(0, mode)
- .multiply(multiplierDecimal);
- return bd.doubleValue();
- }
-
private static Double evaluateValue(ValueEval arg, int srcRowIndex, int srcColumnIndex) throws EvaluationException {
ValueEval veText = OperandResolver.getSingleValue(arg, srcRowIndex, srcColumnIndex);
String strText1 = OperandResolver.coerceValueToString(veText);
Copied: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FloorMath.java (from r1901169, poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FloorMath.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FloorMath.java&p1=poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java&r1=1901169&r2=1901171&rev=1901171&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/FloorMath.java Mon May 23 13:49:50 2022
@@ -24,20 +24,21 @@ 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.RoundingMode;
+import static org.apache.poi.ss.formula.functions.MathX.scaledRoundUsingBigDecimal;
+
/**
- * Implementation for Excel CEILING.MATH() function.
+ * Implementation for Excel FLOOR.MATH() function.
* <ul>
- * <li>https://support.microsoft.com/en-us/office/ceiling-math-function-80f95d2f-b499-4eee-9f16-f795a8e306c8</li>
+ * <li>https://support.microsoft.com/en-us/office/floor-math-function-c302b599-fbdb-4177-ba19-2c2b1249a2f5</li>
* </ul>
*/
-public final class CeilingMath implements FreeRefFunction {
+public final class FloorMath implements FreeRefFunction {
- public static final CeilingMath instance = new CeilingMath();
+ public static final FloorMath instance = new FloorMath();
- private CeilingMath() {}
+ private FloorMath() {}
@Override
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
@@ -61,27 +62,19 @@ public final class CeilingMath implement
}
if (roundNegativeNumsDown && xval < 0.0) {
if (multiplier != 1.0) {
- return new NumberEval(roundUsingBigDecimal(xval, multiplier, RoundingMode.FLOOR));
+ return new NumberEval(scaledRoundUsingBigDecimal(xval, multiplier, RoundingMode.CEILING));
}
- return new NumberEval(Math.floor(xval));
+ return new NumberEval(Math.ceil(xval));
}
if (multiplier != 1.0) {
- return new NumberEval(roundUsingBigDecimal(xval, multiplier, RoundingMode.CEILING));
+ return new NumberEval(scaledRoundUsingBigDecimal(xval, multiplier, RoundingMode.FLOOR));
}
- return new NumberEval(Math.ceil(xval));
+ return new NumberEval(Math.floor(xval));
} catch (EvaluationException evaluationException) {
return evaluationException.getErrorEval();
}
}
- private double roundUsingBigDecimal(double xval, double multiplier, RoundingMode mode) {
- BigDecimal multiplierDecimal = BigDecimal.valueOf(multiplier);
- BigDecimal bd = BigDecimal.valueOf(xval).divide(multiplierDecimal)
- .setScale(0, mode)
- .multiply(multiplierDecimal);
- return bd.doubleValue();
- }
-
private static Double evaluateValue(ValueEval arg, int srcRowIndex, int srcColumnIndex) throws EvaluationException {
ValueEval veText = OperandResolver.getSingleValue(arg, srcRowIndex, srcColumnIndex);
String strText1 = OperandResolver.coerceValueToString(veText);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java?rev=1901171&r1=1901170&r2=1901171&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java Mon May 23 13:49:50 2022
@@ -19,6 +19,9 @@ package org.apache.poi.ss.formula.functi
import org.apache.poi.ss.util.NumberToTextConverter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
/**
* This class is an extension to the standard math library
* provided by java.lang.Math class. It follows the Math class
@@ -231,7 +234,13 @@ final class MathX {
if (s==0 && n!=0) {
return Double.NaN;
} else {
- return (n==0 || s==0) ? 0 : Math.floor(n/s) * s;
+ if (n == 0.0 || s == 0.0) {
+ return 0.0;
+ } else if (s == 1.0) {
+ return Math.floor(n);
+ } else {
+ return scaledRoundUsingBigDecimal(n, s, RoundingMode.FLOOR);
+ }
}
}
@@ -254,10 +263,24 @@ final class MathX {
if (n>0 && s<0) {
return Double.NaN;
} else {
- return (n == 0 || s == 0) ? 0 : Math.ceil(n/s) * s;
+ if (n == 0.0 || s == 0.0) {
+ return 0.0;
+ } else if (s == 1.0) {
+ return Math.ceil(n);
+ } else {
+ return scaledRoundUsingBigDecimal(n, s, RoundingMode.CEILING);
+ }
}
}
+ public static double scaledRoundUsingBigDecimal(double xval, double multiplier, RoundingMode mode) {
+ BigDecimal multiplierDecimal = BigDecimal.valueOf(multiplier);
+ BigDecimal bd = BigDecimal.valueOf(xval).divide(multiplierDecimal)
+ .setScale(0, mode)
+ .multiply(multiplierDecimal);
+ return bd.doubleValue();
+ }
+
/**
* <br> for all n >= 1; factorial n = n * (n-1) * (n-2) * ... * 1
* <br> else if n == 0; factorial n = 1
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java?rev=1901171&r1=1901170&r2=1901171&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java Mon May 23 13:49:50 2022
@@ -22,8 +22,6 @@ import org.apache.poi.hssf.usermodel.HSS
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.ErrorEval;
import org.apache.poi.ss.usermodel.FormulaError;
import org.junit.jupiter.api.Test;
@@ -37,8 +35,6 @@ import static org.apache.poi.ss.util.Uti
*/
final class TestCeilingMath {
- private static final OperationEvaluationContext ec = new OperationEvaluationContext(null, null, 0, 0, 0, null);
-
//https://support.microsoft.com/en-us/office/ceiling-math-function-80f95d2f-b499-4eee-9f16-f795a8e306c8
@Test
void testMicrosoftExamples() throws IOException {
Copied: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFloorMath.java (from r1901167, poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java)
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFloorMath.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFloorMath.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java&r1=1901167&r2=1901171&rev=1901171&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCeilingMath.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFloorMath.java Mon May 23 13:49:50 2022
@@ -22,8 +22,6 @@ import org.apache.poi.hssf.usermodel.HSS
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.ErrorEval;
import org.apache.poi.ss.usermodel.FormulaError;
import org.junit.jupiter.api.Test;
@@ -33,13 +31,11 @@ import static org.apache.poi.ss.util.Uti
import static org.apache.poi.ss.util.Utils.assertError;
/**
- * Tests for {@link CeilingMath}
+ * Tests for {@link FloorMath}
*/
-final class TestCeilingMath {
+final class TestFloorMath {
- private static final OperationEvaluationContext ec = new OperationEvaluationContext(null, null, 0, 0, 0, null);
-
- //https://support.microsoft.com/en-us/office/ceiling-math-function-80f95d2f-b499-4eee-9f16-f795a8e306c8
+ //https://support.microsoft.com/en-us/office/floor-math-function-c302b599-fbdb-4177-ba19-2c2b1249a2f5
@Test
void testMicrosoftExamples() throws IOException {
try (HSSFWorkbook wb = new HSSFWorkbook()) {
@@ -47,10 +43,10 @@ final class TestCeilingMath {
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- assertDouble(fe, cell, "CEILING.MATH(24.3,5)", 25.0, 0.00000000000001);
- assertDouble(fe, cell, "CEILING.MATH(6.7)", 7.0, 0.00000000000001);
- assertDouble(fe, cell, "CEILING.MATH(-8.1,2)", -8.0, 0.00000000000001);
- assertDouble(fe, cell, "CEILING.MATH(-5.5,2,-1)", -6.0, 0.00000000000001);
+ assertDouble(fe, cell, "FLOOR.MATH(24.3,5)", 20.0, 0.00000000000001);
+ assertDouble(fe, cell, "FLOOR.MATH(6.7)", 6.0, 0.00000000000001);
+ assertDouble(fe, cell, "FLOOR.MATH(-8.1,2)", -10.0, 0.00000000000001);
+ assertDouble(fe, cell, "FLOOR.MATH(-5.5,2,-1)", -4.0, 0.00000000000001);
}
}
@@ -61,7 +57,7 @@ final class TestCeilingMath {
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- assertError(fe, cell, "CEILING.MATH()", FormulaError.VALUE);
+ assertError(fe, cell, "FLOOR.MATH()", FormulaError.VALUE);
}
}
@@ -72,7 +68,7 @@ final class TestCeilingMath {
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
- assertError(fe, cell, "CEILING.MATH(\"abc\")", FormulaError.NUM);
+ assertError(fe, cell, "FLOOR.MATH(\"abc\")", FormulaError.NUM);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org