number 0.9.5 → 0.9.6

data/ext/complex.c

@@ -1,5 +1,7 @@
 #include "number.h"
 
+mpz_t tmp_complex_print_int;
+
 mpfr_t tmp_complex_from_float_str,
        tmp_divide_re,
        tmp_divide_im,
@@ -32,6 +34,7 @@ mpc_t tmp_divide_numerator,
 
 void init_complex_tmp_nums ()
 {
+    mpz_init(tmp_complex_print_int);
     mpfr_init2(tmp_complex_from_float_str, PREC);
     mpfr_init2(tmp_divide_re, PREC);
     mpfr_init2(tmp_divide_im, PREC);
@@ -179,6 +182,52 @@ void complex_print (char* buf, Complex* complex)
     }
 }
 
+/*
+ *  Puts a string representation of real as a truncated integer into the string
+ *  pointed to by buf.
+ */
+void complex_print_int (char* buf, Complex* complex)
+{
+    Real* rounded;
+    rounded = (Real*)real_round_origin(complex->re->n);
+    
+    if (!REAL(rounded))
+    {
+        sprintf(buf, "%s", NaN(complex->re->n) ? "NaN" : POS_INF(complex->re->n) ? "Infinity" : "-Infinity");
+    }
+    else if (ZERO(rounded))
+    {
+        sprintf(buf, "0");
+    }
+    else
+    {
+        mpz_set(tmp_complex_print_int, rounded->num);
+        num_pad(tmp_complex_print_int, rounded->exp - num_len(tmp_complex_print_int));
+        mpz_get_str(buf, 10, tmp_complex_print_int);
+    }
+    
+    real_free(rounded);
+}
+
+/*
+ *  Puts a string representation of real as a fractional decimal into the string
+ *  pointed to by buf.
+ */
+void complex_print_decimal (char* buf, Complex* complex)
+{
+    char real_buf[10000];
+    
+    if (REAL(complex->re->n))
+    {
+        gmp_sprintf(real_buf, "%+Zd", complex->re->n->num);
+        sprintf(buf, "%c0.%se%ld", *real_buf, real_buf + 1, complex->re->n->exp);
+    }
+    else
+    {
+        sprintf(buf, "%s", NaN(complex->re->n) ? "NaN" : POS_INF(complex->re->n) ? "Infinity" : "-Infinity");
+    }
+}
+
 /*
  *  Returns a pointer to a newly allocated Complex with the given value. The
  *  given intervals will be referenced by the new complex and must be freed only

data/ext/number.c

@@ -250,10 +250,41 @@ VALUE rb_Number_initialize_copy (VALUE number, VALUE copy)
     return Qnil; /* not reached */
 }
 
+VALUE rb_Number_to_f (VALUE number)
+{
+    if (complex_re_normal_p(DATA_PTR(number)))
+    {
+        char buf[10000];
+        
+        complex_print_decimal(buf, DATA_PTR(number));
+        
+        return DBL2NUM(rb_cstr_to_dbl(buf, 0));
+    }
+    else
+    {
+        return complex_re_nan_p(DATA_PTR(number)) ? DBL2NUM(NAN) : complex_re_pos_inf_p(DATA_PTR(number)) ? DBL2NUM(INFINITY) : rb_funcall(DBL2NUM(INFINITY), rb_intern("-@"), 0);
+    }
+}
+
+VALUE rb_Number_to_i (VALUE number)
+{
+    if (complex_re_normal_p(DATA_PTR(number)))
+    {
+        char buf[10000];
+        
+        complex_print_int(buf, DATA_PTR(number));
+        
+        return rb_cstr_to_inum(buf, 10, false);
+    }
+    else
+    {
+        return complex_re_nan_p(DATA_PTR(number)) ? DBL2NUM(NAN) : complex_re_pos_inf_p(DATA_PTR(number)) ? DBL2NUM(INFINITY) : rb_funcall(DBL2NUM(INFINITY), rb_intern("-@"), 0);
+    }
+}
+
 VALUE rb_Number_to_s (VALUE number)
 {
     char buf[1000];
-    VALUE str;
     
     complex_print(buf, DATA_PTR(number));
     
@@ -1381,6 +1412,8 @@ void Init_number ()
     rb_define_method(rb_cNumber, "singleton_method_added", rb_Number_singleton_method_added, 1);
     rb_define_method(rb_cNumber, "initialize_copy", rb_Number_initialize_copy, 1);
     
+    rb_define_method(rb_cNumber, "to_f", rb_Number_to_f, 0);
+    rb_define_method(rb_cNumber, "to_i", rb_Number_to_i, 0);
     rb_define_method(rb_cNumber, "to_s", rb_Number_to_s, 0);
     rb_define_method(rb_cNumber, "to_number", rb_Number_dummy, 0);
     rb_define_method(rb_cNumber, "coerce", rb_Number_coerce, 1);

data/ext/real.c

@@ -57,7 +57,7 @@ void init_real_tmp_nums ()
  *  
  *    num: (1234), pow: 2 => num: (123400)
  */
-static void num_pad (mpz_t num, int pow)
+void num_pad (mpz_t num, int pow)
 {
     mpz_ui_pow_ui(tmp_num_pad, 10, pow);
     mpz_mul(num, num, tmp_num_pad);
@@ -69,7 +69,7 @@ static void num_pad (mpz_t num, int pow)
  *  
  *      num: (12345), overrun: 3, round_mode: ROUND_UP => num: (13)
  */
-static void num_round (mpz_t num, int overrun, int round_mode)
+void num_round (mpz_t num, int overrun, int round_mode)
 {
     if (!overrun)
     {
@@ -109,7 +109,7 @@ static void num_round (mpz_t num, int overrun, int round_mode)
  *    num: (5600) => long: 4
  *    num: (-123) => long: 3
  */
-static long num_len (mpz_t num)
+long num_len (mpz_t num)
 {
     char buf[mpz_sizeinbase(num, 10) + 2];
     

metadata

@@ -2,7 +2,7 @@
 name: number
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: []
 
 description: The Number gem is intended to be a drop-in replacement for Ruby's Numeric classes when arbitrary-precision complex interval calculations are warranted. The basis of the arbitrary-precision calculations is the GNU MP, MPFR, and MPC libraries.