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:28:52 UTC
svn commit: r1901169 - /poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java
Author: fanningpj
Date: Mon May 23 13:28:52 2022
New Revision: 1901169
URL: http://svn.apache.org/viewvc?rev=1901169&view=rev
Log:
partial implementation CEILING.MATH function (needs more testing and bad param support)
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/CeilingMath.java
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=1901169&r1=1901168&r2=1901169&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:28:52 2022
@@ -24,6 +24,9 @@ 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;
+
/**
* Implementation for Excel CEILING.MATH() function.
* <ul>
@@ -46,20 +49,39 @@ public final class CeilingMath implement
if (xval == null) {
return ErrorEval.NUM_ERROR;
}
+ double multiplier = 1.0;
+ if (args.length > 1) {
+ Double arg1Val = evaluateValue(args[1], ec.getRowIndex(), ec.getColumnIndex());
+ multiplier = arg1Val != null ? arg1Val.doubleValue() : 1.0;
+ }
boolean roundNegativeNumsDown = false;
if (args.length > 2) {
Double arg2Val = evaluateValue(args[2], ec.getRowIndex(), ec.getColumnIndex());
roundNegativeNumsDown = arg2Val != null && arg2Val.doubleValue() < 0.0;
}
if (roundNegativeNumsDown && xval < 0.0) {
+ if (multiplier != 1.0) {
+ return new NumberEval(roundUsingBigDecimal(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(Math.ceil(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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org