kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* complex.c (nucomp_expt): some improvements.

Browse source 
* rational.c (nurat_expt): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2009-06-28 10:50:39 +00:00
parent c97f55efa5
commit f365778c26
3 changed files with 58 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Jun 28 19:48:29 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (nucomp_expt): some improvements.
* rational.c (nurat_expt): ditto.
Sun Jun 28 19:03:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> Sun Jun 28 19:03:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* tool/instruby.rb (:gem): registers the bundled version * tool/instruby.rb (:gem): registers the bundled version

48
complex.c
View file

@ -751,6 +751,37 @@ nucomp_fdiv(VALUE self, VALUE other)
return f_divide(self, other, f_fdiv, id_fdiv); return f_divide(self, other, f_fdiv, id_fdiv);
} }
static VALUE
m_log(VALUE x)
{
if (f_real_p(x) && f_positive_p(x))
return m_log_bang(x);
return rb_complex_new2(m_log_bang(f_abs(x)), f_arg(x));
}
static VALUE
m_exp(VALUE x)
{
VALUE ere;
if (f_real_p(x))
return m_exp_bang(x);
{
get_dat1(x);
ere = m_exp_bang(dat->real);
return rb_complex_new2(f_mul(ere, m_cos_bang(dat->imag)),
f_mul(ere, m_sin_bang(dat->imag)));
}
}
VALUE
rb_fexpt(VALUE x, VALUE y)
{
if (f_zero_p(x) || (!k_float_p(x) && !k_float_p(y)))
return f_expt(x, y);
return m_exp(f_mul(m_log(x), y));
}
/* /*
* call-seq: * call-seq:
* cmp ** numeric -> complex * cmp ** numeric -> complex
@ -769,7 +800,22 @@ nucomp_expt(VALUE self, VALUE other)
return f_complex_new_bang1(CLASS_OF(self), ONE); return f_complex_new_bang1(CLASS_OF(self), ONE);
if (k_rational_p(other) && f_one_p(f_denominator(other))) if (k_rational_p(other) && f_one_p(f_denominator(other)))
other = f_numerator(other); /* good? */ other = f_numerator(other); /* c14n */
if (k_complex_p(other)) {
get_dat1(other);
if (f_zero_p(dat->imag))
other = dat->real; /* c14n */
}
{
get_dat1(self);
if (f_zero_p(dat->imag) && f_real_p(other))
return f_complex_new1(CLASS_OF(self),
rb_fexpt(dat->real, other)); /* c14n */
}
if (k_complex_p(other)) { if (k_complex_p(other)) {
VALUE r, theta, nr, ntheta; VALUE r, theta, nr, ntheta;

10
rational.c
View file

@ -870,6 +870,8 @@ nurat_fdiv(VALUE self, VALUE other)
return f_to_f(f_div(self, other)); return f_to_f(f_div(self, other));
} }
extern VALUE rb_fexpt(VALUE x, VALUE y);
/* /*
* call-seq: * call-seq:
* rat ** numeric -> numeric_result * rat ** numeric -> numeric_result
@ -895,7 +897,7 @@ nurat_expt(VALUE self, VALUE other)
get_dat1(other); get_dat1(other);
if (f_one_p(dat->den)) if (f_one_p(dat->den))
other = dat->num; /* good? */ other = dat->num; /* c14n */
} }
switch (TYPE(other)) { switch (TYPE(other)) {
@ -924,9 +926,7 @@ nurat_expt(VALUE self, VALUE other)
} }
case T_FLOAT: case T_FLOAT:
case T_RATIONAL: case T_RATIONAL:
if (f_negative_p(self)) return rb_fexpt(f_to_f(self), other);
return f_expt(rb_complex_new1(self), other); /* explicitly */
return f_expt(f_to_f(self), other);
default: default:
return rb_num_coerce_bin(self, other, id_expt); return rb_num_coerce_bin(self, other, id_expt);
} }
@ -956,7 +956,7 @@ nurat_cmp(VALUE self, VALUE other)
get_dat1(self); get_dat1(self);
if (FIXNUM_P(dat->den) && FIX2LONG(dat->den) == 1) if (FIXNUM_P(dat->den) && FIX2LONG(dat->den) == 1)
return f_cmp(dat->num, other); return f_cmp(dat->num, other); /* c14n */
return f_cmp(self, f_rational_new_bang1(CLASS_OF(self), other)); return f_cmp(self, f_rational_new_bang1(CLASS_OF(self), other));
} }
case T_FLOAT: case T_FLOAT: