Skip to content

Efficient round #946

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

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

Efficient round #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ad1aa1
Use Math.round().
ghislainfourny Mar 31, 2021
6b4309c
Fix.
ghislainfourny Mar 31, 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
10 changes: 10 additions & 0 deletions src/main/java/org/rumbledb/items/ItemFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public class ItemFactory {
private Item zeroItem;
private Item positiveInfinityDoubleItem;
private Item negativeInfinityDoubleItem;
private Item positiveZeroDoubleItem;
private Item negativeZeroDoubleItem;
private Item NaNDoubleItem;

public static ItemFactory getInstance() {
Expand All @@ -30,6 +32,8 @@ public static ItemFactory getInstance() {
instance.zeroItem = new IntItem(0);
instance.positiveInfinityDoubleItem = new DoubleItem(Double.POSITIVE_INFINITY);
instance.negativeInfinityDoubleItem = new DoubleItem(Double.NEGATIVE_INFINITY);
instance.positiveZeroDoubleItem = new DoubleItem(0.0);
instance.negativeZeroDoubleItem = new DoubleItem(-0.0);
instance.NaNDoubleItem = new DoubleItem(Double.NaN);
}
return instance;
Expand Down Expand Up @@ -86,6 +90,12 @@ public Item createDoubleItem(double d) {
if (d == Double.NEGATIVE_INFINITY) {
return this.negativeInfinityDoubleItem;
}
if (d == 0.0) {
return this.positiveZeroDoubleItem;
}
if (d == 0.0) {
return this.negativeZeroDoubleItem;
}
if (d == Double.NaN) {
return this.NaNDoubleItem;
}
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/org/rumbledb/runtime/functions/numerics/RoundFunctionIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,37 @@ public Item materializeFirstItemOrNull(DynamicContext dynamicContext) {
return ItemFactory.getInstance().createDecimalItem(bd);
}
if (value.isDouble()) {
if (precision == 0) {
double dvalue = value.getDoubleValue();
long result = Math.round(dvalue);
if (result != 0) {
return ItemFactory.getInstance().createDoubleItem((double) result);
} else {
if (Math.signum(dvalue) == 1) {
return ItemFactory.getInstance().createDoubleItem(0.0);
} else {
return ItemFactory.getInstance().createDoubleItem(-0.0);
}
}
}
BigDecimal bd = new BigDecimal(value.getDoubleValue());
bd = bd.setScale(precision, RoundingMode.HALF_UP);
return ItemFactory.getInstance().createDoubleItem(bd.doubleValue());
}
if (value.isFloat()) {
if (precision == 0) {
float fvalue = value.getFloatValue();
long result = Math.round(fvalue);
if (result != 0) {
ItemFactory.getInstance().createDoubleItem((double) result);
} else {
if (Math.signum(fvalue) == 1) {
return ItemFactory.getInstance().createDoubleItem(0.0);
} else {
return ItemFactory.getInstance().createDoubleItem(-0.0);
}
}
}
BigDecimal bd = new BigDecimal(value.getFloatValue());
bd = bd.setScale(precision, RoundingMode.HALF_UP);
return ItemFactory.getInstance().createFloatItem(bd.floatValue());
Expand Down