Skip to content

Add optional precision for Float#floor #4343

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

Merged
enebo merged 1 commit into from
Nov 29, 2016
Merged

Add optional precision for Float#floor #4343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 50 additions & 5 deletions core/src/main/java/org/jruby/RubyFloat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,56 @@ public IRubyObject rationalize(ThreadContext context, IRubyObject[] args) {
/** floor
*
*/
@JRubyMethod(name = "floor")
@Override
public IRubyObject floor() {
return dbl2num(getRuntime(), Math.floor(value));
}

@Override
public IRubyObject floor() {
return dbl2num(getRuntime(), Math.floor(value));
}

@JRubyMethod(name = "floor", optional = 1)
public IRubyObject floor(ThreadContext context, IRubyObject[] args) {
if (args.length == 0) return floor();

double number = value;
double digits = num2long(args[0]);
double magnifier = Math.pow(10.0, Math.abs(digits));
double reducer = Math.pow(10.0, -Math.abs(digits));

// Borrowed from round
double binexp;
if (value == 0) {
binexp = 0;
} else {
binexp = Math.ceil(Math.log(value)/Math.log(2));
}

if (digits >= (DIG+2) - (binexp > 0 ? binexp / 4 : binexp / 3 - 1)) {
return RubyFloat.newFloat(context.runtime, value);
}
if (digits < -(binexp > 0 ? binexp / 3 + 1 : binexp / 4)) {
return dbl2num(context.runtime, (long) 0);
}

if (digits > 0) {
number = Math.floor(value * magnifier) / magnifier;
}

if (digits < 0) {
number = Math.floor(value * reducer) * magnifier;
}

// Deal with big numbers
if (number > Long.MAX_VALUE || number < Long.MIN_VALUE) {
BigDecimal roundedNumber = new BigDecimal(Double.toString(number));
return RubyBignum.newBignum(context.runtime, roundedNumber.toBigInteger());
}

if (digits > 0) {
return RubyFloat.newFloat(context.runtime, number);
} else {
return dbl2num(context.runtime, number);
}
}

/** flo_ceil
*
Expand Down