number 0.9.7 → 0.9.9

data/ext/{number.h → number/number.h}

@@ -40,6 +40,14 @@
 
 #define REAL_CHECK(real) if (!REAL(real)) { return real_dup(real); }
 
+#ifndef INFINITY
+#define INFINITY (double)(1.0/0.0)
+#endif
+
+#ifndef NAN
+#define NAN (double)(0.0/0.0)
+#endif
+
 typedef struct
 {
     int flag;
@@ -91,4 +99,298 @@ extern VALUE rb_cReal;
 extern VALUE rb_cInterval;
 extern VALUE rb_cNumber;
 
+VALUE rb_enc_str_new (const char*, long, void*);
+void* rb_utf8_encoding (void);
+void rb_remove_method_id (VALUE, ID);
+
+void bounds_free (Bounds*);
+void bounds_update_re (Bounds*, mpfr_t, int, int);
+void bounds_update_im (Bounds*, mpfr_t, int, int);
+void bounds_update (Bounds*, mpc_t, int, int, int);
+Bounds* bounds_new ();
+
+void init_complex_tmp_nums ();
+void mpc_set_r_r (mpc_t, Real*, Real*);
+void mpfr_set_r (mpfr_t, Real*);
+void complex_free (Complex*);
+long complex_strlen (Complex*);
+void complex_print (char*, Complex*);
+void complex_print_int (char*, Complex*);
+void complex_print_decimal (char*, Complex*);
+Complex* complex_new (Interval*, Interval*);
+Complex* complex_from_real (Real*);
+Complex* complex_from_int_str (char*);
+Complex* complex_from_float_str (char*);
+Complex* complex_nan ();
+Complex* complex_pos_inf ();
+Complex* complex_neg_inf ();
+Complex* complex_zero ();
+Complex* complex_one ();
+Complex* complex_pi ();
+Complex* complex_e ();
+Complex* complex_i ();
+Complex* complex_dup (Complex*);
+Complex* complex_add (Complex*, Complex*);
+Complex* complex_subtract (Complex*, Complex*);
+Complex* complex_multiply (Complex*, Complex*);
+Complex* complex_divide (Complex*, Complex*);
+Complex* complex_modulo (Complex*, Complex*);
+Complex* complex_abs (Complex*);
+Complex* complex_area (Complex*);
+Complex* complex_diagonal (Complex*);
+Complex* complex_conjugate (Complex*);
+Complex* complex_negate (Complex*);
+Complex* complex_reflect (Complex*);
+Complex* complex_sqrt (Complex*);
+
+Complex* complex_im (Complex*);
+Complex* complex_im_l (Complex*);
+Complex* complex_im_n (Complex*);
+Complex* complex_im_u (Complex*);
+Complex* complex_im_magnitude (Complex*);
+Complex* complex_im_mignitude (Complex*);
+Complex* complex_im_width (Complex*);
+Complex* complex_re (Complex*);
+Complex* complex_re_l (Complex*);
+Complex* complex_re_n (Complex*);
+Complex* complex_re_u (Complex*);
+Complex* complex_re_magnitude (Complex*);
+Complex* complex_re_mignitude (Complex*);
+Complex* complex_re_width (Complex*);
+Complex* complex_ll (Complex*);
+Complex* complex_lu (Complex*);
+Complex* complex_n (Complex*);
+Complex* complex_ul (Complex*);
+Complex* complex_uu (Complex*);
+Complex* complex_magnitude (Complex*);
+Complex* complex_mignitude (Complex*);
+Complex* complex_width (Complex*);
+
+int complex_re_enclose_p (Complex*, Complex*);
+int complex_re_contain_l_p (Complex*, Complex*);
+int complex_re_contain_n_p (Complex*, Complex*);
+int complex_re_contain_u_p (Complex*, Complex*);
+int complex_re_contain_zero_p (Complex*);
+int complex_re_intersect_p (Complex*, Complex*);
+int complex_re_disjoint_p (Complex*, Complex*);
+int complex_re_unbounded_p (Complex*);
+int complex_re_left_unbounded_p (Complex*);
+int complex_re_right_unbounded_p (Complex*);
+int complex_re_nan_p (Complex*);
+int complex_re_pos_inf_p (Complex*);
+int complex_re_neg_inf_p (Complex*);
+int complex_re_normal_p (Complex*);
+int complex_re_zero_p (Complex*);
+int complex_re_eq_p (Complex*, Complex*);
+int complex_re_bounds_eq_p (Complex*, Complex*);
+int complex_re_l_eq_l_p (Complex*, Complex*);
+int complex_re_l_eq_n_p (Complex*, Complex*);
+int complex_re_l_eq_u_p (Complex*, Complex*);
+int complex_re_n_eq_l_p (Complex*, Complex*);
+int complex_re_n_eq_n_p (Complex*, Complex*);
+int complex_re_n_eq_u_p (Complex*, Complex*);
+int complex_re_u_eq_l_p (Complex*, Complex*);
+int complex_re_u_eq_n_p (Complex*, Complex*);
+int complex_re_u_eq_u_p (Complex*, Complex*);
+int complex_re_l_gt_l_p (Complex*, Complex*);
+int complex_re_l_gt_n_p (Complex*, Complex*);
+int complex_re_l_gt_u_p (Complex*, Complex*);
+int complex_re_n_gt_l_p (Complex*, Complex*);
+int complex_re_n_gt_n_p (Complex*, Complex*);
+int complex_re_n_gt_u_p (Complex*, Complex*);
+int complex_re_u_gt_l_p (Complex*, Complex*);
+int complex_re_u_gt_n_p (Complex*, Complex*);
+int complex_re_u_gt_u_p (Complex*, Complex*);
+int complex_re_l_ge_l_p (Complex*, Complex*);
+int complex_re_l_ge_n_p (Complex*, Complex*);
+int complex_re_l_ge_u_p (Complex*, Complex*);
+int complex_re_n_ge_l_p (Complex*, Complex*);
+int complex_re_n_ge_n_p (Complex*, Complex*);
+int complex_re_n_ge_u_p (Complex*, Complex*);
+int complex_re_u_ge_l_p (Complex*, Complex*);
+int complex_re_u_ge_n_p (Complex*, Complex*);
+int complex_re_u_ge_u_p (Complex*, Complex*);
+int complex_re_l_lt_l_p (Complex*, Complex*);
+int complex_re_l_lt_n_p (Complex*, Complex*);
+int complex_re_l_lt_u_p (Complex*, Complex*);
+int complex_re_n_lt_l_p (Complex*, Complex*);
+int complex_re_n_lt_n_p (Complex*, Complex*);
+int complex_re_n_lt_u_p (Complex*, Complex*);
+int complex_re_u_lt_l_p (Complex*, Complex*);
+int complex_re_u_lt_n_p (Complex*, Complex*);
+int complex_re_u_lt_u_p (Complex*, Complex*);
+int complex_re_l_le_l_p (Complex*, Complex*);
+int complex_re_l_le_n_p (Complex*, Complex*);
+int complex_re_l_le_u_p (Complex*, Complex*);
+int complex_re_n_le_l_p (Complex*, Complex*);
+int complex_re_n_le_n_p (Complex*, Complex*);
+int complex_re_n_le_u_p (Complex*, Complex*);
+int complex_re_u_le_l_p (Complex*, Complex*);
+int complex_re_u_le_n_p (Complex*, Complex*);
+int complex_re_u_le_u_p (Complex*, Complex*);
+int complex_im_unbounded_p (Complex*);
+int complex_im_left_unbounded_p (Complex*);
+int complex_im_right_unbounded_p (Complex*);
+int complex_im_nan_p (Complex*);
+int complex_im_pos_inf_p (Complex*);
+int complex_im_neg_inf_p (Complex*);
+int complex_im_normal_p (Complex*);
+int complex_im_zero_p (Complex*);
+int complex_im_contain_zero_p (Complex*);
+int complex_im_enclose_p (Complex*, Complex*);
+int complex_im_contain_l_p (Complex*, Complex*);
+int complex_im_contain_n_p (Complex*, Complex*);
+int complex_im_contain_u_p (Complex*, Complex*);
+int complex_im_intersect_p (Complex*, Complex*);
+int complex_im_disjoint_p (Complex*, Complex*);
+int complex_im_eq_p (Complex*, Complex*);
+int complex_im_bounds_eq_p (Complex*, Complex*);
+int complex_im_l_eq_l_p (Complex*, Complex*);
+int complex_im_l_eq_n_p (Complex*, Complex*);
+int complex_im_l_eq_u_p (Complex*, Complex*);
+int complex_im_n_eq_l_p (Complex*, Complex*);
+int complex_im_n_eq_n_p (Complex*, Complex*);
+int complex_im_n_eq_u_p (Complex*, Complex*);
+int complex_im_u_eq_l_p (Complex*, Complex*);
+int complex_im_u_eq_n_p (Complex*, Complex*);
+int complex_im_u_eq_u_p (Complex*, Complex*);
+int complex_im_l_gt_l_p (Complex*, Complex*);
+int complex_im_l_gt_n_p (Complex*, Complex*);
+int complex_im_l_gt_u_p (Complex*, Complex*);
+int complex_im_n_gt_l_p (Complex*, Complex*);
+int complex_im_n_gt_n_p (Complex*, Complex*);
+int complex_im_n_gt_u_p (Complex*, Complex*);
+int complex_im_u_gt_l_p (Complex*, Complex*);
+int complex_im_u_gt_n_p (Complex*, Complex*);
+int complex_im_u_gt_u_p (Complex*, Complex*);
+int complex_im_l_ge_l_p (Complex*, Complex*);
+int complex_im_l_ge_n_p (Complex*, Complex*);
+int complex_im_l_ge_u_p (Complex*, Complex*);
+int complex_im_n_ge_l_p (Complex*, Complex*);
+int complex_im_n_ge_n_p (Complex*, Complex*);
+int complex_im_n_ge_u_p (Complex*, Complex*);
+int complex_im_u_ge_l_p (Complex*, Complex*);
+int complex_im_u_ge_n_p (Complex*, Complex*);
+int complex_im_u_ge_u_p (Complex*, Complex*);
+int complex_im_l_lt_l_p (Complex*, Complex*);
+int complex_im_l_lt_n_p (Complex*, Complex*);
+int complex_im_l_lt_u_p (Complex*, Complex*);
+int complex_im_n_lt_l_p (Complex*, Complex*);
+int complex_im_n_lt_n_p (Complex*, Complex*);
+int complex_im_n_lt_u_p (Complex*, Complex*);
+int complex_im_u_lt_l_p (Complex*, Complex*);
+int complex_im_u_lt_n_p (Complex*, Complex*);
+int complex_im_u_lt_u_p (Complex*, Complex*);
+int complex_im_l_le_l_p (Complex*, Complex*);
+int complex_im_l_le_n_p (Complex*, Complex*);
+int complex_im_l_le_u_p (Complex*, Complex*);
+int complex_im_n_le_l_p (Complex*, Complex*);
+int complex_im_n_le_n_p (Complex*, Complex*);
+int complex_im_n_le_u_p (Complex*, Complex*);
+int complex_im_u_le_l_p (Complex*, Complex*);
+int complex_im_u_le_n_p (Complex*, Complex*);
+int complex_im_u_le_u_p (Complex*, Complex*);
+int complex_enclose_p (Complex*, Complex*);
+int complex_contain_ll_p (Complex*, Complex*);
+int complex_contain_lu_p (Complex*, Complex*);
+int complex_contain_n_p (Complex*, Complex*);
+int complex_contain_ul_p (Complex*, Complex*);
+int complex_contain_uu_p (Complex*, Complex*);
+int complex_contain_zero_p (Complex*);
+int complex_intersect_p (Complex*, Complex*);
+int complex_disjoint_p (Complex*, Complex*);
+int complex_unbounded_p (Complex*);
+int complex_nan_p (Complex*);
+int complex_normal_p (Complex*);
+int complex_zero_p (Complex*);
+int complex_complex_p (Complex*);
+int complex_real_p (Complex*);
+int complex_eq_p (Complex*, Complex*);
+int complex_bounds_eq_p (Complex*, Complex*);
+
+Complex* complex_round (Complex*);
+Complex* complex_round_c_c (Complex*);
+Complex* complex_round_c_f (Complex*);
+Complex* complex_round_f_c (Complex*);
+Complex* complex_round_f_f (Complex*);
+Complex* complex_round_i_i (Complex*);
+Complex* complex_round_i_o (Complex*);
+Complex* complex_round_o_i (Complex*);
+Complex* complex_round_o_o (Complex*);
+
+void interval_free (Interval*);
+long interval_strlen (Interval*);
+void interval_print(char*, Interval*);
+int interval_span_p (Interval*, Real*);
+int interval_span_zero_p (Interval*);
+int interval_zero_p (Interval*);
+int interval_degenerate_p (Interval*);
+Interval* interval_new (Real*, int, Real*, int, Real*);
+Interval* interval_from_real (Real*);
+Interval* interval_nan ();
+Interval* interval_pos_inf ();
+Interval* interval_neg_inf ();
+Interval* interval_zero ();
+Interval* interval_one ();
+Interval* interval_pi ();
+Interval* interval_e ();
+Interval* interval_dup (Interval*);
+Interval* interval_add (Interval*, Interval*);
+Interval* interval_subtract (Interval*, Interval*);
+Interval* interval_multiply (Interval*, Interval*);
+Interval* interval_divide (Interval*, Interval*);
+Interval* interval_negate (Interval*);
+Interval* interval_round (Interval*);
+Interval* interval_round_ceiling (Interval*);
+Interval* interval_round_floor (Interval*);
+Interval* interval_round_infinity (Interval*);
+Interval* interval_round_origin (Interval*);
+
+void init_real_tmp_nums ();
+void num_pad (mpz_t, int);
+void num_round (mpz_t, int, int);
+long num_len (mpz_t);
+void real_free (Real*);
+long real_strlen (Real*);
+void real_print (char*, Real*);
+void real_pad_tmps (Real*, Real*, long*, long*);
+int real_zero_p (Real*);
+int real_negative_p (Real*);
+int real_positive_p (Real*);
+int real_cmp (Real*, Real*);
+int real_eq_p (Real*, Real*);
+int real_gt_p (Real*, Real*);
+int real_ge_p (Real*, Real*);
+int real_lt_p (Real*, Real*);
+int real_le_p (Real*, Real*);
+Real* real_alloc ();
+Real* real_new_flagged (int);
+Real* real_new_exact (mpz_t, long);
+Real* real_new_rounded (mpz_t, long, int);
+Real* real_from_str (char*, long);
+Real* real_from_mpfr (mpfr_t, int);
+Real* real_nan ();
+Real* real_pos_inf ();
+Real* real_neg_inf ();
+Real* real_zero ();
+Real* real_one ();
+Real* real_pi (int);
+Real* real_e (int);
+Real* real_dup (Real*);
+Real* real_abs (Real*);
+Real* real_negate (Real*);
+Real* real_ceil (Real*);
+Real* real_floor (Real*);
+Real* real_round (Real*);
+Real* real_round_infinity (Real*);
+Real* real_round_origin (Real*);
+Real* real_add (Real*, Real*);
+Real* real_subtract  (Real*, Real*);
+Real* real_multiply (Real*, Real*);
+Real* real_divide (Real*, Real*, int);
+
+void real_bounds_free (RealBounds*);
+void real_bounds_update (RealBounds*, Real*, int);
+RealBounds* real_bounds_new ();
+
 #endif

data/ext/{real.c → number/real.c}

@@ -301,7 +301,7 @@ int real_le_p (Real* a, Real* b)
 /*
  *  Returns a pointer to a newly allocated Real.
  */
-static Real* real_alloc ()
+Real* real_alloc ()
 {
     Real* real;
     real = malloc(sizeof(Real));
@@ -326,7 +326,7 @@ static Real* real_alloc ()
 Real* real_new_flagged (int flag)
 {
     Real* real;
-    real = (Real*)real_alloc();
+    real = real_alloc();
     
     real->exp = 0;
     real->flag = flag;
@@ -345,7 +345,7 @@ Real* real_new_flagged (int flag)
 Real* real_new_exact (mpz_t num, long exp)
 {
     Real* real;
-    real = (Real*)real_alloc();
+    real = real_alloc();
     
     real->exp = exp;
     real->flag = 0;
@@ -433,7 +433,7 @@ Real* real_from_mpfr (mpfr_t num, int round_mode)
     
     if (!mpfr_number_p(num))
     {
-        return (Real*)real_new_flagged(mpfr_nan_p(num) ? NaN_FLAG : (mpfr_sgn(num) == 1) ? POS_INF_FLAG : NEG_INF_FLAG);
+        return real_new_flagged(mpfr_nan_p(num) ? NaN_FLAG : (mpfr_sgn(num) == 1) ? POS_INF_FLAG : NEG_INF_FLAG);
     }
     
     mpfr_get_str(buf, &exp, 10, digs + 5, num, MPFR_RNDN);
@@ -447,7 +447,7 @@ Real* real_from_mpfr (mpfr_t num, int round_mode)
  */
 Real* real_nan ()
 {
-    return (Real*)real_new_flagged(NaN_FLAG);
+    return real_new_flagged(NaN_FLAG);
 }
 
 /*
@@ -455,7 +455,7 @@ Real* real_nan ()
  */
 Real* real_pos_inf ()
 {
-    return (Real*)real_new_flagged(POS_INF_FLAG);
+    return real_new_flagged(POS_INF_FLAG);
 }
 
 /*
@@ -463,7 +463,7 @@ Real* real_pos_inf ()
  */
 Real* real_neg_inf ()
 {
-    return (Real*)real_new_flagged(NEG_INF_FLAG);
+    return real_new_flagged(NEG_INF_FLAG);
 }
 
 /*
@@ -530,7 +530,7 @@ Real* real_e (int round_mode)
  */
 Real* real_dup (Real* real)
 {
-    return REAL(real) ? (Real*)real_new_exact(real->num, real->exp) : (Real*)real_new_flagged(real->flag);
+    return REAL(real) ? real_new_exact(real->num, real->exp) : real_new_flagged(real->flag);
 }
 
 /*
@@ -811,7 +811,7 @@ Real* real_divide (Real* a, Real* b, int round_mode)
     mpfr_init2(num, PREC);
     mpfr_div(num, a_num, b_num, MPFR_RNDN);
     
-    result = (Real*)real_from_mpfr(num, round_mode);
+    result = real_from_mpfr(num, round_mode);
     
     mpfr_clear(a_num);
     mpfr_clear(b_num);

data/ext/{real_bounds.c → number/real_bounds.c}

@@ -28,7 +28,7 @@ void real_bounds_update (RealBounds* bounds, Real* real, int closed)
     {
         real_free(bounds->min);
         
-        bounds->min = (Real*)real_dup(real);
+        bounds->min = real_dup(real);
         bounds->min_closed = (min_cmp) ? closed : bounds->min_closed || closed;
     }
     
@@ -36,7 +36,7 @@ void real_bounds_update (RealBounds* bounds, Real* real, int closed)
     {
         real_free(bounds->max);
         
-        bounds->max = (Real*)real_dup(real);
+        bounds->max = real_dup(real);
         bounds->max_closed = (max_cmp) ? closed : bounds->max_closed || closed;
     }
     

data/ext/number/round.c

@@ -0,0 +1,46 @@
+#include "number.h"
+
+Complex* complex_round (Complex* complex)
+{
+    return complex_new(interval_round(complex->re), interval_round(complex->im));
+}
+
+Complex* complex_round_c_c (Complex* complex)
+{
+    return complex_new(interval_round_ceiling(complex->re), interval_round_ceiling(complex->im));
+}
+
+Complex* complex_round_c_f (Complex* complex)
+{
+    return complex_new(interval_round_floor(complex->re), interval_round_ceiling(complex->im));
+}
+
+Complex* complex_round_f_c (Complex* complex)
+{
+    return complex_new(interval_round_ceiling(complex->re), interval_round_floor(complex->im));
+}
+
+Complex* complex_round_f_f (Complex* complex)
+{
+    return complex_new(interval_round_floor(complex->re), interval_round_floor(complex->im));
+}
+
+Complex* complex_round_i_i (Complex* complex)
+{
+    return complex_new(interval_round_infinity(complex->re), interval_round_infinity(complex->im));
+}
+
+Complex* complex_round_i_o (Complex* complex)
+{
+    return complex_new(interval_round_infinity(complex->re), interval_round_origin(complex->im));
+}
+
+Complex* complex_round_o_i (Complex* complex)
+{
+    return complex_new(interval_round_origin(complex->re), interval_round_infinity(complex->im));
+}
+
+Complex* complex_round_o_o (Complex* complex)
+{
+    return complex_new(interval_round_origin(complex->re), interval_round_origin(complex->im));
+}