djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modbuiltins: Implement round() to precision.

Browse Source
This commit is contained in:
Sebastian Plamauer 2015-07-14 14:44:31 +02:00 committed by Paul Sokolovsky
parent ab14c30493
commit 1e8ca3a3cf
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/modbuiltins.c
View File

@ -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); 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) { 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]; mp_obj_t o_in = args[0];
if (MP_OBJ_IS_INT(o_in)) { if (MP_OBJ_IS_INT(o_in)) {
return o_in; return o_in;
@ -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; mp_int_t num_dig = 0;
if (n_args > 1) { if (n_args > 1) {
num_dig = mp_obj_get_int(args[1]); num_dig = mp_obj_get_int(args[1]);
if (num_dig > 0) { mp_float_t val = mp_obj_get_float(o_in);
mp_not_implemented("round(..., N>0)"); 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 val = mp_obj_get_float(o_in);
mp_float_t rounded = MICROPY_FLOAT_C_FUN(round)(val); mp_float_t rounded = MICROPY_FLOAT_C_FUN(round)(val);

2
tests/basics/builtin_round.py
View File

@ -2,7 +2,7 @@
tests = [ tests = [
False, True, False, True,
0, 1, -1, 10, 0, 1, -1, 10
] ]
for t in tests: for t in tests:
print(round(t)) print(round(t))

5
tests/float/builtin_float_round.py
View File

@ -2,10 +2,11 @@
# check basic cases # check basic cases
tests = [ 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: for t in tests:
print(round(t)) print(round(*t))
# check .5 cases # check .5 cases
for i in range(11): for i in range(11):