Thanks to visit codestin.com
Credit goes to github.com

Skip to content

py: implemented rounding floats to precision #1382

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

Closed
wants to merge 1 commit into from
Closed

py: implemented rounding floats to precision #1382

Show file tree
Hide file tree
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
9 changes: 5 additions & 4 deletions py/modbuiltins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr);

STATIC mp_obj_t mp_builtin_round(mp_uint_t n_args, const mp_obj_t *args) {
// TODO really support second arg
mp_obj_t o_in = args[0];
if (MP_OBJ_IS_INT(o_in)) {
return o_in;
Expand All @@ -440,9 +439,11 @@ STATIC mp_obj_t mp_builtin_round(mp_uint_t n_args, const mp_obj_t *args) {
mp_int_t num_dig = 0;
if (n_args > 1) {
num_dig = mp_obj_get_int(args[1]);
if (num_dig > 0) {
mp_not_implemented("round(..., N>0)");
}
mp_float_t val = mp_obj_get_float(o_in);
mp_float_t mult = MICROPY_FLOAT_C_FUN(pow)(10, num_dig);
// TODO may lead to overflow
mp_float_t rounded = MICROPY_FLOAT_C_FUN(round)(val * mult) / mult;
return mp_obj_new_float(rounded);
}
mp_float_t val = mp_obj_get_float(o_in);
mp_float_t rounded = MICROPY_FLOAT_C_FUN(round)(val);
Expand Down
2 changes: 1 addition & 1 deletion tests/basics/builtin_round.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

tests = [
False, True,
0, 1, -1, 10,
0, 1, -1, 10
]
for t in tests:
print(round(t))
5 changes: 3 additions & 2 deletions tests/float/builtin_float_round.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

# check basic cases
tests = [
0.0, 1.0, 0.1, -0.1, 123.4, 123.6, -123.4, -123.6
[0.0], [1.0], [0.1], [-0.1], [123.4], [123.6], [-123.4], [-123.6],
[1.234567, 5], [1.23456, 1], [1.23456, 0], [1234.56, -2]
]
for t in tests:
print(round(t))
print(round(*t))

# check .5 cases
for i in range(11):
Expand Down