diff options
author | Damien George <damien.p.george@gmail.com> | 2014-09-11 22:24:45 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-09-11 22:24:45 +0100 |
commit | 20beff9ae3ae50b44022595bcb6d27d195a08963 (patch) | |
tree | 955b0bf0c085f31ad5e34d2909e819eb4180769b /py | |
parent | 953074315e594f5a30f455dc6a1a67340a3e6ea7 (diff) | |
download | micropython-20beff9ae3ae50b44022595bcb6d27d195a08963.tar.gz micropython-20beff9ae3ae50b44022595bcb6d27d195a08963.zip |
py and libm: Add asinf,acosf; print higher precision for float.
Also use less stack space when printing single precision float.
Addition of asinf and acosf addresses issue #851.
Diffstat (limited to 'py')
-rw-r--r-- | py/objcomplex.c | 18 | ||||
-rw-r--r-- | py/objfloat.c | 10 |
2 files changed, 17 insertions, 11 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c index 8e0f638c3e..2768a01e65 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -25,6 +25,7 @@ */ #include <stdlib.h> +#include <stdio.h> #include <assert.h> #include "mpconfig.h" @@ -55,21 +56,26 @@ mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag); STATIC void complex_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_complex_t *o = o_in; #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT - char buf[32]; + char buf[16]; if (o->real == 0) { - format_float(o->imag, buf, sizeof(buf), 'g', 6, '\0'); + format_float(o->imag, buf, sizeof(buf), 'g', 7, '\0'); print(env, "%sj", buf); } else { - format_float(o->real, buf, sizeof(buf), 'g', 6, '\0'); + format_float(o->real, buf, sizeof(buf), 'g', 7, '\0'); print(env, "(%s+", buf); - format_float(o->imag, buf, sizeof(buf), 'g', 6, '\0'); + format_float(o->imag, buf, sizeof(buf), 'g', 7, '\0'); print(env, "%sj)", buf); } #else + char buf[32]; if (o->real == 0) { - print(env, "%.8gj", (double) o->imag); + sprintf(buf, "%.16g", (double)o->imag); + print(env, "%sj", buf); } else { - print(env, "(%.8g+%.8gj)", (double) o->real, (double) o->imag); + sprintf(buf, "%.16g", (double)o->real); + print(env, "(%s+", buf); + sprintf(buf, "%.16g", (double)o->imag); + print(env, "%sj)", buf); } #endif } diff --git a/py/objfloat.c b/py/objfloat.c index 52d484135f..c6734ee780 100644 --- a/py/objfloat.c +++ b/py/objfloat.c @@ -48,18 +48,18 @@ STATIC void float_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_float_t *o = o_in; #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT - char buf[32]; - format_float(o->value, buf, sizeof(buf), 'g', 6, '\0'); + char buf[16]; + format_float(o->value, buf, sizeof(buf), 'g', 7, '\0'); print(env, "%s", buf); - if (strchr(buf, '.') == NULL) { + if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL) { // Python floats always have decimal point print(env, ".0"); } #else char buf[32]; - sprintf(buf, "%.17g", (double) o->value); + sprintf(buf, "%.16g", (double) o->value); print(env, buf); - if (strchr(buf, '.') == NULL) { + if (strchr(buf, '.') == NULL && strchr(buf, 'e') == NULL) { // Python floats always have decimal point print(env, ".0"); } |