Author: onealj
Date: Thu Jul 13 03:35:06 2017
New Revision: 1801798
URL: http://svn.apache.org/viewvc?rev=1801798&view=rev
Log:
github #43: fix roundUp and roundDown.
Thanks to @FishMeat on github for the patch.
This closes #43 on github.
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java?rev=1801798&r1=1801797&r2=1801798&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/MathX.java Thu Jul
13 03:35:06 2017
@@ -48,16 +48,7 @@ final class MathX {
* @param p
*/
public static double round(double n, int p) {
- double retval;
-
- if (Double.isNaN(n) || Double.isInfinite(n)) {
- retval = Double.NaN;
- }
- else {
- retval = new
java.math.BigDecimal(NumberToTextConverter.toText(n)).setScale(p,
java.math.RoundingMode.HALF_UP).doubleValue();
- }
-
- return retval;
+ return round(n, p, java.math.RoundingMode.HALF_UP);
}
/**
@@ -76,16 +67,7 @@ final class MathX {
* @param p
*/
public static double roundUp(double n, int p) {
- double retval;
-
- if (Double.isNaN(n) || Double.isInfinite(n)) {
- retval = Double.NaN;
- }
- else {
- retval = java.math.BigDecimal.valueOf(n).setScale(p,
java.math.RoundingMode.UP).doubleValue();
- }
-
- return retval;
+ return round(n, p, java.math.RoundingMode.UP);
}
/**
@@ -104,13 +86,17 @@ final class MathX {
* @param p
*/
public static double roundDown(double n, int p) {
+ return round(n, p, java.math.RoundingMode.DOWN);
+ }
+
+ private static double round(double n, int p, java.math.RoundingMode
rounding) {
double retval;
if (Double.isNaN(n) || Double.isInfinite(n)) {
retval = Double.NaN;
}
else {
- retval = java.math.BigDecimal.valueOf(n).setScale(p,
java.math.RoundingMode.DOWN).doubleValue();
+ retval = new
java.math.BigDecimal(NumberToTextConverter.toText(n)).setScale(p,
rounding).doubleValue();
}
return retval;
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java?rev=1801798&r1=1801797&r2=1801798&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
Thu Jul 13 03:35:06 2017
@@ -750,7 +750,7 @@ public class TestMathX extends AbstractN
d = 150.0; p = -2;
assertEquals("roundDown ", 100, MathX.roundDown(d, p));
- d = 0.049999999999999975d; p = 2;
+ d = 0.0499999999999975d; p = 2;
assertEquals("roundDown ", 0.04d, MathX.roundDown(d, p));
d = 0.049999999999999975d; p = 1;
@@ -839,13 +839,16 @@ public class TestMathX extends AbstractN
d = Double.MAX_VALUE; p = 1;
assertEquals("roundUp ", Double.MAX_VALUE, MathX.roundUp(d, p));
+ // Excel's min positive value is several orders of magnitude larger
than Java's (Java 8: 4.9e-324, Excel 2016 on Windows 10: 2.2259157957E-308)
d = Double.MIN_VALUE; p = 1;
+ assertEquals("roundUp ", 0.0d, MathX.roundUp(d, p));
+ d = 2.2259157957E-308; p = 1;
assertEquals("roundUp ", 0.1d, MathX.roundUp(d, p));
//github-43: https://github.com/apache/poi/pull/43
- //@Ignore("ROUNDUP(3987*0.2, 2) currently fails by returning 797.41")
- //d = 3987 * 0.2; p = 2;
- //assertEquals("roundUp ", 797.40, MathX.roundUp(d, p));
+ // "ROUNDUP(3987*0.2, 2) currently fails by returning 797.41")
+ d = 3987 * 0.2; p = 2;
+ assertEquals("roundUp ", 797.40, MathX.roundUp(d, p));
}
public void testCeiling() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
