numo-narray-alt 0.9.12 → 0.9.13

data/ext/numo/narray/src/t_scomplex.c

@@ -48,6 +48,11 @@ extern VALUE cRT;
 #include "mh/op/sub.h"
 #include "mh/op/mul.h"
 #include "mh/op/div.h"
+#include "mh/pow.h"
+#include "mh/minus.h"
+#include "mh/reciprocal.h"
+#include "mh/sign.h"
+#include "mh/square.h"
 #include "mh/comp/eq.h"
 #include "mh/comp/ne.h"
 #include "mh/comp/nearly_eq.h"
@@ -74,6 +79,7 @@ extern VALUE cRT;
 #include "mh/logseq.h"
 #include "mh/eye.h"
 #include "mh/rand.h"
+#include "mh/rand_norm.h"
 #include "mh/math/sqrt.h"
 #include "mh/math/cbrt.h"
 #include "mh/math/log.h"
@@ -106,6 +112,11 @@ DEF_NARRAY_ADD_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_SUB_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_MUL_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_FLT_DIV_METHOD_FUNC(scomplex, numo_cSComplex)
+DEF_NARRAY_POW_METHOD_FUNC(scomplex, numo_cSComplex)
+DEF_NARRAY_MINUS_METHOD_FUNC(scomplex, numo_cSComplex)
+DEF_NARRAY_RECIPROCAL_METHOD_FUNC(scomplex, numo_cSComplex)
+DEF_NARRAY_SIGN_METHOD_FUNC(scomplex, numo_cSComplex)
+DEF_NARRAY_SQUARE_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_EQ_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_NE_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_NEARLY_EQ_METHOD_FUNC(scomplex, numo_cSComplex)
@@ -132,6 +143,7 @@ DEF_NARRAY_FLT_SEQ_METHOD_FUNC(scomplex)
 DEF_NARRAY_FLT_LOGSEQ_METHOD_FUNC(scomplex)
 DEF_NARRAY_EYE_METHOD_FUNC(scomplex)
 DEF_NARRAY_CMP_RAND_METHOD_FUNC(scomplex)
+DEF_NARRAY_CMP_RAND_NORM_METHOD_FUNC(scomplex, float)
 DEF_NARRAY_FLT_SQRT_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_FLT_CBRT_METHOD_FUNC(scomplex, numo_cSComplex)
 DEF_NARRAY_FLT_LOG_METHOD_FUNC(scomplex, numo_cSComplex)
@@ -1763,374 +1775,6 @@ static VALUE scomplex_abs(VALUE self) {
   return na_ndloop(&ndf, 1, self);
 }
 
-static void iter_scomplex_pow(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2, *p3;
-  ssize_t s1, s2, s3;
-  dtype x, y;
-  INIT_COUNTER(lp, i);
-  INIT_PTR(lp, 0, p1, s1);
-  INIT_PTR(lp, 1, p2, s2);
-  INIT_PTR(lp, 2, p3, s3);
-  for (; i--;) {
-    GET_DATA_STRIDE(p1, s1, dtype, x);
-    GET_DATA_STRIDE(p2, s2, dtype, y);
-    x = m_pow(x, y);
-    SET_DATA_STRIDE(p3, s3, dtype, x);
-  }
-}
-
-static void iter_scomplex_pow_int32(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2, *p3;
-  ssize_t s1, s2, s3;
-  dtype x;
-  int32_t y;
-  INIT_COUNTER(lp, i);
-  INIT_PTR(lp, 0, p1, s1);
-  INIT_PTR(lp, 1, p2, s2);
-  INIT_PTR(lp, 2, p3, s3);
-  for (; i--;) {
-    GET_DATA_STRIDE(p1, s1, dtype, x);
-    GET_DATA_STRIDE(p2, s2, int32_t, y);
-    x = m_pow_int(x, y);
-    SET_DATA_STRIDE(p3, s3, dtype, x);
-  }
-}
-
-static VALUE scomplex_pow_self(VALUE self, VALUE other) {
-  ndfunc_arg_in_t ain[2] = { { cT, 0 }, { cT, 0 } };
-  ndfunc_arg_in_t ain_i[2] = { { cT, 0 }, { numo_cInt32, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_scomplex_pow, STRIDE_LOOP, 2, 1, ain, aout };
-  ndfunc_t ndf_i = { iter_scomplex_pow_int32, STRIDE_LOOP, 2, 1, ain_i, aout };
-
-  // fixme : use na.integer?
-  if (FIXNUM_P(other) || rb_obj_is_kind_of(other, numo_cInt32)) {
-    return na_ndloop(&ndf_i, 2, self, other);
-  } else {
-    return na_ndloop(&ndf, 2, self, other);
-  }
-}
-
-/*
-  Binary power.
-  @overload ** other
-    @param [Numo::NArray,Numeric] other
-    @return [Numo::NArray] self to the other-th power.
-*/
-static VALUE scomplex_pow(VALUE self, VALUE other) {
-
-  VALUE klass, v;
-  klass = na_upcast(rb_obj_class(self), rb_obj_class(other));
-  if (klass == cT) {
-    return scomplex_pow_self(self, other);
-  } else {
-    v = rb_funcall(klass, id_cast, 1, self);
-    return rb_funcall(v, id_pow, 1, other);
-  }
-}
-
-static void iter_scomplex_minus(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      if (is_aligned(p1, sizeof(dtype)) && is_aligned(p2, sizeof(dtype))) {
-        if (s1 == sizeof(dtype) && s2 == sizeof(dtype)) {
-          for (i = 0; i < n; i++) {
-            ((dtype*)p2)[i] = m_minus(((dtype*)p1)[i]);
-          }
-          return;
-        }
-        if (is_aligned_step(s1, sizeof(dtype)) && is_aligned_step(s2, sizeof(dtype))) {
-          //
-          for (i = 0; i < n; i++) {
-            *(dtype*)p2 = m_minus(*(dtype*)p1);
-            p1 += s1;
-            p2 += s2;
-          }
-          return;
-          //
-        }
-      }
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_minus(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-      //
-    }
-  }
-}
-
-/*
-  Unary minus.
-  @overload -@
-    @return [Numo::SComplex] minus of self.
-*/
-static VALUE scomplex_minus(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_scomplex_minus, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_scomplex_reciprocal(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      if (is_aligned(p1, sizeof(dtype)) && is_aligned(p2, sizeof(dtype))) {
-        if (s1 == sizeof(dtype) && s2 == sizeof(dtype)) {
-          for (i = 0; i < n; i++) {
-            ((dtype*)p2)[i] = m_reciprocal(((dtype*)p1)[i]);
-          }
-          return;
-        }
-        if (is_aligned_step(s1, sizeof(dtype)) && is_aligned_step(s2, sizeof(dtype))) {
-          //
-          for (i = 0; i < n; i++) {
-            *(dtype*)p2 = m_reciprocal(*(dtype*)p1);
-            p1 += s1;
-            p2 += s2;
-          }
-          return;
-          //
-        }
-      }
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_reciprocal(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-      //
-    }
-  }
-}
-
-/*
-  Unary reciprocal.
-  @overload reciprocal
-    @return [Numo::SComplex] reciprocal of self.
-*/
-static VALUE scomplex_reciprocal(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_scomplex_reciprocal, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_scomplex_sign(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      if (is_aligned(p1, sizeof(dtype)) && is_aligned(p2, sizeof(dtype))) {
-        if (s1 == sizeof(dtype) && s2 == sizeof(dtype)) {
-          for (i = 0; i < n; i++) {
-            ((dtype*)p2)[i] = m_sign(((dtype*)p1)[i]);
-          }
-          return;
-        }
-        if (is_aligned_step(s1, sizeof(dtype)) && is_aligned_step(s2, sizeof(dtype))) {
-          //
-          for (i = 0; i < n; i++) {
-            *(dtype*)p2 = m_sign(*(dtype*)p1);
-            p1 += s1;
-            p2 += s2;
-          }
-          return;
-          //
-        }
-      }
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_sign(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-      //
-    }
-  }
-}
-
-/*
-  Unary sign.
-  @overload sign
-    @return [Numo::SComplex] sign of self.
-*/
-static VALUE scomplex_sign(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_scomplex_sign, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_scomplex_square(na_loop_t* const lp) {
-  size_t i, n;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-
-  INIT_COUNTER(lp, n);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  if (idx1) {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_square(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_square(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_square(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      if (is_aligned(p1, sizeof(dtype)) && is_aligned(p2, sizeof(dtype))) {
-        if (s1 == sizeof(dtype) && s2 == sizeof(dtype)) {
-          for (i = 0; i < n; i++) {
-            ((dtype*)p2)[i] = m_square(((dtype*)p1)[i]);
-          }
-          return;
-        }
-        if (is_aligned_step(s1, sizeof(dtype)) && is_aligned_step(s2, sizeof(dtype))) {
-          //
-          for (i = 0; i < n; i++) {
-            *(dtype*)p2 = m_square(*(dtype*)p1);
-            p1 += s1;
-            p2 += s2;
-          }
-          return;
-          //
-        }
-      }
-      for (i = 0; i < n; i++) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = m_square(x);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-      }
-      //
-    }
-  }
-}
-
-/*
-  Unary square.
-  @overload square
-    @return [Numo::SComplex] square of self.
-*/
-static VALUE scomplex_square(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_scomplex_square, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
 static void iter_scomplex_conj(na_loop_t* const lp) {
   size_t i, n;
   char *p1, *p2;
@@ -2667,78 +2311,6 @@ static VALUE scomplex_copysign(VALUE self, VALUE other) {
   }
 }
 
-typedef struct {
-  dtype mu;
-  rtype sigma;
-} randn_opt_t;
-
-static void iter_scomplex_rand_norm(na_loop_t* const lp) {
-  size_t i;
-  char* p1;
-  ssize_t s1;
-  size_t* idx1;
-
-  dtype* a0;
-
-  dtype mu;
-  rtype sigma;
-  randn_opt_t* g;
-
-  INIT_COUNTER(lp, i);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  g = (randn_opt_t*)(lp->opt_ptr);
-  mu = g->mu;
-  sigma = g->sigma;
-
-  if (idx1) {
-
-    for (; i--;) {
-      a0 = (dtype*)(p1 + *idx1);
-      m_rand_norm(mu, sigma, a0);
-      idx1 += 1;
-    }
-
-  } else {
-
-    for (; i--;) {
-      a0 = (dtype*)(p1);
-      m_rand_norm(mu, sigma, a0);
-      p1 += s1;
-    }
-  }
-}
-
-/*
-  Generates random numbers from the normal distribution on self narray
-  using Box-Muller Transformation.
-
-  @overload rand_norm([mu,[sigma]])
-    @param [Numeric] mu  mean of normal distribution. (default=0)
-    @param [Numeric] sigma  standard deviation of normal distribution. (default=1)
-    @return [Numo::SComplex] self.
-*/
-static VALUE scomplex_rand_norm(int argc, VALUE* argv, VALUE self) {
-  int n;
-  randn_opt_t g;
-  VALUE v1 = Qnil, v2 = Qnil;
-  ndfunc_arg_in_t ain[1] = { { OVERWRITE, 0 } };
-  ndfunc_t ndf = { iter_scomplex_rand_norm, FULL_LOOP, 1, 0, ain, 0 };
-
-  n = rb_scan_args(argc, argv, "02", &v1, &v2);
-  if (n == 0) {
-    g.mu = m_zero;
-  } else {
-    g.mu = m_num_to_data(v1);
-  }
-  if (n == 2) {
-    g.sigma = NUM2DBL(v2);
-  } else {
-    g.sigma = 1;
-  }
-  na_ndloop3(&ndf, &g, 1, self);
-  return self;
-}
-
 static void iter_scomplex_poly(na_loop_t* const lp) {
   size_t i;
   dtype x, y, a;
@@ -2934,11 +2506,37 @@ void Init_numo_scomplex(void) {
    *   @return [Numo::NArray] self / other
    */
   rb_define_method(cT, "/", scomplex_div, 1);
+  /**
+   * Binary power.
+   * @overload ** other
+   *   @param [Numo::NArray,Numeric] other
+   *   @return [Numo::NArray] self to the other-th power.
+   */
   rb_define_method(cT, "**", scomplex_pow, 1);
   rb_define_alias(cT, "pow", "**");
+  /**
+   * Unary minus.
+   * @overload -@
+   *   @return [Numo::SComplex] minus of self.
+   */
   rb_define_method(cT, "-@", scomplex_minus, 0);
+  /**
+   * Unary reciprocal.
+   * @overload reciprocal
+   *   @return [Numo::SComplex] reciprocal of self.
+   */
   rb_define_method(cT, "reciprocal", scomplex_reciprocal, 0);
+  /**
+   * Unary sign.
+   * @overload sign
+   *   @return [Numo::SComplex] sign of self.
+   */
   rb_define_method(cT, "sign", scomplex_sign, 0);
+  /**
+   * Unary square.
+   * @overload square
+   *   @return [Numo::SComplex] square of self.
+   */
   rb_define_method(cT, "square", scomplex_square, 0);
   rb_define_method(cT, "conj", scomplex_conj, 0);
   rb_define_method(cT, "im", scomplex_im, 0);
@@ -3201,6 +2799,15 @@ void Init_numo_scomplex(void) {
    *   # [4, 3, 3, 2, 4, 2]
    */
   rb_define_method(cT, "rand", scomplex_rand, -1);
+  /**
+   * Generates random numbers from the normal distribution on self narray
+   * using Box-Muller Transformation.
+   *
+   * @overload rand_norm([mu,[sigma]])
+   *   @param [Numeric] mu  mean of normal distribution. (default=0)
+   *   @param [Numeric] sigma  standard deviation of normal distribution. (default=1)
+   *   @return [Numo::SComplex] self.
+   */
   rb_define_method(cT, "rand_norm", scomplex_rand_norm, -1);
   rb_define_method(cT, "poly", scomplex_poly, -2);
   rb_define_singleton_method(cT, "[]", scomplex_s_cast, -2);