number 0.9.9 → 0.9.10

data/ext/number/bounds.c

@@ -31,11 +31,8 @@ void bounds_free (Bounds* bounds)
 
 void bounds_update_re (Bounds* bounds, mpfr_t num, int re_closed, int exact)
 {
-    int min_cmp;
-    int max_cmp;
-    
-    min_cmp = mpfr_cmp(bounds->re_min, num);
-    max_cmp = mpfr_cmp(bounds->re_max, num);
+    int min_cmp = mpfr_cmp(bounds->re_min, num);
+    int max_cmp = mpfr_cmp(bounds->re_max, num);
     
     if (min_cmp != -1)
     {
@@ -53,11 +50,8 @@ void bounds_update_re (Bounds* bounds, mpfr_t num, int re_closed, int exact)
 
 void bounds_update_im (Bounds* bounds, mpfr_t num, int im_closed, int exact)
 {
-    int min_cmp;
-    int max_cmp;
-    
-    min_cmp = mpfr_cmp(bounds->im_min, num);
-    max_cmp = mpfr_cmp(bounds->im_max, num);
+    int min_cmp = mpfr_cmp(bounds->im_min, num);
+    int max_cmp = mpfr_cmp(bounds->im_max, num);
     
     if (min_cmp != -1)
     {
@@ -93,8 +87,7 @@ void bounds_update (Bounds* bounds, mpc_t num, int re_closed, int im_closed, int
 
 Bounds* bounds_new ()
 {
-    Bounds* bounds;
-    bounds = malloc(sizeof(Bounds));
+    Bounds* bounds = malloc(sizeof(Bounds));
     
     if (bounds == NULL)
     {

data/ext/number/complex.c

@@ -187,8 +187,7 @@ void complex_print (char* buf, Complex* complex)
  */
 void complex_print_int (char* buf, Complex* complex)
 {
-    Real* rounded;
-    rounded = real_round_origin(complex->re->n);
+    Real* rounded = real_round_origin(complex->re->n);
     
     if (!REAL(rounded))
     {
@@ -236,8 +235,7 @@ void complex_print_decimal (char* buf, Complex* complex)
  */
 Complex* complex_new (Interval* re, Interval* im)
 {
-    Complex* complex;
-    complex = malloc(sizeof(Complex));
+    Complex* complex = malloc(sizeof(Complex));
     
     if (complex == NULL)
     {
@@ -253,16 +251,12 @@ Complex* complex_new (Interval* re, Interval* im)
 
 /*
  *  Returns a pointer to a newly allocated Complex with the given real as its
- *  real part and 0 as its imaginary part. The given real is duplicated before
- *  being stored, and therefore must be freed separately.
+ *  real part and 0 as its imaginary part.
  */
 Complex* complex_from_real (Real* real)
 {
-    Interval* re;
-    Interval* im;
-    
-    re = interval_from_real(real);
-    im = interval_zero();
+    Interval* re = interval_from_real(real);
+    Interval* im = interval_zero();
     
     return complex_new(re, im);
 }
@@ -273,15 +267,8 @@ Complex* complex_from_real (Real* real)
  */
 Complex* complex_from_int_str (char* buf)
 {
-    Real* real;
-    Complex* result;
-    
-    real = real_from_str(buf, strlen(buf) - (*buf == '-'));
-    result = complex_from_real(real);
-    
-    real_free(real);
-    
-    return result;
+    Real* real = real_from_str(buf, strlen(buf) - (*buf == '-'));
+    return complex_from_real(real);
 }
 
 /*
@@ -290,17 +277,10 @@ Complex* complex_from_int_str (char* buf)
  */
 Complex* complex_from_float_str (char* buf)
 {
-    Real* real;
-    Complex* result;
-    
     mpfr_set_str(tmp_complex_from_float_str, buf, 10, MPFR_RNDN);
+    Real* real = real_from_mpfr(tmp_complex_from_float_str, ROUND_NEAREST);
     
-    real = real_from_mpfr(tmp_complex_from_float_str, ROUND_NEAREST);
-    result = complex_from_real(real);
-    
-    real_free(real);
-    
-    return result;
+    return complex_from_real(real);
 }
 
 /*
@@ -308,7 +288,10 @@ Complex* complex_from_float_str (char* buf)
  */
 Complex* complex_nan ()
 {
-    return complex_new(interval_nan(), interval_zero());
+    Interval* re = interval_nan();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -316,7 +299,10 @@ Complex* complex_nan ()
  */
 Complex* complex_pos_inf ()
 {
-    return complex_new(interval_pos_inf(), interval_zero());
+    Interval* re = interval_pos_inf();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -324,7 +310,10 @@ Complex* complex_pos_inf ()
  */
 Complex* complex_neg_inf ()
 {
-    return complex_new(interval_neg_inf(), interval_zero());
+    Interval* re = interval_neg_inf();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -332,7 +321,10 @@ Complex* complex_neg_inf ()
  */
 Complex* complex_zero ()
 {
-    return complex_new(interval_zero(), interval_zero());
+    Interval* re = interval_zero();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -340,7 +332,10 @@ Complex* complex_zero ()
  */
 Complex* complex_one ()
 {
-    return complex_new(interval_one(), interval_zero());
+    Interval* re = interval_one();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -349,7 +344,10 @@ Complex* complex_one ()
  */
 Complex* complex_pi ()
 {
-    return complex_new(interval_pi(), interval_zero());
+    Interval* re = interval_pi();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -358,7 +356,10 @@ Complex* complex_pi ()
  */
 Complex* complex_e ()
 {
-    return complex_new(interval_e(), interval_zero());
+    Interval* re = interval_e();
+    Interval* im = interval_zero();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -366,7 +367,10 @@ Complex* complex_e ()
  */
 Complex* complex_i ()
 {
-    return complex_new(interval_zero(), interval_one());
+    Interval* re = interval_zero();
+    Interval* im = interval_one();
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -375,7 +379,10 @@ Complex* complex_i ()
  */
 Complex* complex_dup (Complex* complex)
 {
-    return complex_new(interval_dup(complex->re), interval_dup(complex->im));
+    Interval* re = interval_dup(complex->re);
+    Interval* im = interval_dup(complex->im);
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -383,11 +390,8 @@ Complex* complex_dup (Complex* complex)
  */
 Complex* complex_add (Complex* a, Complex* b)
 {
-    Interval* re;
-    Interval* im;
-    
-    re = interval_add(a->re, b->re);
-    im = interval_add(a->im, b->im);
+    Interval* re = interval_add(a->re, b->re);
+    Interval* im = interval_add(a->im, b->im);
     
     return complex_new(re, im);
 }
@@ -397,11 +401,8 @@ Complex* complex_add (Complex* a, Complex* b)
  */
 Complex* complex_subtract (Complex* a, Complex* b)
 {
-    Interval* re;
-    Interval* im;
-    
-    re = interval_subtract(a->re, b->re);
-    im = interval_subtract(a->im, b->im);
+    Interval* re = interval_subtract(a->re, b->re);
+    Interval* im = interval_subtract(a->im, b->im);
     
     return complex_new(re, im);
 }
@@ -411,20 +412,13 @@ Complex* complex_subtract (Complex* a, Complex* b)
  */
 Complex* complex_multiply (Complex* a, Complex* b)
 {
-    Interval* re_re;
-    Interval* re_im;
-    Interval* im_re;
-    Interval* im_im;
-    Interval* re;
-    Interval* im;
-    
-    re_re = interval_multiply(a->re, b->re);
-    re_im = interval_multiply(a->re, b->im);
-    im_re = interval_multiply(a->im, b->re);
-    im_im = interval_multiply(a->im, b->im);
+    Interval* re_re = interval_multiply(a->re, b->re);
+    Interval* re_im = interval_multiply(a->re, b->im);
+    Interval* im_re = interval_multiply(a->im, b->re);
+    Interval* im_im = interval_multiply(a->im, b->im);
     
-    re = interval_subtract(re_re, im_im);
-    im = interval_add(re_im, im_re);
+    Interval* re = interval_subtract(re_re, im_im);
+    Interval* im = interval_add(re_im, im_re);
     
     interval_free(re_re);
     interval_free(re_im);
@@ -439,21 +433,12 @@ Complex* complex_multiply (Complex* a, Complex* b)
  */
 Complex* complex_divide (Complex* a, Complex* b)
 {
-    Interval* denominator_re;
-    Interval* denominator_im;
-    Interval* denominator;
-    Interval* numerator_re;
-    Interval* numerator_im;
-    Interval* re_re;
-    Interval* re_im;
-    Interval* im_re;
-    Interval* im_im;
     Interval* re;
     Interval* im;
     
-    denominator_re = interval_multiply(b->re, b->re);
-    denominator_im = interval_multiply(b->im, b->im);
-    denominator = interval_add(denominator_re, denominator_im);
+    Interval* denominator_re = interval_multiply(b->re, b->re);
+    Interval* denominator_im = interval_multiply(b->im, b->im);
+    Interval* denominator = interval_add(denominator_re, denominator_im);
     
     if (real_zero_p(denominator->l) || real_zero_p(denominator->u) || interval_span_zero_p(denominator))
     {
@@ -476,13 +461,13 @@ Complex* complex_divide (Complex* a, Complex* b)
     }
     else
     {
-        re_re = interval_multiply(a->re, b->re);
-        re_im = interval_multiply(a->re, b->im);
-        im_re = interval_multiply(a->im, b->re);
-        im_im = interval_multiply(a->im, b->im);
+        Interval* re_re = interval_multiply(a->re, b->re);
+        Interval* re_im = interval_multiply(a->re, b->im);
+        Interval* im_re = interval_multiply(a->im, b->re);
+        Interval* im_im = interval_multiply(a->im, b->im);
         
-        numerator_re = interval_add(re_re, im_im);
-        numerator_im = interval_subtract(im_re, re_im);
+        Interval* numerator_re = interval_add(re_re, im_im);
+        Interval* numerator_im = interval_subtract(im_re, re_im);
         
         re = interval_divide(numerator_re, denominator);
         im = interval_divide(numerator_im, denominator);
@@ -507,11 +492,8 @@ Complex* complex_divide (Complex* a, Complex* b)
  */
 Complex* complex_modulo (Complex* a, Complex* b)
 {
-    Interval* re;
-    Interval* im;
-    
-    re = interval_zero();
-    im = interval_zero();
+    Interval* re = interval_zero();
+    Interval* im = interval_zero();
     
     return complex_new(re, im);
 }
@@ -522,14 +504,8 @@ Complex* complex_modulo (Complex* a, Complex* b)
  */
 Complex* complex_abs (Complex* complex)
 {
-    int ll_mpc_ternary;
-    int lu_mpc_ternary;
-    int ul_mpc_ternary;
-    int uu_mpc_ternary;
     Real* l_abs;
     Real* u_abs;
-    Bounds* bounds;
-    Interval* re;
     
     mpfr_set_prec(tmp_abs_n_re, PREC);
     mpfr_set_prec(tmp_abs_ll_re, PREC);
@@ -553,12 +529,12 @@ Complex* complex_abs (Complex* complex)
     mpc_set_r_r(tmp_abs_ul, complex->re->u, complex->im->l);
     mpc_set_r_r(tmp_abs_uu, complex->re->u, complex->im->u);
     
-    ll_mpc_ternary = mpc_abs(tmp_abs_ll_re, tmp_abs_ll, MPC_RNDDD);
-    lu_mpc_ternary = mpc_abs(tmp_abs_lu_re, tmp_abs_lu, MPC_RNDDU);
-    ul_mpc_ternary = mpc_abs(tmp_abs_ul_re, tmp_abs_ul, MPC_RNDUD);
-    uu_mpc_ternary = mpc_abs(tmp_abs_uu_re, tmp_abs_uu, MPC_RNDUU);
+    int ll_mpc_ternary = mpc_abs(tmp_abs_ll_re, tmp_abs_ll, MPC_RNDDD);
+    int lu_mpc_ternary = mpc_abs(tmp_abs_lu_re, tmp_abs_lu, MPC_RNDDU);
+    int ul_mpc_ternary = mpc_abs(tmp_abs_ul_re, tmp_abs_ul, MPC_RNDUD);
+    int uu_mpc_ternary = mpc_abs(tmp_abs_uu_re, tmp_abs_uu, MPC_RNDUU);
     
-    bounds = bounds_new();
+    Bounds* bounds = bounds_new();
     bounds_update_re(bounds, tmp_abs_ll_re, complex->re->L, MPC_INEX_RE(ll_mpc_ternary) == 0);
     bounds_update_re(bounds, tmp_abs_lu_re, complex->re->L, MPC_INEX_RE(lu_mpc_ternary) == 0);
     bounds_update_re(bounds, tmp_abs_ul_re, complex->re->R, MPC_INEX_RE(ul_mpc_ternary) == 0);
@@ -594,11 +570,12 @@ Complex* complex_abs (Complex* complex)
         bounds_update_re(bounds, tmp_abs_zero, true, true);
     }
     
-    re = interval_new(real_from_mpfr(bounds->re_min, ROUND_DOWN), bounds->re_min_closed, real_from_mpfr(tmp_abs_n_re, ROUND_NEAREST), bounds->re_max_closed, real_from_mpfr(bounds->re_max, bounds->re_max_exact ? ROUND_UP : ROUND_UP1));
+    Interval* re = interval_new(real_from_mpfr(bounds->re_min, ROUND_DOWN), bounds->re_min_closed, real_from_mpfr(tmp_abs_n_re, ROUND_NEAREST), bounds->re_max_closed, real_from_mpfr(bounds->re_max, bounds->re_max_exact ? ROUND_UP : ROUND_UP1));
+    Interval* im = interval_zero();
     
     bounds_free(bounds);
     
-    return complex_new(re, interval_zero());
+    return complex_new(re, im);
 }
 
 /*
@@ -607,21 +584,14 @@ Complex* complex_abs (Complex* complex)
  */
 Complex* complex_area (Complex* complex)
 {
-    Real* re_width;
-    Real* im_width;
-    Real* area;
-    Complex* result;
-    
-    re_width = real_subtract(complex->re->u, complex->re->l);
-    im_width = real_subtract(complex->im->u, complex->im->l);
-    area = real_multiply(re_width, im_width);
-    result = complex_from_real(area);
+    Real* re_width = real_subtract(complex->re->u, complex->re->l);
+    Real* im_width = real_subtract(complex->im->u, complex->im->l);
+    Real* area = real_multiply(re_width, im_width);
     
     real_free(re_width);
     real_free(im_width);
-    real_free(area);
     
-    return result;
+    return complex_from_real(area);
 }
 
 /*
@@ -630,26 +600,18 @@ Complex* complex_area (Complex* complex)
  */
 Complex* complex_diagonal (Complex* complex)
 {
-    int mpfr_ternary;
-    Real* re_width;
-    Real* im_width;
-    Real* re_width2;
-    Real* im_width2;
-    Real* diag2;
-    Interval* re;
-    
-    re_width = real_subtract(complex->re->u, complex->re->l);
-    im_width = real_subtract(complex->im->u, complex->im->l);
+    Real* re_width = real_subtract(complex->re->u, complex->re->l);
+    Real* im_width = real_subtract(complex->im->u, complex->im->l);
     
-    re_width2 = real_multiply(re_width, re_width);
-    im_width2 = real_multiply(im_width, im_width);
+    Real* re_width2 = real_multiply(re_width, re_width);
+    Real* im_width2 = real_multiply(im_width, im_width);
     
-    diag2 = real_add(re_width2, im_width2);
+    Real* diag2 = real_add(re_width2, im_width2);
     
     mpfr_set_r(tmp_diagonal, diag2);
-    mpfr_ternary = mpfr_sqrt(tmp_diagonal, tmp_diagonal, MPFR_RNDN);
+    int mpfr_ternary = mpfr_sqrt(tmp_diagonal, tmp_diagonal, MPFR_RNDN);
     
-    re = interval_new(real_from_mpfr(tmp_diagonal, ROUND_DOWN), true, real_from_mpfr(tmp_diagonal, ROUND_NEAREST), true, real_from_mpfr(tmp_diagonal, (mpfr_ternary == 0) ? ROUND_UP : ROUND_UP1));
+    Interval* re = interval_new(real_from_mpfr(tmp_diagonal, ROUND_DOWN), true, real_from_mpfr(tmp_diagonal, ROUND_NEAREST), true, real_from_mpfr(tmp_diagonal, (mpfr_ternary == 0) ? ROUND_UP : ROUND_UP1));
     
     real_free(re_width);
     real_free(im_width);
@@ -666,7 +628,10 @@ Complex* complex_diagonal (Complex* complex)
  */
 Complex* complex_conjugate (Complex* complex)
 {
-    return complex_new(interval_dup(complex->re), interval_negate(complex->im));
+    Interval* re = interval_dup(complex->re);
+    Interval* im = interval_negate(complex->im);
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -674,7 +639,10 @@ Complex* complex_conjugate (Complex* complex)
  */
 Complex* complex_negate (Complex* complex)
 {
-    return complex_new(interval_negate(complex->re), interval_negate(complex->im));
+    Interval* re = interval_negate(complex->re);
+    Interval* im = interval_negate(complex->im);
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -683,7 +651,10 @@ Complex* complex_negate (Complex* complex)
  */
 Complex* complex_reflect (Complex* complex)
 {
-    return complex_new(interval_dup(complex->im), interval_dup(complex->re));
+    Interval* re = interval_dup(complex->im);
+    Interval* im = interval_dup(complex->re);
+    
+    return complex_new(re, im);
 }
 
 /*
@@ -691,15 +662,6 @@ Complex* complex_reflect (Complex* complex)
  */
 Complex* complex_sqrt (Complex* complex)
 {
-    int ll_mpc_ternary;
-    int lu_mpc_ternary;
-    int ul_mpc_ternary;
-    int uu_mpc_ternary;
-    int re_sqrt_mpc_ternary;
-    Bounds* bounds;
-    Interval* re;
-    Interval* im;
-    
     mpfr_set_prec(tmp_sqrt_n_re, PREC);
     mpfr_set_prec(tmp_sqrt_n_im, PREC);
     mpc_set_prec(tmp_sqrt_n, PREC);
@@ -719,12 +681,12 @@ Complex* complex_sqrt (Complex* complex)
     mpc_set_r_r(tmp_sqrt_ul, complex->re->u, complex->im->l);
     mpc_set_r_r(tmp_sqrt_uu, complex->re->u, complex->im->u);
     
-    ll_mpc_ternary = mpc_sqrt(tmp_sqrt_ll, tmp_sqrt_ll, MPC_RNDDD);
-    lu_mpc_ternary = mpc_sqrt(tmp_sqrt_lu, tmp_sqrt_lu, MPC_RNDDU);
-    ul_mpc_ternary = mpc_sqrt(tmp_sqrt_ul, tmp_sqrt_ul, MPC_RNDUD);
-    uu_mpc_ternary = mpc_sqrt(tmp_sqrt_uu, tmp_sqrt_uu, MPC_RNDUU);
+    int ll_mpc_ternary = mpc_sqrt(tmp_sqrt_ll, tmp_sqrt_ll, MPC_RNDDD);
+    int lu_mpc_ternary = mpc_sqrt(tmp_sqrt_lu, tmp_sqrt_lu, MPC_RNDDU);
+    int ul_mpc_ternary = mpc_sqrt(tmp_sqrt_ul, tmp_sqrt_ul, MPC_RNDUD);
+    int uu_mpc_ternary = mpc_sqrt(tmp_sqrt_uu, tmp_sqrt_uu, MPC_RNDUU);
     
-    bounds = bounds_new();
+    Bounds* bounds = bounds_new();
     bounds_update(bounds, tmp_sqrt_ll, complex->re->L, complex->im->L, ll_mpc_ternary);
     bounds_update(bounds, tmp_sqrt_lu, complex->re->L, complex->im->R, lu_mpc_ternary);
     bounds_update(bounds, tmp_sqrt_ul, complex->re->R, complex->im->L, ul_mpc_ternary);
@@ -733,13 +695,13 @@ Complex* complex_sqrt (Complex* complex)
     if (interval_span_zero_p(complex->im))
     {
         mpc_set_r_r(tmp_sqrt_re_sqrt, complex->re->l, 0);
-        re_sqrt_mpc_ternary = mpc_sqrt(tmp_sqrt_re_sqrt, tmp_sqrt_re_sqrt, MPC_RNDDD);
+        int re_sqrt_mpc_ternary = mpc_sqrt(tmp_sqrt_re_sqrt, tmp_sqrt_re_sqrt, MPC_RNDDD);
         
         bounds_update(bounds, tmp_sqrt_re_sqrt, complex->re->L, true, re_sqrt_mpc_ternary);
     }
     
-    re = interval_new(real_from_mpfr(bounds->re_min, ROUND_DOWN), bounds->re_min_closed, real_from_mpfr(tmp_sqrt_n_re, ROUND_NEAREST), bounds->re_max_closed, real_from_mpfr(bounds->re_max, bounds->re_max_exact ? ROUND_UP : ROUND_UP1));
-    im = interval_new(real_from_mpfr(bounds->im_min, ROUND_DOWN), bounds->im_min_closed, real_from_mpfr(tmp_sqrt_n_im, ROUND_NEAREST), bounds->im_max_closed, real_from_mpfr(bounds->im_max, bounds->im_max_exact ? ROUND_UP : ROUND_UP1));
+    Interval* re = interval_new(real_from_mpfr(bounds->re_min, ROUND_DOWN), bounds->re_min_closed, real_from_mpfr(tmp_sqrt_n_re, ROUND_NEAREST), bounds->re_max_closed, real_from_mpfr(bounds->re_max, bounds->re_max_exact ? ROUND_UP : ROUND_UP1));
+    Interval* im = interval_new(real_from_mpfr(bounds->im_min, ROUND_DOWN), bounds->im_min_closed, real_from_mpfr(tmp_sqrt_n_im, ROUND_NEAREST), bounds->im_max_closed, real_from_mpfr(bounds->im_max, bounds->im_max_exact ? ROUND_UP : ROUND_UP1));
     
     bounds_free(bounds);