numo-narray-alt 0.9.13 → 0.9.14

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

@@ -60,12 +60,19 @@ static ID id_truncate;
 VALUE cT;
 extern VALUE cRT;
 
+#include "mh/extract.h"
+#include "mh/aref.h"
 #include "mh/coerce_cast.h"
 #include "mh/to_a.h"
 #include "mh/fill.h"
 #include "mh/format.h"
 #include "mh/format_to_a.h"
 #include "mh/inspect.h"
+#include "mh/each.h"
+#include "mh/map.h"
+#include "mh/each_with_index.h"
+#include "mh/map_with_index.h"
+#include "mh/abs.h"
 #include "mh/op/add.h"
 #include "mh/op/sub.h"
 #include "mh/op/mul.h"
@@ -123,15 +130,23 @@ extern VALUE cRT;
 #include "mh/logseq.h"
 #include "mh/eye.h"
 #include "mh/rand.h"
+#include "mh/poly.h"
 
 typedef VALUE robject; // Type aliases for shorter notation
                        // following the codebase naming convention.
+DEF_NARRAY_EXTRACT_METHOD_FUNC(robject)
+DEF_NARRAY_AREF_METHOD_FUNC(robject)
 DEF_NARRAY_COERCE_CAST_METHOD_FUNC(robject)
 DEF_NARRAY_TO_A_METHOD_FUNC(robject)
 DEF_NARRAY_FILL_METHOD_FUNC(robject)
 DEF_NARRAY_FORMAT_METHOD_FUNC(robject)
 DEF_NARRAY_FORMAT_TO_A_METHOD_FUNC(robject)
 DEF_NARRAY_ROBJ_INSPECT_METHOD_FUNC()
+DEF_NARRAY_EACH_METHOD_FUNC(robject)
+DEF_NARRAY_ROBJ_MAP_METHOD_FUNC()
+DEF_NARRAY_EACH_WITH_INDEX_METHOD_FUNC(robject)
+DEF_NARRAY_MAP_WITH_INDEX_METHOD_FUNC(robject, numo_cRObject)
+DEF_NARRAY_ABS_METHOD_FUNC(robject, numo_cRObject, robject, numo_cRObject)
 DEF_NARRAY_ROBJ_ADD_METHOD_FUNC()
 DEF_NARRAY_ROBJ_SUB_METHOD_FUNC()
 DEF_NARRAY_ROBJ_MUL_METHOD_FUNC()
@@ -189,6 +204,7 @@ DEF_NARRAY_FLT_SEQ_METHOD_FUNC(robject)
 DEF_NARRAY_FLT_LOGSEQ_METHOD_FUNC(robject)
 DEF_NARRAY_EYE_METHOD_FUNC(robject)
 DEF_NARRAY_FLT_RAND_METHOD_FUNC(robject)
+DEF_NARRAY_POLY_METHOD_FUNC(robject, numo_cRObject)
 
 static VALUE robject_store(VALUE, VALUE);
 
@@ -315,28 +331,6 @@ static VALUE robject_allocate(VALUE self) {
   return self;
 }
 
-/*
-  Extract an element only if self is a dimensionless NArray.
-  @overload extract
-    @return [Numeric,Numo::NArray]
-    --- Extract element value as Ruby Object if self is a dimensionless NArray,
-    otherwise returns self.
-*/
-static VALUE robject_extract(VALUE self) {
-  volatile VALUE v;
-  char* ptr;
-  narray_t* na;
-  GetNArray(self, na);
-
-  if (na->ndim == 0) {
-    ptr = na_get_pointer_for_read(self) + na_get_offset(self);
-    v = m_extract(ptr);
-    na_release_lock(self);
-    return v;
-  }
-  return self;
-}
-
 static VALUE robject_new_dim0(dtype x) {
   VALUE v;
   dtype* ptr;
@@ -1307,29 +1301,6 @@ static VALUE robject_s_cast(VALUE type, VALUE obj) {
   return robject_new_dim0(obj);
 }
 
-/*
-  Multi-dimensional element reference.
-  @overload [](dim0,...,dimL)
-    @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol]
-    dim0,...,dimL  multi-dimensional indices.
-    @return [Numeric,Numo::RObject] an element or NArray view.
-  @see Numo::NArray#[]
-  @see #[]=
- */
-static VALUE robject_aref(int argc, VALUE* argv, VALUE self) {
-  int nd;
-  size_t pos;
-  char* ptr;
-
-  nd = na_get_result_dimension(self, argc, argv, sizeof(dtype), &pos);
-  if (nd) {
-    return na_aref_main(argc, argv, self, 0, nd);
-  } else {
-    ptr = na_get_pointer_for_read(self) + pos;
-    return m_extract(ptr);
-  }
-}
-
 /*
   Multi-dimensional element assignment.
   @overload []=(dim0,...,dimL,val)
@@ -1364,361 +1335,6 @@ static VALUE robject_aset(int argc, VALUE* argv, VALUE self) {
   return argv[argc];
 }
 
-static void iter_robject_each(na_loop_t* const lp) {
-  size_t i, s1;
-  char* p1;
-  size_t* idx1;
-  dtype x;
-  VALUE y;
-
-  INIT_COUNTER(lp, i);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  if (idx1) {
-    for (; i--;) {
-      GET_DATA_INDEX(p1, idx1, dtype, x);
-      y = m_data_to_num(x);
-      rb_yield(y);
-    }
-  } else {
-    for (; i--;) {
-      GET_DATA_STRIDE(p1, s1, dtype, x);
-      y = m_data_to_num(x);
-      rb_yield(y);
-    }
-  }
-}
-
-/*
-  Calls the given block once for each element in self,
-  passing that element as a parameter.
-  @overload each
-    @return [Numo::NArray] self
-    For a block `{|x| ... }`,
-    @yieldparam [Numeric] x  an element of NArray.
-  @see #each_with_index
-  @see #map
-*/
-static VALUE robject_each(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { Qnil, 0 } };
-  ndfunc_t ndf = { iter_robject_each, FULL_LOOP_NIP, 1, 0, ain, 0 };
-
-  na_ndloop(&ndf, 1, self);
-  return self;
-}
-
-static void iter_robject_map(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_map(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      for (i = 0; i < n; i++) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = m_map(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_map(x);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-      }
-    } else {
-      //
-      for (i = 0; i < n; i++) {
-        *(dtype*)p2 = m_map(*(dtype*)p1);
-        p1 += s1;
-        p2 += s2;
-      }
-      return;
-      //
-    }
-  }
-}
-
-/*
-  Unary map.
-  @overload map
-    @return [Numo::RObject] map of self.
-*/
-static VALUE robject_map(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_robject_map, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static inline void yield_each_with_index(dtype x, size_t* c, VALUE* a, int nd, int md) {
-  int j;
-
-  a[0] = m_data_to_num(x);
-  for (j = 0; j <= nd; j++) {
-    a[j + 1] = SIZET2NUM(c[j]);
-  }
-  rb_yield(rb_ary_new4(md, a));
-}
-
-static void iter_robject_each_with_index(na_loop_t* const lp) {
-  size_t i, s1;
-  char* p1;
-  size_t* idx1;
-  dtype x;
-  VALUE* a;
-  size_t* c;
-  int nd, md;
-
-  c = (size_t*)(lp->opt_ptr);
-  nd = lp->ndim;
-  if (nd > 0) {
-    nd--;
-  }
-  md = nd + 2;
-  a = ALLOCA_N(VALUE, md);
-
-  INIT_COUNTER(lp, i);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  c[nd] = 0;
-  if (idx1) {
-    for (; i--;) {
-      GET_DATA_INDEX(p1, idx1, dtype, x);
-      yield_each_with_index(x, c, a, nd, md);
-      c[nd]++;
-    }
-  } else {
-    for (; i--;) {
-      GET_DATA_STRIDE(p1, s1, dtype, x);
-      yield_each_with_index(x, c, a, nd, md);
-      c[nd]++;
-    }
-  }
-}
-
-/*
-  Invokes the given block once for each element of self,
-  passing that element and indices along each axis as parameters.
-  @overload each_with_index
-    For a block `{|x,i,j,...| ... }`,
-    @yieldparam [Numeric] x  an element
-    @yieldparam [Integer] i,j,...  multitimensional indices
-    @return [Numo::NArray] self
-  @see #each
-  @see #map_with_index
-*/
-static VALUE robject_each_with_index(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { Qnil, 0 } };
-  ndfunc_t ndf = { iter_robject_each_with_index, FULL_LOOP_NIP, 1, 0, ain, 0 };
-
-  na_ndloop_with_index(&ndf, 1, self);
-  return self;
-}
-
-static inline dtype yield_map_with_index(dtype x, size_t* c, VALUE* a, int nd, int md) {
-  int j;
-  VALUE y;
-
-  a[0] = m_data_to_num(x);
-  for (j = 0; j <= nd; j++) {
-    a[j + 1] = SIZET2NUM(c[j]);
-  }
-  y = rb_yield(rb_ary_new4(md, a));
-  return m_num_to_data(y);
-}
-
-static void iter_robject_map_with_index(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-  VALUE* a;
-  size_t* c;
-  int nd, md;
-
-  c = (size_t*)(lp->opt_ptr);
-  nd = lp->ndim;
-  if (nd > 0) {
-    nd--;
-  }
-  md = nd + 2;
-  a = ALLOCA_N(VALUE, md);
-
-  INIT_COUNTER(lp, i);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-  c[nd] = 0;
-  if (idx1) {
-    if (idx2) {
-      for (; i--;) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = yield_map_with_index(x, c, a, nd, md);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-        c[nd]++;
-      }
-    } else {
-      for (; i--;) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        x = yield_map_with_index(x, c, a, nd, md);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-        c[nd]++;
-      }
-    }
-  } else {
-    if (idx2) {
-      for (; i--;) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = yield_map_with_index(x, c, a, nd, md);
-        SET_DATA_INDEX(p2, idx2, dtype, x);
-        c[nd]++;
-      }
-    } else {
-      for (; i--;) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        x = yield_map_with_index(x, c, a, nd, md);
-        SET_DATA_STRIDE(p2, s2, dtype, x);
-        c[nd]++;
-      }
-    }
-  }
-}
-
-/*
-  Invokes the given block once for each element of self,
-  passing that element and indices along each axis as parameters.
-  Creates a new NArray containing the values returned by the block.
-  Inplace option is allowed, i.e., `nary.inplace.map` overwrites `nary`.
-  @overload map_with_index
-    For a block `{|x,i,j,...| ... }`,
-    @yieldparam [Numeric] x  an element
-    @yieldparam [Integer] i,j,...  multitimensional indices
-    @return [Numo::NArray] mapped array
-  @see #map
-  @see #each_with_index
-*/
-static VALUE robject_map_with_index(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { Qnil, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_robject_map_with_index, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop_with_index(&ndf, 1, self);
-}
-
-static void iter_robject_abs(na_loop_t* const lp) {
-  size_t i;
-  char *p1, *p2;
-  ssize_t s1, s2;
-  size_t *idx1, *idx2;
-  dtype x;
-  rtype y;
-  INIT_COUNTER(lp, i);
-  INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-  INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-  if (idx1) {
-    if (idx2) {
-      for (; i--;) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        y = m_abs(x);
-        SET_DATA_INDEX(p2, idx2, rtype, y);
-      }
-    } else {
-      for (; i--;) {
-        GET_DATA_INDEX(p1, idx1, dtype, x);
-        y = m_abs(x);
-        SET_DATA_STRIDE(p2, s2, rtype, y);
-      }
-    }
-  } else {
-    if (idx2) {
-      for (; i--;) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        y = m_abs(x);
-        SET_DATA_INDEX(p2, idx2, rtype, y);
-      }
-    } else {
-      for (; i--;) {
-        GET_DATA_STRIDE(p1, s1, dtype, x);
-        y = m_abs(x);
-        SET_DATA_STRIDE(p2, s2, rtype, y);
-      }
-    }
-  }
-}
-
-/*
-  abs of self.
-  @overload abs
-    @return [Numo::RObject] abs of self.
-*/
-static VALUE robject_abs(VALUE self) {
-  ndfunc_arg_in_t ain[1] = { { cT, 0 } };
-  ndfunc_arg_out_t aout[1] = { { cRT, 0 } };
-  ndfunc_t ndf = { iter_robject_abs, FULL_LOOP, 1, 1, ain, aout };
-
-  return na_ndloop(&ndf, 1, self);
-}
-
-static void iter_robject_poly(na_loop_t* const lp) {
-  size_t i;
-  dtype x, y, a;
-
-  x = *(dtype*)(lp->args[0].ptr + lp->args[0].iter[0].pos);
-  i = lp->narg - 2;
-  y = *(dtype*)(lp->args[i].ptr + lp->args[i].iter[0].pos);
-  for (; --i;) {
-    y = m_mul(x, y);
-    a = *(dtype*)(lp->args[i].ptr + lp->args[i].iter[0].pos);
-    y = m_add(y, a);
-  }
-  i = lp->narg - 1;
-  *(dtype*)(lp->args[i].ptr + lp->args[i].iter[0].pos) = y;
-}
-
-/*
-  Calculate polynomial.
-    `x.poly(a0,a1,a2,...,an) = a0 + a1*x + a2*x**2 + ... + an*x**n`
-  @overload poly a0, a1, ..., an
-    @param [Numo::NArray,Numeric] a0,a1,...,an
-    @return [Numo::RObject]
-*/
-static VALUE robject_poly(VALUE self, VALUE args) {
-  int argc, i;
-  VALUE* argv;
-  volatile VALUE v, a;
-  ndfunc_arg_out_t aout[1] = { { cT, 0 } };
-  ndfunc_t ndf = { iter_robject_poly, NO_LOOP, 0, 1, 0, aout };
-
-  argc = (int)RARRAY_LEN(args);
-  ndf.nin = argc + 1;
-  ndf.ain = ALLOCA_N(ndfunc_arg_in_t, argc + 1);
-  for (i = 0; i < argc + 1; i++) {
-    ndf.ain[i].type = cT;
-  }
-  argv = ALLOCA_N(VALUE, argc + 1);
-  argv[0] = self;
-  for (i = 0; i < argc; i++) {
-    argv[i + 1] = RARRAY_PTR(args)[i];
-  }
-  a = rb_ary_new4(argc + 1, argv);
-  v = na_ndloop2(&ndf, a);
-  return robject_extract(v);
-}
-
 void Init_numo_robject(void) {
   VALUE hCast, mNumo;
 
@@ -1806,11 +1422,27 @@ void Init_numo_robject(void) {
   rb_undef_method(cT, "to_swapped");
   rb_define_alloc_func(cT, robject_s_alloc_func);
   rb_define_method(cT, "allocate", robject_allocate, 0);
+  /**
+   * Extract an element only if self is a dimensionless NArray.
+   * @overload extract
+   *   @return [Numeric,Numo::NArray]
+   *   --- Extract element value as Ruby Object if self is a dimensionless NArray,
+   *   otherwise returns self.
+   */
   rb_define_method(cT, "extract", robject_extract, 0);
 
   rb_define_method(cT, "store", robject_store, 1);
 
   rb_define_singleton_method(cT, "cast", robject_s_cast, 1);
+  /**
+   * Multi-dimensional element reference.
+   * @overload [](dim0,...,dimL)
+   *   @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,
+   *     Symbol] dim0,...,dimL  multi-dimensional indices.
+   *   @return [Numeric,Numo::RObject] an element or NArray view.
+   * @see Numo::NArray#[]
+   * @see #[]=
+   */
   rb_define_method(cT, "[]", robject_aref, -1);
   rb_define_method(cT, "[]=", robject_aset, -1);
   /**
@@ -1852,10 +1484,54 @@ void Init_numo_robject(void) {
    *   @return [String]
    */
   rb_define_method(cT, "inspect", robject_inspect, 0);
+  /**
+   * Calls the given block once for each element in self,
+   * passing that element as a parameter.
+   * @overload each
+   *   @return [Numo::NArray] self
+   *   For a block `{|x| ... }`,
+   *   @yieldparam [Numeric] x  an element of NArray.
+   * @see #each_with_index
+   * @see #map
+   */
   rb_define_method(cT, "each", robject_each, 0);
+  /**
+   * Unary map.
+   * @overload map
+   *   @return [Numo::RObject] map of self.
+   */
   rb_define_method(cT, "map", robject_map, 0);
+  /**
+   * Invokes the given block once for each element of self,
+   * passing that element and indices along each axis as parameters.
+   * @overload each_with_index
+   *   For a block `{|x,i,j,...| ... }`,
+   *   @yieldparam [Numeric] x  an element
+   *   @yieldparam [Integer] i,j,...  multitimensional indices
+   *   @return [Numo::NArray] self
+   * @see #each
+   * @see #map_with_index
+   */
   rb_define_method(cT, "each_with_index", robject_each_with_index, 0);
+  /**
+   * Invokes the given block once for each element of self,
+   * passing that element and indices along each axis as parameters.
+   * Creates a new NArray containing the values returned by the block.
+   * Inplace option is allowed, i.e., `nary.inplace.map` overwrites `nary`.
+   * @overload map_with_index
+   *   For a block `{|x,i,j,...| ... }`,
+   *   @yieldparam [Numeric] x  an element
+   *   @yieldparam [Integer] i,j,...  multitimensional indices
+   *   @return [Numo::NArray] mapped array
+   * @see #map
+   * @see #each_with_index
+   */
   rb_define_method(cT, "map_with_index", robject_map_with_index, 0);
+  /**
+   * abs of self.
+   * @overload abs
+   *   @return [Numo::RObject] abs of self.
+   */
   rb_define_method(cT, "abs", robject_abs, 0);
   /**
    * Binary add.
@@ -2429,6 +2105,13 @@ void Init_numo_robject(void) {
    *   # [4, 3, 3, 2, 4, 2]
    */
   rb_define_method(cT, "rand", robject_rand, -1);
+  /**
+   * Calculate polynomial.
+   *   `x.poly(a0,a1,a2,...,an) = a0 + a1*x + a2*x**2 + ... + an*x**n`
+   * @overload poly a0, a1, ..., an
+   *   @param [Numo::NArray,Numeric] a0,a1,...,an
+   *   @return [Numo::RObject]
+   */
   rb_define_method(cT, "poly", robject_poly, -2);
   rb_define_singleton_method(cT, "[]", robject_s_cast, -2);
 }