carray 1.5.1 → 1.5.6

data/ext/ca_obj_repeat.c

@@ -3,10 +3,8 @@
   ca_obj_repeat.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -14,7 +12,7 @@
 
 VALUE rb_cCARepeat;
 
-/* rdoc:
+/* yard:
   class CARepeat < CAVirtual # :nodoc:
   end
 */

data/ext/ca_obj_select.c

@@ -3,10 +3,8 @@
   ca_obj_select.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -14,7 +12,7 @@
 
 VALUE rb_cCASelect;
 
-/* rdoc:
+/* yard:
   class CASelect < CAVirtual # :nodoc:
   end
 */

data/ext/ca_obj_shift.c

@@ -3,16 +3,14 @@
   ca_obj_shift.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
 #include "carray.h"
 
-/* rdoc:
+/* yard:
   class CAShift < CAVirtual # :nodoc:
   end
 */
@@ -828,7 +826,7 @@ rb_ca_shift_new (VALUE cary, ca_size_t *shift, char *fill, int8_t *roll)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def shifted
     end

data/ext/ca_obj_transpose.c

@@ -3,10 +3,8 @@
   ca_obj_transpose.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -34,7 +32,7 @@ static int8_t CA_OBJ_TRANSPOSE;
 
 static VALUE rb_cCATrans;
 
-/* rdoc:
+/* yard:
   class CATranspose < CAVirtual # :nodoc:
   end
 */
@@ -511,7 +509,7 @@ rb_ca_trans_new (VALUE cary, ca_size_t *imap)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     def transposed
     end

data/ext/ca_obj_unbound_repeat.c

@@ -3,10 +3,8 @@
   ca_obj_unbound_repeat.c
 
   This file is part of Ruby/CArray extension library.
-  You can redistribute it and/or modify it under the terms of
-  the Ruby Licence.
 
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 
@@ -14,7 +12,7 @@
 
 VALUE rb_cCAUnboundRepeat;
 
-/* rdoc:
+/* yard:
   class CAUnboundRepeat < CArray 
   end
 */
@@ -23,8 +21,9 @@ int
 ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
                 int32_t rep_ndim, ca_size_t *rep_dim)
 {
-  int8_t data_type, ndim;
+  int8_t data_type;
   ca_size_t bytes, elements;
+  int8_t i;
 
   /* check arguments */
 
@@ -32,18 +31,17 @@ ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
 
   data_type = parent->data_type;
   bytes     = parent->bytes;
-  ndim      = parent->ndim;
   elements  = parent->elements;
 
   ca->obj_type  = CA_OBJ_UNBOUND_REPEAT;
   ca->data_type = data_type;
   ca->flags     = 0;
-  ca->ndim      = ndim;
+  ca->ndim      = rep_ndim;
   ca->bytes     = bytes;
   ca->elements  = elements;
   ca->ptr       = NULL;
   ca->mask      = NULL;
-  ca->dim       = ALLOC_N(ca_size_t, ndim);
+  ca->dim       = ALLOC_N(ca_size_t, rep_ndim);
 
   ca->parent    = parent;
   ca->attach    = 0;
@@ -52,8 +50,10 @@ ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
   ca->rep_ndim  = rep_ndim;
   ca->rep_dim   = ALLOC_N(ca_size_t, rep_ndim);
 
-  memcpy(ca->dim, parent->dim, ndim * sizeof(ca_size_t));
-  memcpy(ca->rep_dim, rep_dim, rep_ndim * sizeof(ca_size_t));
+  for (i=0; i<rep_ndim; i++) {
+    ca->rep_dim[i] = rep_dim[i];
+    ca->dim[i] = ( rep_dim[i] ) ? rep_dim[i] : 1;      
+  }
 
   if ( ca_has_mask(parent) ) {
     ca_create_mask(ca);
@@ -98,13 +98,6 @@ ca_ubrep_func_ptr_at_addr (void *ap, ca_size_t addr)
   return ca_ptr_at_addr(ca->parent, addr);
 }
 
-static char *
-ca_ubrep_func_ptr_at_index (void *ap, ca_size_t *idx)
-{
-  CAUnboundRepeat *ca = (CAUnboundRepeat *) ap;
-  return ca_ptr_at_index(ca->parent, idx);
-}
-
 static void
 ca_ubrep_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
 {
@@ -112,13 +105,6 @@ ca_ubrep_func_fetch_addr (void *ap, ca_size_t addr, void *ptr)
   ca_fetch_addr(ca->parent, addr, ptr);
 }
 
-static void
-ca_ubrep_func_fetch_index (void *ap, ca_size_t *idx, void *ptr)
-{
-  CAUnboundRepeat *ca = (CAUnboundRepeat *) ap;
-  ca_fetch_index(ca->parent, idx, ptr);
-}
-
 static void
 ca_ubrep_func_store_addr (void *ap, ca_size_t addr, void *ptr)
 {
@@ -126,13 +112,6 @@ ca_ubrep_func_store_addr (void *ap, ca_size_t addr, void *ptr)
   ca_store_addr(ca->parent, addr, ptr);
 }
 
-static void
-ca_ubrep_func_store_index (void *ap, ca_size_t *idx, void *ptr)
-{
-  CAUnboundRepeat *ca = (CAUnboundRepeat *) ap;
-  ca_store_index(ca->parent, idx, ptr);
-}
-
 static void
 ca_ubrep_func_allocate (void *ap)
 {
@@ -221,11 +200,11 @@ ca_operation_function_t ca_ubrep_func = {
   free_ca_ubrep,
   ca_ubrep_func_clone,
   ca_ubrep_func_ptr_at_addr,
-  ca_ubrep_func_ptr_at_index,
+  NULL, 
   ca_ubrep_func_fetch_addr,
-  ca_ubrep_func_fetch_index,
+  NULL, 
   ca_ubrep_func_store_addr,
-  ca_ubrep_func_store_index,
+  NULL, 
   ca_ubrep_func_allocate,
   ca_ubrep_func_attach,
   ca_ubrep_func_sync,
@@ -238,6 +217,36 @@ ca_operation_function_t ca_ubrep_func = {
 
 /* ------------------------------------------------------------------- */
 
+VALUE
+rb_ca_ubrep_shave (VALUE self, VALUE other)
+{
+  CAUnboundRepeat *ca;
+  CArray *co;
+  int8_t ndim, i;
+  ca_size_t dim[CA_RANK_MAX];
+
+  rb_check_carray_object(self);
+  rb_check_carray_object(other);
+
+  Data_Get_Struct(self, CAUnboundRepeat, ca);
+  Data_Get_Struct(other, CArray, co);
+
+  if ( ca->elements != co->elements ) {
+    rb_raise(rb_eRuntimeError, "mismatch in # of elements");
+  }
+
+  ndim = 0;
+  for (i=0; i<ca->ndim; i++) {
+    if ( ca->rep_dim[i] ) {
+      dim[ndim] = ca->rep_dim[i];
+      ndim += 1;
+    }
+  }
+
+  return rb_ca_refer_new(other, co->data_type, ndim, dim, co->bytes, 0);
+}
+
+
 VALUE
 rb_ca_ubrep_new (VALUE cary, int32_t rep_ndim, ca_size_t *rep_dim)
 {
@@ -257,80 +266,23 @@ VALUE
 rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
 {
   CArray *ca;
-  ca_size_t ndim, dim[CA_RANK_MAX];
+  int8_t ndim;
+  ca_size_t dim[CA_RANK_MAX];
   int32_t rep_ndim;
   ca_size_t rep_dim[CA_RANK_MAX];
-  ca_size_t count, i;
+  ca_size_t elements, count, i;
 
   Data_Get_Struct(self, CArray, ca);
 
-  if ( argc == 1 && argv[0] == ID2SYM(rb_intern("*")) ) {
-    CAUnboundRepeat *cr = (CAUnboundRepeat *) ca;
-    volatile VALUE args;
-    int repeatable = 0;
-    args = rb_ary_new();
-    if ( rb_obj_is_kind_of(self, rb_cCAUnboundRepeat) ) {
-      repeatable = 1;
-      for (i=0; i<cr->rep_ndim; i++) {
-        if ( cr->rep_dim[i] == 1 ) {
-          rb_ary_push(args, ID2SYM(rb_intern("*")));
-          repeatable = 1;
-        }
-        else if ( cr->rep_dim[i] > 1 ) {
-          rb_ary_push(args, Qnil);
-        }
-        else {
-          rb_ary_push(args, ID2SYM(rb_intern("*")));
-        }
-      }
-    }
-    else {
-      for (i=0; i<ca->ndim; i++) {
-        if ( ca->dim[i] == 1 ) {
-          rb_ary_push(args, ID2SYM(rb_intern("*")));
-          repeatable = 1;
-        }
-        else {
-          rb_ary_push(args, Qnil);
-        }
-      }
-    }
-    if ( ! repeatable ) {
-      return self;
-    }
-    else {
-      return rb_ca_unbound_repeat((int)RARRAY_LEN(args), RARRAY_PTR(args), self);
-    }
-  }
-  else if ( argc == 2 && 
-            argv[0] == ID2SYM(rb_intern("*")) && 
-            rb_obj_is_carray(argv[1]) ) {
-    volatile VALUE args, obj;
-    args = ID2SYM(rb_intern("*"));
-    obj  = rb_ca_unbound_repeat(1, (VALUE*)&args, self);
-    return ca_ubrep_bind_with(obj, argv[1]);
-  } 
-  else if ( argc == 2 && 
-            argv[1] == ID2SYM(rb_intern("*")) && 
-            rb_obj_is_carray(argv[0]) ) {
-    volatile VALUE args, obj;
-    args = ID2SYM(rb_intern("*"));
-    obj  = rb_ca_unbound_repeat(1, (VALUE*)&args, self);
-    return ca_ubrep_bind_with(obj, argv[0]);
-  }
-
   rep_ndim = argc;
 
   count = 0;
-  ndim = 0;
-
+  ndim  = 0;
+  elements = 1;
   for (i=0; i<rep_ndim; i++) {
-    if ( rb_obj_is_kind_of(argv[i], rb_cSymbol) ) {
+    if ( TYPE(argv[i]) == T_SYMBOL ) {
       if ( argv[i] == ID2SYM(rb_intern("*")) ) {
         rep_dim[i] = 0;
-        if ( ca->dim[count] == 1 ) {
-          count++;
-        }
       }
       else {
         rb_raise(rb_eArgError, "unknown symbol (!= ':*') in arguments");
@@ -341,26 +293,21 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "invalid argument");
       }
       rep_dim[i] = ca->dim[count];
-      dim[ndim] = ca->dim[count];
+      dim[ndim]  = ca->dim[count];
+      elements  *= ca->dim[count];
       count++; ndim++;
     }
   }
 
-  if ( count != ca->ndim ) {
-    rb_raise(rb_eRuntimeError, "too small # of nil");
+  if ( elements != ca->elements ) {
+    rb_raise(rb_eArgError, "mismatch in entity elements (%lli for %lli)", elements, ca->elements);
   }
 
   if ( ndim != ca->ndim ) {
-    volatile VALUE par, obj;
-    par = rb_ca_refer_new(self, ca->data_type, ndim, dim, ca->bytes, 0);
-    obj = rb_ca_ubrep_new(par, rep_ndim, rep_dim);
-    rb_ivar_set(obj, rb_intern("__real_parent__"), par);
-    rb_ca_set_parent(obj, self);
-    return obj;
-  }
-  else {
-    return rb_ca_ubrep_new(self, rep_ndim, rep_dim);
+    rb_raise(rb_eArgError, "invalid number of nil's (%i for %i)", ndim, ca->ndim);
   }
+
+  return rb_ca_ubrep_new(self, rep_ndim, rep_dim);
 }
 
 static VALUE
@@ -412,6 +359,7 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
   ca_size_t upr_spec[CA_RANK_MAX];
   ca_size_t srp_spec[CA_RANK_MAX];
   int uprep = 0, srp_ndim;
+  int ndim_real;
   int i;
 
   Data_Get_Struct(self, CAUnboundRepeat, ca);
@@ -422,6 +370,7 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
   }
 
   srp_ndim = 0;
+  ndim_real = 0;
   for (i=0; i<new_ndim; i++) {
     if ( ca->rep_dim[i] == 0 ) {
       if ( new_dim[i] == 0 ) {
@@ -434,14 +383,16 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
       upr_spec[i] = new_dim[i];
     }
     else {
+      ndim_real++;
       rep_spec[i] = 0;
       srp_spec[srp_ndim++] = 0;
       upr_spec[i] = ca->rep_dim[i];
     }
   }
+  
   if ( uprep ) {
     volatile VALUE rep;
-    if ( srp_ndim >= ca->ndim ) {
+    if ( srp_ndim >= ndim_real ) {
       rep = rb_ca_repeat_new(rb_ca_parent(self), srp_ndim, srp_spec);
     }
     else {
@@ -450,15 +401,12 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
     return rb_ca_ubrep_new(rep, new_ndim, upr_spec);
   }
   else {
-    return rb_ca_repeat_new(self, new_ndim, rep_spec);
+    return rb_ca_repeat_new(rb_ca_parent(self), new_ndim, rep_spec);
   }
 }
 
-/* rdoc:
-  class CAUnboundRepeat
-    def bind_with(other)
-    end
-  end
+/* @overload bind_with (other)
+
 */
 
 VALUE
@@ -484,11 +432,8 @@ ca_ubrep_bind_with (VALUE self, VALUE other)
   }
 }
 
-/* rdoc:
-  class CAUnboundRepeat
-    def bind(*index)
-    end
-  end
+/* @overload bind (*index)
+
 */
 
 static VALUE
@@ -503,6 +448,7 @@ rb_ca_ubrep_bind (int argc, VALUE *argv, VALUE self)
   if ( ca->rep_ndim != argc ) {
     rb_raise(rb_eArgError, "invalid new_ndim");
   }
+  
   for (i=0; i<argc; i++) {
     if ( ca->rep_dim[i] == 0 ) {
       rep_spec[i] = NUM2SIZE(argv[i]);
@@ -512,7 +458,7 @@ rb_ca_ubrep_bind (int argc, VALUE *argv, VALUE self)
     }
   }
 
-  return rb_ca_repeat_new(self, argc, rep_spec);
+  return rb_ca_repeat_new(rb_ca_parent(self), argc, rep_spec);
 }
 
 static VALUE