Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LANG-1444] NumberUtils.createNumber(), BigDecimal for decimal fractions tending to zero #675

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[LANG-1444] NumberUtils.createNumber(), BigDecimal for decimal fractions tending to zero #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ddff03
LANG-1444
Dec 14, 2020
64e1efc
LANG-1444
Dec 16, 2020
8f03824
LANG-1444
Dec 16, 2020
548c412
LANG-1444
Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/org/apache/commons/lang3/math/NumberUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,13 +798,14 @@ public static Number createNumber(final String str) {
try {
final Float f = createFloat(str);
final Double d = createDouble(str);
final BigDecimal b = createBigDecimal(str);
if (!f.isInfinite()
&& !(f.floatValue() == 0.0F && !allZeros)
&& f.toString().equals(d.toString())) {
&& f.toString().equals(d.toString())
&& (f.toString().equals(b.stripTrailingZeros().toString().replace("+", "")) || b.compareTo(BigDecimal.valueOf(f)) == 0)) {
return f;
}
if (!d.isInfinite() && !(d.doubleValue() == 0.0D && !allZeros)) {
final BigDecimal b = createBigDecimal(str);
if (b.compareTo(BigDecimal.valueOf(d.doubleValue())) == 0) {
return d;
}
Expand Down
21 changes: 21 additions & 0 deletions src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,27 @@ public void testCreateNumberMagnitude() {
assertEquals(new BigInteger("1777777777777777777777", 8), NumberUtils.createNumber("01777777777777777777777"));
}

@Test
//LANG-1444
void testCheckDataTypeForFloatDoubleBigDecimal() {
assertEquals(NumberUtils.createNumber("1.1").getClass().getName(), Float.class.getName());
assertEquals(NumberUtils.createNumber("1.0000001").getClass().getName(), Float.class.getName());
assertEquals(NumberUtils.createNumber("1.000000001").getClass().getName(), Double.class.getName());
assertEquals(NumberUtils.createNumber("1.000000000000001").getClass().getName(), Double.class.getName());
assertEquals(NumberUtils.createNumber("1.00000000000000001").getClass().getName(), BigDecimal.class.getName());
assertEquals(NumberUtils.createNumber("1.00000000000000000000001").getClass().getName(), BigDecimal.class.getName());
}

@Test
void testCheckPrecisionNotLostFloatDoubleBigDecimal() {
assertEquals(NumberUtils.createNumber("1.1"), Float.valueOf("1.1"));
assertEquals(NumberUtils.createNumber("1.0000001"), Float.valueOf("1.0000001"));
assertEquals(NumberUtils.createNumber("1.000000001"), Double.valueOf("1.000000001"));
assertEquals(NumberUtils.createNumber("1.000000000000001"), Double.valueOf("1.000000000000001"));
assertEquals(NumberUtils.createNumber("1.00000000000000001"), new BigDecimal("1.00000000000000001"));
assertEquals(NumberUtils.createNumber("1.00000000000000000000001"), new BigDecimal("1.00000000000000000000001"));
}

/**
* Tests isCreatable(String) and tests that createNumber(String) returns a valid number iff isCreatable(String)
* returns false.
Expand Down