Added various simple functions to math module.
This commit is contained in:
parent
d02f6eaa10
commit
5a14a1d690
|
@ -40,6 +40,24 @@ MATH_FUN_1(acos, acos)
|
||||||
MATH_FUN_1(asin, asin)
|
MATH_FUN_1(asin, asin)
|
||||||
MATH_FUN_1(atan, atan)
|
MATH_FUN_1(atan, atan)
|
||||||
MATH_FUN_2(atan2, atan2)
|
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[] = {
|
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) },
|
{ 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_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_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_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 = {
|
STATIC const mp_map_t mp_module_math_globals = {
|
||||||
|
|
|
@ -141,6 +141,16 @@ Q(acos)
|
||||||
Q(asin)
|
Q(asin)
|
||||||
Q(atan)
|
Q(atan)
|
||||||
Q(atan2)
|
Q(atan2)
|
||||||
|
Q(ceil)
|
||||||
|
Q(copysign)
|
||||||
|
Q(fabs)
|
||||||
|
Q(floor)
|
||||||
|
Q(fmod)
|
||||||
|
Q(frexp)
|
||||||
|
Q(isfinite)
|
||||||
|
Q(isinf)
|
||||||
|
Q(isnan)
|
||||||
|
Q(trunc)
|
||||||
|
|
||||||
Q(mem_total)
|
Q(mem_total)
|
||||||
Q(mem_current)
|
Q(mem_current)
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
# Tests the functions imported from math
|
||||||
|
|
||||||
|
from math import *
|
||||||
|
|
||||||
|
test_values = [-100., -1.23456, -1, -0.5, 0.0, 0.5, 1.23456, 100.]
|
||||||
|
p_test_values = [0.1, 0.5, 1.23456]
|
||||||
|
unit_range_test_values = [-1., -0.75, -0.5, -0.25, 0., 0.25, 0.5, 0.75, 1.]
|
||||||
|
#IEEE_test_values = [1, 0, float('NaN'), float('Inf'), -float('NaN'), -float('Inf')]
|
||||||
|
#TODO: float('NaN')
|
||||||
|
|
||||||
|
functions = [(sqrt, p_test_values),
|
||||||
|
(exp, test_values),
|
||||||
|
(expm1, test_values),
|
||||||
|
(log, p_test_values),
|
||||||
|
(log2, p_test_values),
|
||||||
|
(log10, p_test_values),
|
||||||
|
(cosh, test_values),
|
||||||
|
(sinh, test_values),
|
||||||
|
(tanh, test_values),
|
||||||
|
(acosh, [1.0, 5.0, 1.0]),
|
||||||
|
(asinh, test_values),
|
||||||
|
(atanh, [-0.99, -0.5, 0.0, 0.5, 0.99]),
|
||||||
|
(cos, test_values),
|
||||||
|
(sin, test_values),
|
||||||
|
(tan, test_values),
|
||||||
|
(acos, unit_range_test_values),
|
||||||
|
(asin, unit_range_test_values),
|
||||||
|
(atan, test_values),
|
||||||
|
(ceil, test_values),
|
||||||
|
(fabs, test_values),
|
||||||
|
(floor, test_values),
|
||||||
|
#(frexp, test_values),
|
||||||
|
#(isfinite, [1, 0, float('NaN'), float('Inf')])
|
||||||
|
(trunc, test_values)
|
||||||
|
]
|
||||||
|
|
||||||
|
for function, test_vals in functions:
|
||||||
|
for value in test_vals:
|
||||||
|
print("{:8.7f}".format(function(value)))
|
||||||
|
|
||||||
|
binary_functions = [(copysign, [(23., 42.), (-23., 42.), (23., -42.),
|
||||||
|
(-23., -42.), (1., 0.0), (1., -0.0)])
|
||||||
|
]
|
||||||
|
|
||||||
|
#for function, test_vals in binary_functions:
|
||||||
|
# for value1, value2 in test_vals:
|
||||||
|
# print("{:8.7f}".format(function(value1, value2)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue