carray 1.3.5 → 1.5.1

data/{carray_generate.c → ext/carray_generate.c}

@@ -562,7 +562,7 @@ rb_ca_swap_bytes (VALUE self)
 
 /* ----------------------------------------------------------------- */
 
-#define proc_trim_bang(type, from)                                 \
+#define proc_trim_bang2(type, from)                                 \
   {                                                                \
     type *ptr = (type *) ca->ptr;                                  \
     boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
@@ -601,6 +601,72 @@ rb_ca_swap_bytes (VALUE self)
     }                                                              \
   }
 
+#define proc_trim_bang(type, from)                                 \
+  {                                                                \
+    type *ptr = (type *) ca->ptr;                                  \
+    boolean8_t *m = (ca->mask) ? (boolean8_t*) ca->mask->ptr : NULL; \
+    if ( ! NIL_P(rmin) ) {                                          \
+      type min  = (type) from(rmin);                                 \
+      ca_size_t i;                                                     \
+      if ( m && rfval == CA_UNDEF) {                                 \
+        for (i=ca->elements; i; i--, ptr++, m++) {                   \
+          if ( ! *m ) {                                              \
+            if ( *ptr < min )                                        \
+              *m = 1;                                                \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+      else {                                                         \
+        int  has_fill = ! ( NIL_P(rfval) );                          \
+        type fill = (has_fill) ? (type) from(rfval) : (type) 0;      \
+        if ( m ) {                                                   \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( ! *m++ ) {                                          \
+              if ( *ptr < min )                                 \
+                *ptr = (has_fill) ? fill : min;                      \
+            }                                                        \
+          }                                                          \
+        }                                                            \
+        else {                                                       \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( *ptr < min )                                   \
+              *ptr = (has_fill) ? fill : min;                        \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+    }                                                              \
+    if ( ! NIL_P(rmax) ) {                                          \
+      type max  = (type) from(rmax);                                 \
+      ca_size_t i;                                                     \
+      if ( m && rfval == CA_UNDEF) {                                 \
+        for (i=ca->elements; i; i--, ptr++, m++) {                   \
+          if ( ! *m ) {                                              \
+            if ( *ptr >= max )                         \
+              *m = 1;                                                \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+      else {                                                         \
+        int  has_fill = ! ( NIL_P(rfval) );                          \
+        type fill = (has_fill) ? (type) from(rfval) : (type) 0;             \
+        if ( m ) {                                                   \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( ! *m++ ) {                                          \
+              if ( *ptr >= max )                                     \
+                *ptr = (has_fill) ? fill : max;                      \
+            }                                                        \
+          }                                                          \
+        }                                                            \
+        else {                                                       \
+          for (i=ca->elements; i; i--, ptr++) {                      \
+            if ( *ptr >= max )                                       \
+              *ptr = (has_fill) ? fill : max;                        \
+          }                                                          \
+        }                                                            \
+      }                                                              \
+    }                                                              \    
+  }
+
 /* rdoc:
   class CArray
     # trims the data into the range between min and max. If `fill_value`

data/{carray_iterator.c → ext/carray_iterator.c}

@@ -15,19 +15,19 @@
 VALUE rb_cCAIterator;
 
 int8_t
-ca_iter_rank (VALUE self)
+ca_iter_ndim (VALUE self)
 {
-  int8_t rank;
+  int8_t ndim;
   if ( TYPE(self) == T_DATA ) {
     CAIterator *it;
     Data_Get_Struct(self, CAIterator, it);
-    rank = it->rank;
+    ndim = it->ndim;
   }
   else {
-    VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
-    rank = (int8_t) NUM2LONG(rrank);
+    VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
+    ndim = (int8_t) NUM2LONG(rndim);
   }
-  return rank;
+  return ndim;
 }
 
 void
@@ -37,16 +37,16 @@ ca_iter_dim (VALUE self, ca_size_t *dim)
   if ( TYPE(self) == T_DATA ) {
     CAIterator *it;
     Data_Get_Struct(self, CAIterator, it);
-    for (i=0; i<it->rank; i++) {
+    for (i=0; i<it->ndim; i++) {
       dim[i] = it->dim[i];
     }
   }
   else {
-    VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
+    VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
-    int8_t rank;
-    rank = (int8_t) NUM2INT(rrank);
-    for (i=0; i<rank; i++) {
+    int8_t ndim;
+    ndim = (int8_t) NUM2INT(rndim);
+    for (i=0; i<ndim; i++) {
       dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
     }
   }
@@ -60,16 +60,16 @@ ca_iter_elements (VALUE self)
     CAIterator *it;
     Data_Get_Struct(self, CAIterator, it);
     elements = 1;
-    for (i=0; i<it->rank; i++) {
+    for (i=0; i<it->ndim; i++) {
       elements *= it->dim[i];
     }
   }
   else {
-    VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
+    VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
-    int8_t rank = (int8_t) NUM2INT(rrank);
+    int8_t ndim = (int8_t) NUM2INT(rndim);
     elements = 1;
-    for (i=0; i<rank; i++) {
+    for (i=0; i<ndim; i++) {
       elements *= NUM2SIZE(rb_ary_entry(rdim, i));
     }
   }
@@ -119,10 +119,10 @@ ca_iter_kernel_at_index (VALUE self, ca_size_t *idx, VALUE rref)
   }
   else {
     VALUE vidx;
-    int8_t rank = ca_iter_rank(self);
+    int8_t ndim = ca_iter_ndim(self);
     int i;
-    vidx = rb_ary_new2(rank);
-    for (i=0; i<rank; i++) {
+    vidx = rb_ary_new2(ndim);
+    for (i=0; i<ndim; i++) {
       rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
     }
     rker = rb_funcall(self, rb_intern("kernel_at_index"), 2,
@@ -161,10 +161,10 @@ ca_iter_kernel_move_to_index (VALUE self, ca_size_t *idx, VALUE rref)
   }
   else {
     VALUE vidx;
-    int8_t rank = ca_iter_rank(self);
+    int8_t ndim = ca_iter_ndim(self);
     int i;
-    vidx = rb_ary_new2(rank);
-    for (i=0; i<rank; i++) {
+    vidx = rb_ary_new2(ndim);
+    for (i=0; i<ndim; i++) {
       rb_ary_store(vidx, i, SIZE2NUM(idx[i]));
     }
     rker = rb_funcall(self, rb_intern("kernel_move_to_index"), 2,
@@ -188,17 +188,17 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
   if ( TYPE(self) == T_DATA ) {
     CAIterator *it;
     Data_Get_Struct(self, CAIterator, it);
-    co = carray_new_safe(data_type, it->rank, it->dim, bytes, NULL);
+    co = carray_new_safe(data_type, it->ndim, it->dim, bytes, NULL);
   }
   else {
-    VALUE rrank = rb_ivar_get(self, rb_intern("@rank"));
+    VALUE rndim = rb_ivar_get(self, rb_intern("@ndim"));
     VALUE rdim  = rb_ivar_get(self, rb_intern("@dim"));
-    int8_t rank = NUM2LONG(rrank);
+    int8_t ndim = NUM2LONG(rndim);
     ca_size_t dim[CA_RANK_MAX];
-    for (i=0; i<rank; i++) {
+    for (i=0; i<ndim; i++) {
       dim[i] = NUM2SIZE(rb_ary_entry(rdim, i));
     }
-    co = carray_new_safe(data_type, rank, dim, bytes, NULL);
+    co = carray_new_safe(data_type, ndim, dim, bytes, NULL);
   }
 
   obj = ca_wrap_struct(co);
@@ -211,16 +211,16 @@ ca_iter_prepare_output (VALUE self, VALUE rtype, VALUE rbytes)
 
 /* rdoc:
   class CAIterator
-    def rank
+    def ndim
     end
   end
 */
 
 
 VALUE
-rb_ca_iter_rank (VALUE self)
+rb_ca_iter_ndim (VALUE self)
 {
-  return LONG2NUM(ca_iter_rank(self));
+  return LONG2NUM(ca_iter_ndim(self));
 }
 
 /* rdoc:
@@ -235,11 +235,11 @@ rb_ca_iter_dim (VALUE self)
 {
   VALUE rdim;
   ca_size_t dim[CA_RANK_MAX];
-  int8_t rank = ca_iter_rank(self);
+  int8_t ndim = ca_iter_ndim(self);
   int i;
   ca_iter_dim(self, dim);
-  rdim = rb_ary_new2(rank);
-  for (i=0; i<rank; i++) {
+  rdim = rb_ary_new2(ndim);
+  for (i=0; i<ndim; i++) {
     rb_ary_store(rdim, i, SIZE2NUM(dim[i]));
   }
   return rdim;
@@ -301,7 +301,7 @@ rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
 {
   volatile VALUE rindex, rcarray;
   ca_size_t idx[CA_RANK_MAX];
-  int8_t  rank = ca_iter_rank(self);
+  int8_t  ndim = ca_iter_ndim(self);
   int i;
 
   rb_scan_args(argc, argv, "11", (VALUE *) &rindex, (VALUE *) &rcarray);
@@ -310,7 +310,7 @@ rb_ca_iter_kernel_at_index (int argc, VALUE *argv, VALUE self)
     rcarray = rb_ca_iter_reference(self);
   }
 
-  for (i=0; i<rank; i++) {
+  for (i=0; i<ndim; i++) {
     idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
   }
 
@@ -341,10 +341,10 @@ VALUE
 rb_ca_iter_kernel_move_to_index (VALUE self, VALUE rindex, VALUE rker)
 {
   ca_size_t idx[CA_RANK_MAX];
-  int8_t  rank = ca_iter_rank(self);
+  int8_t  ndim = ca_iter_ndim(self);
   int i;
 
-  for (i=0; i<rank; i++) {
+  for (i=0; i<ndim; i++) {
     idx[i] = NUM2SIZE(rb_ary_entry(rindex, i));
   }
 
@@ -501,7 +501,7 @@ rb_ca_iter_filter (int argc, VALUE *argv, VALUE self)
   argc--;
   argv++;
 
-  co = carray_new(data_type, cr->rank, cr->dim, 0, NULL);
+  co = carray_new(data_type, cr->ndim, cr->dim, 0, NULL);
   routput = ca_wrap_struct(co);
 
   if ( NIL_P(argv[0]) ) {
@@ -606,8 +606,10 @@ Init_carray_iterator ()
 {
   rb_cCAIterator = rb_define_class("CAIterator", rb_cObject);
 
-  rb_define_method(rb_cCAIterator, "rank",      rb_ca_iter_rank,      0);
+  rb_define_method(rb_cCAIterator, "ndim",      rb_ca_iter_ndim,      0);
+  rb_define_method(rb_cCAIterator, "rank",      rb_ca_iter_ndim,      0); /* alias */
   rb_define_method(rb_cCAIterator, "dim",       rb_ca_iter_dim,       0);
+  rb_define_method(rb_cCAIterator, "shape",     rb_ca_iter_dim,       0); /* alias */
   rb_define_method(rb_cCAIterator, "elements",  rb_ca_iter_elements,  0);
   rb_define_method(rb_cCAIterator, "reference", rb_ca_iter_reference, 0);
 

data/{carray_loop.c → ext/carray_loop.c}

@@ -13,29 +13,29 @@
 #include "carray.h"
 
 static VALUE
-rb_ca_s_each_index_internal (int rank, VALUE *dim, uint8_t irank, VALUE ridx)
+rb_ca_s_each_index_internal (int ndim, VALUE *dim, uint8_t indim, VALUE ridx)
 {
   volatile VALUE ret = Qnil;
-  int32_t is_leaf = (irank == rank - 1);
+  int32_t is_leaf = (indim == ndim - 1);
   ca_size_t i;
 
-  if ( NIL_P(dim[irank]) ) {
-    rb_ary_store(ridx, irank, Qnil);
+  if ( NIL_P(dim[indim]) ) {
+    rb_ary_store(ridx, indim, Qnil);
     if ( is_leaf ) {
       ret = rb_yield_splat(rb_obj_clone(ridx));
     }
     else {
-      ret = rb_ca_s_each_index_internal(rank, dim, irank+1, ridx);
+      ret = rb_ca_s_each_index_internal(ndim, dim, indim+1, ridx);
     }
   }
   else {
-    for (i=0; i<NUM2SIZE(dim[irank]); i++) {
-      rb_ary_store(ridx, irank, SIZE2NUM(i));
+    for (i=0; i<NUM2SIZE(dim[indim]); i++) {
+      rb_ary_store(ridx, indim, SIZE2NUM(i));
       if ( is_leaf ) {
         ret = rb_yield_splat(rb_obj_clone(ridx));
       }
       else {
-        ret = rb_ca_s_each_index_internal(rank, dim, irank+1, ridx);
+        ret = rb_ca_s_each_index_internal(ndim, dim, indim+1, ridx);
       }
     }
   }
@@ -58,13 +58,13 @@ rb_ca_s_each_index_internal (int rank, VALUE *dim, uint8_t irank, VALUE ridx)
 */
 
 static VALUE
-rb_ca_s_each_index (int rank, VALUE *dim, VALUE self)
+rb_ca_s_each_index (int ndim, VALUE *dim, VALUE self)
 {
-  volatile VALUE ridx = rb_ary_new2(rank);
+  volatile VALUE ridx = rb_ary_new2(ndim);
 #if RUBY_VERSION_CODE >= 190
-  RETURN_ENUMERATOR(self, rank, dim);
+  RETURN_ENUMERATOR(self, ndim, dim);
 #endif
-  return rb_ca_s_each_index_internal(rank, dim, 0, ridx);
+  return rb_ca_s_each_index_internal(ndim, dim, 0, ridx);
 }
 
 /* ------------------------------------------------------------------- */
@@ -145,7 +145,7 @@ rb_ca_each_index_internal (VALUE self, int8_t level, VALUE ridx)
   CArray *ca;
   ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     for (i=0; i<ca->dim[level]; i++) {
       rb_ary_store(ridx, level, SIZE2NUM(i));
       ret = rb_yield_splat(rb_obj_clone(ridx));
@@ -179,8 +179,8 @@ static VALUE
 rb_ca_each_index (VALUE self)
 {
   volatile VALUE ridx;
-  int8_t rank = NUM2INT(rb_ca_rank(self));
-  ridx = rb_ary_new2(rank);
+  int8_t ndim = NUM2INT(rb_ca_ndim(self));
+  ridx = rb_ary_new2(ndim);
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
@@ -225,7 +225,7 @@ rb_ca_each_with_index_internal (VALUE self,
   CArray *ca;
   ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
       rb_ary_store(ridx, level, SIZE2NUM(i));
@@ -256,12 +256,12 @@ rb_ca_each_with_index (VALUE self)
 {
   volatile VALUE ridx, ret;
   ca_size_t idx[CA_RANK_MAX];
-  int8_t  rank = NUM2INT(rb_ca_rank(self));
+  int8_t  ndim = NUM2INT(rb_ca_ndim(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
   rb_ca_modify(self);
-  ridx = rb_ary_new2(rank);
+  ridx = rb_ary_new2(ndim);
   ret  = rb_ca_each_with_index_internal(self, 0, idx, ridx);
   return ret;
 }
@@ -274,7 +274,7 @@ rb_ca_map_with_index_bang_internal (VALUE self,
   CArray *ca;
   ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     volatile VALUE obj;
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
@@ -307,14 +307,14 @@ rb_ca_map_with_index_bang (VALUE self)
   volatile VALUE ridx;
   CArray *ca;
   ca_size_t idx[CA_RANK_MAX];
-  int8_t  rank = NUM2INT(rb_ca_rank(self));
+  int8_t  ndim = NUM2INT(rb_ca_ndim(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
   rb_ca_modify(self);
   Data_Get_Struct(self, CArray, ca);
   ca_attach(ca);
-  ridx = rb_ary_new2(rank);
+  ridx = rb_ary_new2(ndim);
   rb_ca_map_with_index_bang_internal(self, 0, idx, ridx);
   ca_sync(ca);
   ca_detach(ca);
@@ -329,7 +329,7 @@ rb_ca_map_index_bang_internal (VALUE self,
   CArray *ca;
   ca_size_t i;
   Data_Get_Struct(self, CArray, ca);
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     volatile VALUE obj;
     for (i=0; i<ca->dim[level]; i++) {
       idx[level] = i;
@@ -361,14 +361,14 @@ rb_ca_map_index_bang (VALUE self)
   volatile VALUE ridx;
   CArray *ca;
   ca_size_t idx[CA_RANK_MAX];
-  int8_t  rank = NUM2INT(rb_ca_rank(self));
+  int8_t  ndim = NUM2INT(rb_ca_ndim(self));
 #if RUBY_VERSION_CODE >= 190
   RETURN_ENUMERATOR(self, 0, 0);
 #endif
   rb_ca_modify(self);
   Data_Get_Struct(self, CArray, ca);
   ca_attach(ca);
-  ridx = rb_ary_new2(rank);
+  ridx = rb_ary_new2(ndim);
   rb_ca_map_index_bang_internal(self, 0, idx, ridx);
   ca_sync(ca);
   ca_detach(ca);

data/{carray_mask.c → ext/carray_mask.c}

@@ -668,7 +668,7 @@ rb_ca_value_array (VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  obj = rb_ca_refer_new(self, ca->data_type, ca->rank, ca->dim, ca->bytes, 0);
+  obj = rb_ca_refer_new(self, ca->data_type, ca->ndim, ca->dim, ca->bytes, 0);
   Data_Get_Struct(obj, CArray, co);
 
   ca_set_flag(co, CA_FLAG_VALUE_ARRAY);
@@ -777,7 +777,7 @@ rb_ca_is_masked (VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  co = carray_new(CA_BOOLEAN, ca->rank, ca->dim, ca->bytes, NULL);
+  co = carray_new(CA_BOOLEAN, ca->ndim, ca->dim, ca->bytes, NULL);
 
   ca_update_mask(ca);
   if ( ! ca->mask ) {
@@ -820,7 +820,7 @@ rb_ca_is_not_masked (VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  co = carray_new(CA_BOOLEAN, ca->rank, ca->dim, ca->bytes, NULL);
+  co = carray_new(CA_BOOLEAN, ca->ndim, ca->dim, ca->bytes, NULL);
 
   ca_update_mask(ca);
   if ( ! ca->mask ) {
@@ -874,6 +874,17 @@ rb_ca_count_not_masked (VALUE self)
   return SIZE2NUM(ca_count_not_masked(ca));
 }
 
+/* rdoc:
+  class CArray  
+    # Unmask all elements of the object.
+    # If the optional argument <code>fill_value</code> is given,
+    # the masked elements are filled by <code>fill_value</code>.
+    # The returned array doesn't have the mask array.
+    def unmask (fill_value=nil)
+    end
+  end
+*/
+
 static VALUE
 rb_ca_unmask_method (int argc, VALUE *argv, VALUE self)
 {
@@ -1168,9 +1179,9 @@ Init_carray_mask ()
   rb_define_method(rb_cCArray, "inherit_mask_replace", 
                                        rb_ca_inherit_mask_replace_method, -1);
 
-/*  These methods go to lib/carray/base.rb. */
-/*  rb_define_method(rb_cCArray, "count_masked",  rb_ca_count_masked, 0); */
-/*  rb_define_method(rb_cCArray, "count_not_masked", rb_ca_count_not_masked, 0); */
+/*  These methods go to lib/carray/mask.rb. */
+/*  def count_masked (*axis); end */
+/*  def count_not_masked (*axis); end */
 
 }