py: Fix cmath.log10; fix printing of complex number with negative imag.

dpgeorge · dpgeorge · commit f49782f0058b · 2015-02-02T12:52:14.000Z
diff --git a/py/modcmath.c b/py/modcmath.c
@@ -97,7 +97,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log_obj, mp_cmath_log);
 STATIC mp_obj_t mp_cmath_log10(mp_obj_t z_obj) {
     mp_float_t real, imag;
     mp_obj_get_complex(z_obj, &real, &imag);
-    return mp_obj_new_complex(0.5 * MICROPY_FLOAT_C_FUN(log10)(real*real + imag*imag), MICROPY_FLOAT_C_FUN(atan2)(imag, real));
+    return mp_obj_new_complex(0.5 * MICROPY_FLOAT_C_FUN(log10)(real*real + imag*imag), 0.4342944819032518 * MICROPY_FLOAT_C_FUN(atan2)(imag, real));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log10_obj, mp_cmath_log10);
 
diff --git a/py/objcomplex.c b/py/objcomplex.c
@@ -58,7 +58,10 @@ STATIC void complex_print(void (*print)(void *env, const char *fmt, ...), void *
         print(env, "%sj", buf);
     } else {
         mp_format_float(o->real, buf, sizeof(buf), 'g', 7, '\0');
-        print(env, "(%s+", buf);
+        print(env, "(%s", buf);
+        if (o->imag >= 0) {
+            print(env, "+");
+        }
         mp_format_float(o->imag, buf, sizeof(buf), 'g', 7, '\0');
         print(env, "%sj)", buf);
     }
@@ -69,7 +72,10 @@ STATIC void complex_print(void (*print)(void *env, const char *fmt, ...), void *
         print(env, "%sj", buf);
     } else {
         sprintf(buf, "%.16g", (double)o->real);
-        print(env, "(%s+", buf);
+        print(env, "(%s", buf);
+        if (o->imag >= 0) {
+            print(env, "+");
+        }
         sprintf(buf, "%.16g", (double)o->imag);
         print(env, "%sj)", buf);
     }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log_obj, mp_cmath_log);`
`97`	`97`	`STATIC mp_obj_t mp_cmath_log10(mp_obj_t z_obj) {`
`98`	`98`	`mp_float_t real, imag;`
`99`	`99`	`mp_obj_get_complex(z_obj, &real, &imag);`
`100`		`- return mp_obj_new_complex(0.5 * MICROPY_FLOAT_C_FUN(log10)(realreal + imagimag), MICROPY_FLOAT_C_FUN(atan2)(imag, real));`
	`100`	`+ return mp_obj_new_complex(0.5 * MICROPY_FLOAT_C_FUN(log10)(realreal + imagimag), 0.4342944819032518 * MICROPY_FLOAT_C_FUN(atan2)(imag, real));`
`101`	`101`	`}`
`102`	`102`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_cmath_log10_obj, mp_cmath_log10);`
`103`	`103`