From 5a14a1d690b2c543ca7812d8165036c8ada88c72 Mon Sep 17 00:00:00 2001 From: Rachel Dowdall Date: Thu, 20 Mar 2014 21:26:51 +0000 Subject: Added various simple functions to math module. --- py/builtinmath.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'py/builtinmath.c') diff --git a/py/builtinmath.c b/py/builtinmath.c index 661638b739..75da8aff65 100644 --- a/py/builtinmath.c +++ b/py/builtinmath.c @@ -40,6 +40,24 @@ MATH_FUN_1(acos, acos) MATH_FUN_1(asin, asin) MATH_FUN_1(atan, atan) MATH_FUN_2(atan2, atan2) +MATH_FUN_1(ceil, ceil) +MATH_FUN_2(copysign, copysign) +MATH_FUN_1(fabs, fabs) +MATH_FUN_1(floor, floor) //TODO: delegate to x.__floor__() if x is not a float +MATH_FUN_2(fmod, fmod) +//MATH_FUN_1(frexp, frexp) +MATH_FUN_1(isfinite, isfinite) +MATH_FUN_1(isinf, isinf) +MATH_FUN_1(isnan, isnan) +MATH_FUN_1(trunc, trunc) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//MATH_FUN_1(, ) +//TODO: factorial, fsum, frexp, ldexp, modf STATIC const mp_map_elem_t mp_module_math_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_math) }, @@ -65,6 +83,24 @@ STATIC const mp_map_elem_t mp_module_math_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_asin), (mp_obj_t)&mp_math_asin_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_atan), (mp_obj_t)&mp_math_atan_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_atan2), (mp_obj_t)&mp_math_atan2_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_ceil), (mp_obj_t)&mp_math_ceil_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_copysign), (mp_obj_t)&mp_math_copysign_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_fabs), (mp_obj_t)&mp_math_fabs_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_floor), (mp_obj_t)&mp_math_floor_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_fmod), (mp_obj_t)&mp_math_fmod_obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_frexp), (mp_obj_t)&mp_math_frexp_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_isfinite), (mp_obj_t)&mp_math_isfinite_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_isinf), (mp_obj_t)&mp_math_isinf_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_isnan), (mp_obj_t)&mp_math_isnan_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_trunc), (mp_obj_t)&mp_math_trunc_obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, + //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, }; STATIC const mp_map_t mp_module_math_globals = { -- cgit v1.2.3 From a2f2f734ed5ee1294a44592448e5b0f45a12e254 Mon Sep 17 00:00:00 2001 From: Rachel Dowdall Date: Thu, 20 Mar 2014 21:30:38 +0000 Subject: Added various simple functions to math module. --- py/builtinmath.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'py/builtinmath.c') diff --git a/py/builtinmath.c b/py/builtinmath.c index 75da8aff65..fd1368ce3c 100644 --- a/py/builtinmath.c +++ b/py/builtinmath.c @@ -50,13 +50,7 @@ MATH_FUN_1(isfinite, isfinite) MATH_FUN_1(isinf, isinf) MATH_FUN_1(isnan, isnan) MATH_FUN_1(trunc, trunc) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) -//MATH_FUN_1(, ) + //TODO: factorial, fsum, frexp, ldexp, modf STATIC const mp_map_elem_t mp_module_math_globals_table[] = { @@ -93,14 +87,6 @@ STATIC const mp_map_elem_t mp_module_math_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_isinf), (mp_obj_t)&mp_math_isinf_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_isnan), (mp_obj_t)&mp_math_isnan_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_trunc), (mp_obj_t)&mp_math_trunc_obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, - //{ MP_OBJ_NEW_QSTR(MP_QSTR_), (mp_obj_t)&mp_math__obj }, }; STATIC const mp_map_t mp_module_math_globals = { -- cgit v1.2.3