numo-narray 0.9.0.4 → 0.9.0.5

data/ext/numo/narray/gen/tmpl/sort.c

@@ -1,5 +1,6 @@
+<% (is_float ? ["_ignan","_prnan"] : [""]).each do |j| %>
 static void
-<%=c_iter%>(na_loop_t *const lp)
+<%=c_iter%><%=j%>(na_loop_t *const lp)
 {
     size_t n;
     char *ptr;
@@ -7,30 +8,44 @@ static void
 
     INIT_COUNTER(lp, n);
     INIT_PTR(lp, 0, ptr, step);
-    <%=tp%>_qsort(ptr, n, step);
+    <%=type_name%>_qsort<%=j%>(ptr, n, step);
 }
+<% end %>
 
 /*
- *  call-seq:
- *     narray.sort() => narray
- *     narray.sort(dim0,dim1,...) => narray
- *
- *  Return an index array of sort result.
- *
- *     Numo::DFloat[3,4,1,2].sort => Numo::DFloat[1,2,3,4]
- */
+  <%=name%> of self.
+<% if is_float %>
+  @overload <%=name%>(axis:nil, nan:false)
+  @param [TrueClass] nan  If true, propagete NaN. If false, ignore NaN.
+<% else %>
+  @overload <%=name%>(axis:nil)
+<% end %>
+  @param [Numeric,Array,Range] axis  Affected dimensions.
+  @return [Numo::<%=class_name%>] returns result of <%=name%>.
+  @example
+      Numo::DFloat[3,4,1,2].sort => Numo::DFloat[1,2,3,4]
+*/
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
+    int nan = 0;
     VALUE reduce;
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{sym_reduce,0}};
-    ndfunc_t ndf = {<%=c_iter%>, STRIDE_LOOP_NIP|NDF_INPLACE|NDF_FLAT_REDUCE, 2,0, ain,0};
+    ndfunc_t ndf = {0, STRIDE_LOOP|NDF_FLAT_REDUCE, 2,0, ain,0};
 
     if (!TEST_INPLACE(self)) {
         self = na_copy(self);
     }
-    reduce = na_reduce_dimension(argc, argv, 1, &self); // v[0] = self
-
+    reduce = na_reduce_dimension(argc, argv, 1, &self, &nan); // v[0] = self
+<% if is_float %>
+    if (nan) {
+        ndf.func = <%=c_iter%>_prnan;
+    } else {
+        ndf.func = <%=c_iter%>_ignan;
+    }
+<% else %>
+    ndf.func = <%=c_iter%>;
+<% end %>
     na_ndloop(&ndf, 2, self, reduce);
     return self;
 }

data/ext/numo/narray/gen/tmpl/sort_index.c

@@ -1,8 +1,8 @@
-
-<% [64,32].each do |i| %>
+<% (is_float ? ["_ignan","_prnan"] : [""]).each do |j|
+   [64,32].each do |i| %>
 #define idx_t int<%=i%>_t
 static void
-<%=tp%>_index<%=i%>_qsort(na_loop_t *const lp)
+<%=type_name%>_index<%=i%>_qsort<%=j%>(na_loop_t *const lp)
 {
     size_t   i, n, idx;
     char    *d_ptr, *i_ptr, *o_ptr;
@@ -23,7 +23,7 @@ static void
         //printf("(%ld,%.3f)",i,*(double*)ptr[i]);
     }
 
-    <%=tp%>_index_qsort(ptr, n, sizeof(dtype*));
+    <%=type_name%>_index_qsort<%=j%>(ptr, n, sizeof(dtype*));
 
     //d_ptr = lp->args[0].ptr;
     //printf("(d_ptr=%lx)\n",(size_t)d_ptr);
@@ -37,20 +37,25 @@ static void
     //printf("\n");
 }
 #undef idx_t
-<% end %>
+<% end;end %>
 
 /*
- *  call-seq:
- *     narray.sort_index() => narray
- *     narray.sort_index(dim0,dim1,..) => narray
- *
- *  Return an index array of sort result.
- *
- *     Numo::NArray[3,4,1,2].sort_index => Numo::Int32[2,3,0,1]
- */
+  <%=name%>. Returns an index array of sort result.
+<% if is_float %>
+  @overload <%=name%>(axis:nil, nan:false)
+  @param [TrueClass] nan  If true, propagete NaN. If false, ignore NaN.
+<% else %>
+  @overload <%=name%>(axis:nil)
+<% end %>
+  @param [Numeric,Array,Range] axis  Affected dimensions.
+  @return [Integer,Numo::Int] returns result index of <%=name%>.
+  @example
+      Numo::NArray[3,4,1,2].sort_index => Numo::Int32[2,3,0,1]
+*/
 static VALUE
-<%=c_func%>(int argc, VALUE *argv, VALUE self)
+<%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
+    int nan = 0;
     size_t size;
     narray_t *na;
     VALUE idx, tmp, reduce, res;
@@ -59,6 +64,8 @@ static VALUE
     ndfunc_arg_out_t aout[1] = {{0,0,0}};
     ndfunc_t ndf = {0, STRIDE_LOOP_NIP|NDF_FLAT_REDUCE|NDF_CUM, 3,1, ain,aout};
 
+    reduce = na_reduce_dimension(argc, argv, 1, &self, &nan); // v[0] = self
+
     GetNArray(self,na);
     if (na->ndim==0) {
         return INT2FIX(0);
@@ -66,18 +73,32 @@ static VALUE
     if (na->size > (~(u_int32_t)0)) {
         ain[1].type =
         aout[0].type = numo_cInt64;
-        idx = rb_narray_new(numo_cInt64, na->ndim, na->shape);
-        ndf.func = <%=tp%>_index64_qsort;
+        idx = nary_new(numo_cInt64, na->ndim, na->shape);
+<% if is_float %>
+        if (nan) {
+            ndf.func = <%=type_name%>_index64_qsort_prnan;
+        } else {
+            ndf.func = <%=type_name%>_index64_qsort_ignan;
+        }
+<% else %>
+        ndf.func = <%=type_name%>_index64_qsort;
+<% end %>
     } else {
         ain[1].type =
         aout[0].type = numo_cInt32;
-        idx = rb_narray_new(numo_cInt32, na->ndim, na->shape);
-        ndf.func = <%=tp%>_index32_qsort;
+        idx = nary_new(numo_cInt32, na->ndim, na->shape);
+<% if is_float %>
+        if (nan) {
+            ndf.func = <%=type_name%>_index32_qsort_prnan;
+        } else {
+            ndf.func = <%=type_name%>_index32_qsort_ignan;
+        }
+<% else %>
+        ndf.func = <%=type_name%>_index32_qsort;
+<% end %>
     }
     rb_funcall(idx, rb_intern("seq"), 0);
 
-    reduce = na_reduce_dimension(argc, argv, 1, &self); // v[0] = self
-
     size = na->size*sizeof(void*);
     buf = rb_alloc_tmp_buffer(&tmp, size);
     res = na_ndloop3(&ndf, buf, 3, self, idx, reduce);

data/ext/numo/narray/gen/tmpl/store.c

@@ -1,3 +1,7 @@
+<% children.each do |c|%>
+<%= c.result %>
+
+<% end %>
 /*
   Store elements to Numo::<%=class_name%> from other.
   @overload store(other)
@@ -5,12 +9,14 @@
   @return [Numo::<%=class_name%>] self
 */
 static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(1)%>(VALUE self, VALUE obj)
 {
-    VALUE r;
+    VALUE r, klass;
+
+    klass = CLASS_OF(obj);
 
-    <% Store.definitions.each do |x| %>
-    if (<%=x.condition%>) {
+    <% definitions.each do |x| %>
+    if (<%=x.condition("klass")%>) {
         <%=x.c_func%>(self,obj);
         return self;
     }
@@ -25,7 +31,7 @@ static VALUE
     }
 
     <% if is_object %>
-    numo_robject_store_numeric(self,obj);
+    robject_store_numeric(self,obj);
     <% else %>
     rb_raise(nary_eCastError, "unknown conversion from %s to %s",
              rb_class2name(CLASS_OF(obj)),

data/ext/numo/narray/gen/tmpl/store_array.c

@@ -19,7 +19,7 @@ static void
 
     if (lp->args[1].ptr) {
         if (v1 == Qtrue) {
-            iter_<%=tp%>_store_<%=tp%>(lp);
+            iter_<%=type_name%>_store_<%=type_name%>(lp);
             i = lp->args[1].shape[0];
             if (idx1) {
                 idx1 += i;

data/ext/numo/narray/gen/tmpl/store_bit.c

@@ -45,7 +45,7 @@ static void
 
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(:nodef)%>(VALUE self, VALUE obj)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2,0, ain,0};

data/ext/numo/narray/gen/tmpl/store_from.c

@@ -43,7 +43,7 @@ static void
 
 
 static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(:nodef)%>(VALUE self, VALUE obj)
 {
     ndfunc_arg_in_t ain[2] = {{OVERWRITE,0},{Qnil,0}};
     ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP, 2, 0, ain, 0 };

data/ext/numo/narray/gen/tmpl/store_numeric.c

@@ -1,22 +1,9 @@
 static VALUE
-numo_<%=tp%>_new_dim0(dtype x)
-{
-    VALUE v;
-    dtype *ptr;
-
-    v = rb_narray_new(cT, 0, NULL);
-    ptr = (dtype*)(char*)na_get_pointer_for_write(v);
-    *ptr = x;
-    na_release_lock(v);
-    return v;
-}
-
-static VALUE
-<%=c_func%>(VALUE self, VALUE obj)
+<%=c_func(:nodef)%>(VALUE self, VALUE obj)
 {
     dtype x;
     x = m_num_to_data(obj);
-    obj = numo_<%=tp%>_new_dim0(x);
-    <%=find_tmpl("store").c_func%>(self,obj);
+    obj = <%=type_name%>_new_dim0(x);
+    <%=parent.c_func%>(self,obj);
     return self;
 }

data/ext/numo/narray/gen/tmpl/to_a.c

@@ -28,11 +28,11 @@ void
 
 /*
   Convert self to Array.
-  @overload <%=method%>
+  @overload <%=name%>
   @return [Array]
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[3] = {{Qnil,0},{sym_loop_opt},{sym_option}};
     ndfunc_arg_out_t aout[1] = {{rb_cArray,0}}; // dummy?

data/ext/numo/narray/gen/tmpl/unary.c

@@ -15,13 +15,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,dtype,x);
             }
         }
@@ -29,13 +29,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,dtype,x);
             }
         }
@@ -43,12 +43,12 @@ static void
 }
 
 /*
-  Unary <%=method%>.
+  Unary <%=name%>.
   @overload <%=op_map%>
-  @return [Numo::<%=class_name%>] <%=method%> of self.
+  @return [Numo::<%=class_name%>] <%=name%> of self.
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{cT,0}};
     ndfunc_arg_out_t aout[1] = {{cT,0}};

data/ext/numo/narray/gen/tmpl/unary2.c

@@ -14,13 +14,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,<%=dtype%>,y);
             }
         } else {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,<%=dtype%>,y);
             }
         }
@@ -28,13 +28,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,<%=dtype%>,y);
             }
         } else {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                y = m_<%=method%>(x);
+                y = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,<%=dtype%>,y);
             }
         }
@@ -43,12 +43,12 @@ static void
 
 
 /*
-  <%=method%> of self.
-  @overload <%=method%>
-  @return [Numo::<%=real_class_name%>] <%=method%> of self.
+  <%=name%> of self.
+  @overload <%=name%>
+  @return [Numo::<%=real_class_name%>] <%=name%> of self.
 */
 static VALUE
-<%=c_func%>(VALUE self)
+<%=c_func(0)%>(VALUE self)
 {
     ndfunc_arg_in_t ain[1] = {{cT,0}};
     ndfunc_arg_out_t aout[1] = {{<%=tpclass%>,0}};

data/ext/numo/narray/gen/tmpl/unary_ret2.c

@@ -0,0 +1,33 @@
+static void
+<%=c_iter%>(na_loop_t *const lp)
+{
+    size_t  i;
+    char   *p1, *p2, *p3;
+    ssize_t s1, s2, s3;
+    dtype   x, y, z;
+    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);
+        m_<%=name%>(x,y,z);
+        SET_DATA_STRIDE(p2,s2,dtype,y);
+        SET_DATA_STRIDE(p3,s3,dtype,z);
+    }
+}
+
+/*
+  <%=name%> of self.
+  @overload <%=name%>
+  @return [Numo::<%=real_class_name%>] <%=name%> of self.
+*/
+static VALUE
+<%=c_func(0)%>(VALUE self)
+{
+    ndfunc_arg_in_t ain[1] = {{cT,0}};
+    ndfunc_arg_out_t aout[2] = {{cT,0},{cT,0}};
+    ndfunc_t ndf = {<%=c_iter%>, STRIDE_LOOP, 1,2, ain,aout};
+
+    return na_ndloop(&ndf, 1, self);
+}

data/ext/numo/narray/gen/tmpl/unary_s.c

@@ -13,13 +13,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,dtype,x);
             }
         }
@@ -27,13 +27,13 @@ static void
         if (idx2) {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_INDEX(p2,idx2,dtype,x);
             }
         } else {
             for (; i--;) {
                 GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = m_<%=method%>(x);
+                x = m_<%=name%>(x);
                 SET_DATA_STRIDE(p2,s2,dtype,x);
             }
         }
@@ -41,13 +41,13 @@ static void
 }
 
 /*
-  Calculate <%=method%>(x).
-  @overload <%=method%>(x)
+  Calculate <%=name%>(x).
+  @overload <%=name%>(x)
   @param [Numo::NArray,Numeric] x  input value
-  @return [Numo::<%=class_name%>] result of <%=method%>(x).
+  @return [Numo::<%=class_name%>] result of <%=name%>(x).
 */
 static VALUE
-<%=c_func%>(VALUE mod, VALUE a1)
+<%=c_func(1)%>(VALUE mod, VALUE a1)
 {
     ndfunc_arg_in_t ain[1] = {{cT,0}};
     ndfunc_arg_out_t aout[1] = {{cT,0}};