[ruby-dev:12423] Re: [ruby-talk:12373] Re: Math package

>From: [e-mail] (Yukihiro Matsumoto)
>Subject: [ruby-talk:12373] Re: Math package

> |BTW, I like more functions in Math module, such as
> |asin(), hypot(), etc, in the core distribution, 
> 
> I have no knowledge about availabily of those function.  If someone
> would supply survey and patch, they will be merged into the core.

ていうことなので、パッチ書きました。availabilyは私も把握してませ
んが、math.h に書いてある分類を参考にしました。

ANSI/POSIX に分類されている(sqrtとかも含む)のは標準的と思って、
次の関数を単純に加えました。
  acos, asin, atan, cosh, sinh, tanh
acos,asinの定義域のチェックは、コメントアウトしています。

hypot はない可能性がありそうですが、あると便利なので、
[ruby-talk:12404] を関数にしたものを missing に加えました。

以下パッチです。

田中昌宏

diff -Nru ../ruby/configure.in ./configure.in
--- ../ruby/configure.in	Sat Mar 10 19:15:15 2001
+++ ./configure.in	Sun Mar 11 18:13:34 2001
@@ -255,7 +255,7 @@
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul crypt flock vsnprintf\
-		 isinf isnan finite)
+		 isinf isnan finite hypot)
 AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd chroot\
 	      truncate chsize times utimes fcntl lockf lstat symlink readlink\
 	      setitimer setruid seteuid setreuid setresuid \
diff -Nru ../ruby/math.c ./math.c
--- ../ruby/math.c	Sat Mar 10 19:15:15 2001
+++ ./math.c	Sun Mar 11 18:13:34 2001
@@ -57,6 +57,62 @@
 }
 
 static VALUE
+math_acos(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    /*
+    if (RFLOAT(x)->value < -1.0 || RFLOAT(x)->value > 1.0)
+	rb_raise(rb_eArgError, "Out of range (-1..1)");
+    */
+    return rb_float_new(acos(RFLOAT(x)->value));
+}
+
+static VALUE
+math_asin(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    /*
+    if (RFLOAT(x)->value < -1.0 || RFLOAT(x)->value > 1.0)
+	rb_raise(rb_eArgError, "Out of range (-1..1)");
+    */
+    return rb_float_new(asin(RFLOAT(x)->value));
+}
+
+static VALUE
+math_atan(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(atan(RFLOAT(x)->value));
+}
+
+static VALUE
+math_cosh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(cosh(RFLOAT(x)->value));
+}
+
+static VALUE
+math_sinh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(sinh(RFLOAT(x)->value));
+}
+
+static VALUE
+math_tanh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(tanh(RFLOAT(x)->value));
+}
+
+static VALUE
 math_exp(obj, x)
     VALUE obj, x;
 {
@@ -118,6 +174,14 @@
     return rb_float_new(d = ldexp(RFLOAT(x)->value, NUM2INT(n)));
 }
 
+static VALUE
+math_hypot(obj, x, y)
+    VALUE obj, x, y;
+{
+    Need_Float2(x, y);
+    return rb_float_new(hypot(RFLOAT(x)->value, RFLOAT(y)->value));
+}
+
 void
 Init_Math()
 {
@@ -140,6 +204,14 @@
     rb_define_module_function(rb_mMath, "sin", math_sin, 1);
     rb_define_module_function(rb_mMath, "tan", math_tan, 1);
 
+    rb_define_module_function(rb_mMath, "acos", math_acos, 1);
+    rb_define_module_function(rb_mMath, "asin", math_asin, 1);
+    rb_define_module_function(rb_mMath, "atan", math_atan, 1);
+
+    rb_define_module_function(rb_mMath, "cosh", math_cosh, 1);
+    rb_define_module_function(rb_mMath, "sinh", math_sinh, 1);
+    rb_define_module_function(rb_mMath, "tanh", math_tanh, 1);
+
     rb_define_module_function(rb_mMath, "exp", math_exp, 1);
     rb_define_module_function(rb_mMath, "log", math_log, 1);
     rb_define_module_function(rb_mMath, "log10", math_log10, 1);
@@ -147,4 +219,6 @@
 
     rb_define_module_function(rb_mMath, "frexp", math_frexp, 1);
     rb_define_module_function(rb_mMath, "ldexp", math_ldexp, 2);
+
+    rb_define_module_function(rb_mMath, "hypot", math_hypot, 2);
 }
diff -Nru ../ruby/missing/hypot.c ./missing/hypot.c
--- ../ruby/missing/hypot.c	Wed Dec 31 19:00:00 1969
+++ ./missing/hypot.c	Sun Mar 11 18:13:34 2001
@@ -0,0 +1,16 @@
+/* public domain rewrite of hypot */
+
+#include <math.h>
+
+double hypot(x,y)
+    double x, y;
+{
+    if (x < 0) x = -x;
+    if (y < 0) y = -y;
+    if (x < y) {
+	double tmp = x;
+	x = y; y = tmp;
+    }
+    y /= x;
+    return x * sqrt(1.0+y*y);
+}