carray 1.4.0 → 1.5.5

data/{carray_cast_func.rb → ext/carray_cast_func.rb}

@@ -161,8 +161,7 @@ puts %{
   the Ruby\'s licence.
 
   This file is automatically generated from carray_math.rb.
-
-  Copyright (C) 2005 Hiroki Motoyoshi
+  Copyright (C) 2005-2020 Hiroki Motoyoshi
 
 ---------------------------------------------------------------------------- */
 

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

@@ -3,22 +3,19 @@
   carray_class.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: 
-  # returns the machine endianness.
-  #     CArray.endian #=> 0 (CA_LITTLE_ENDIAN)
-  #     CArray.endian #=> 1 (CA_BIG_ENDIAN)
+/* @overload endian 
 
-  def CArray.endian 
-  end
+(Inquiry) 
+Returns the machine endianness.
+   0 (CA_LITTLE_ENDIAN)
+   1 (CA_BIG_ENDIAN)
 */
 
 static VALUE
@@ -27,12 +24,10 @@ rb_ca_s_endian (VALUE klass)
   return INT2NUM(ca_endian);
 }
 
-/* rdoc:
-  # returns true if the byte order of the architecture is
-  # big endian.
-
-  def CArray.big_endian?
-  end
+/* @overload big_endian?
+  
+(Inquiry) 
+Returns true if the byte order of the architecture is big endian.
 */
 
 static VALUE
@@ -41,12 +36,11 @@ rb_ca_s_big_endian_p (VALUE klass)
   return ( ca_endian == CA_BIG_ENDIAN ) ? Qtrue : Qfalse;
 }
 
-/* rdoc: 
-  # returns true if the byte order of the architecture is
-  # little endian.
+/* @overload little_endian?
 
-  def CArray.little_endian?
-  end
+(Inquiry) 
+Returns true if the byte order of the architecture is
+little endian.
 */
 
 static VALUE
@@ -55,15 +49,15 @@ rb_ca_s_little_endian_p (VALUE klass)
   return ( ca_endian == CA_LITTLE_ENDIAN ) ? Qtrue : Qfalse;
 }
 
-/* rdoc:
-  #  Returns the byte length of an element of the given data type.
-  #  Retruns <code>0</code> if data_type is equal to CA_FIXLEN.
-  #     CArray.sizeof(CA_INT32)  #=> 4
-  #     CArray.sizeof(CA_DOUBLE) #=> 8
-  #     CArray.sizeof(CA_FIXLEN)   #=> 0
+/* @overload sizeof (data_type)
+
+(Inquiry) 
+Returns the byte length of an element of the given data type.
+Retruns <code>0</code> if data_type is equal to CA_FIXLEN.
+     CArray.sizeof(CA_INT32)  #=> 4
+     CArray.sizeof(CA_DOUBLE) #=> 8
+     CArray.sizeof(CA_FIXLEN)   #=> 0
 
-  def CArray.sizeof (data_type)
-  end
 */
 
 static VALUE
@@ -76,11 +70,10 @@ rb_ca_s_sizeof (VALUE klass, VALUE rtype)
 }
 
 
-/* rdoc:
-  #  Returns true if the given data_type indicate the valid data_type.
+/* @overload data_type?(data_type)
 
-  def CArray.data_type?(data_type)
-  end
+(Inquiry) 
+Returns true if the given data_type indicate the valid data_type.
 */
 
 static VALUE
@@ -94,11 +87,10 @@ rb_ca_s_data_type (VALUE klass, VALUE rtype)
   return ca_valid[data_type] == 1 ? Qtrue : Qfalse;
 }
 
-/* rdoc:
-  #  Returns string representaion of the data_type specifier.
+/* @overload data_type_name(data_type)
 
-  def CArray.data_type_name(data_type)
-  end
+(Inquiry) 
+Returns string representaion of the data_type specifier.
 */
 
 

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

@@ -3,10 +3,8 @@
   carray_conversion.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
 
 ---------------------------------------------------------------------------- */
 
@@ -27,7 +25,7 @@ rb_ca_to_a_loop (VALUE self, int32_t level, ca_size_t *idx, VALUE ary)
 
   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(ary, i, rb_ca_fetch_index(self, idx));
@@ -43,13 +41,12 @@ rb_ca_to_a_loop (VALUE self, int32_t level, ca_size_t *idx, VALUE ary)
   }
 }
 
-/* rdoc:
-  class CArray
-    # Converts the array to Ruby's array. For higher dimension, 
-    # the array is nested rank-1 times.
-    def to_a
-    end
-  end
+/* 
+@overload to_a
+
+(Conversion)
+Converts the array to Ruby's array. For higher dimension, 
+the array is nested ndim-1 times.
 */
 
 VALUE
@@ -66,13 +63,12 @@ rb_ca_to_a (VALUE self)
   return ary;
 }
 
-/* rdoc:
-  class CArray
-    # Convert the 
-    def convert (data_type=nil, dim=nil)
-      yield
-    end
-  end
+/* @overload convert (data_type=nil, dim=nil) { |elem| ... }
+
+(Conversion) 
+Returns new array which elements are caluculated 
+in the iteration block. The output array is internally created 
+using `CArray#template` to which the arguments is passed.
 */
 
 static VALUE
@@ -106,12 +102,10 @@ rb_ca_convert (int argc, VALUE *argv, VALUE self)
   return obj;
 }
 
-/* rdoc:
-  class CArray
-    # dumps the value array to the given IO stream
-    def dump_binary(io)
-    end
-  end
+/* @overload dump_binary
+
+(IO) 
+Dumps the value array to the given IO stream
 */
 
 static VALUE
@@ -149,7 +143,6 @@ rb_ca_dump_binary (int argc, VALUE *argv, VALUE self)
   case T_FILE: {
     volatile VALUE str;
     rb_io_t *iop;
-    rb_secure(4);
     GetOpenFile(io, iop);
     rb_io_check_writable(iop);
     ca_attach(ca);
@@ -162,7 +155,6 @@ rb_ca_dump_binary (int argc, VALUE *argv, VALUE self)
   case T_FILE: {
     OpenFile *iop;
     size_t total;
-    rb_secure(4);
     GetOpenFile(io, iop);
     rb_io_check_writable(iop);
     ca_attach(ca);
@@ -189,19 +181,10 @@ rb_ca_dump_binary (int argc, VALUE *argv, VALUE self)
   return io;
 }
 
-static VALUE
-rb_ca_dump (int argc, VALUE *argv, VALUE self)
-{
-  rb_warn("CArray#dump will be obsolete, use CArray#dump_binary");
-  return rb_ca_dump_binary(argc, argv, self);
-}
+/* @overload to_s
 
-/* rdoc:
-  class CArray
-    # dumps the value array to a string.
-    def to_s
-    end
-  end
+(Conversion) 
+Dumps the value array to a string.
 */
 
 static VALUE
@@ -210,12 +193,10 @@ rb_ca_to_s (VALUE self)
   return rb_ca_dump_binary(0, NULL, self);
 }
 
-/* rdoc:
-  class CArray
-    # loads the value array from the given IO stream
-    def load_binary (io)
-    end
-  end
+/* @overload load_binary (io)
+
+(IO) 
+Loads the value array from the given IO stream
 */
 
 static VALUE
@@ -258,13 +239,6 @@ rb_ca_load_binary (VALUE self, VALUE io)
   return self;
 }
 
-static VALUE
-rb_ca_load (VALUE self, VALUE io)
-{
-  rb_warn("CArray#load will be obsolete, use CArray#load_binary");
-  return rb_ca_load_binary(self, io);
-}
-
 void *
 ca_to_cptr (void *ap)
 {
@@ -280,14 +254,14 @@ ca_to_cptr (void *ap)
     rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for detached array");
   }
   
-  if ( ca->rank == 1 ) {
-    rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for rank-1 array");
+  if ( ca->ndim == 1 ) {
+    rb_raise(rb_eRuntimeError, "[BUG] ca_to_cptr called for ndim-1 array");
   }
 
   offset[0] = 0;  
   count[0]  = ca->dim[0];
   ptr_num   = count[0];
-  for (i=1; i<ca->rank-1; i++) {
+  for (i=1; i<ca->ndim-1; i++) {
     offset[i] = ptr_num;
     count[i]  = count[i-1] * ca->dim[i];
     ptr_num  += count[i];
@@ -295,15 +269,15 @@ ca_to_cptr (void *ap)
 
   ptr = malloc(sizeof(void*)*ptr_num);
 
-  i = ca->rank-2;
+  i = ca->ndim-2;
   p = ptr + offset[i];
   q = (char *)ca->ptr;
   for (j=0; j<count[i]; j++) {
     *p = (void*)q;
-    p++; q += ca->dim[ca->rank-1] * ca->bytes;
+    p++; q += ca->dim[ca->ndim-1] * ca->bytes;
   }
 
-  for (i=ca->rank-3; i>=0; i--) {
+  for (i=ca->ndim-3; i>=0; i--) {
     p = ptr + offset[i];
     r = ptr + offset[i+1];
     for (j=0; j<count[i]; j++) {
@@ -316,13 +290,11 @@ ca_to_cptr (void *ap)
 }
 
 
-/* rdoc:
-  class CArray
-    # Convert the 
-    def convert (data_type=nil, dim=nil)
-      yield
-    end
-  end
+/* @overload str_format (*fmts)
+
+(Conversion) 
+Creates object type array consist of string using the "::format" method.
+The Multiple format strings are given, they are applied cyclic in turn.
 */
 
 
@@ -368,9 +340,17 @@ rb_ca_format (int argc, VALUE *argv, VALUE self)
 }
 
 
-
 #include <time.h>
 
+#ifdef HAVE_STRPTIME
+
+/* @overload str_strptime (fmt)
+
+(Conversion) 
+Creates object type array consist of Time objects 
+which are created by 'Time.strptime' applied to the elements of the object.
+This method assumes all the elements of the objetct to be String.
+*/
 
 static VALUE
 rb_ca_strptime (VALUE self, VALUE rfmt)
@@ -387,6 +367,7 @@ rb_ca_strptime (VALUE self, VALUE rfmt)
     rb_raise(rb_eRuntimeError, "strptime can be applied only to object type.");
   }
 
+  Check_Type(rfmt, T_STRING);
   fmt = (char *) StringValuePtr(rfmt);
 
   obj = rb_ca_template(self);
@@ -425,6 +406,15 @@ rb_ca_strptime (VALUE self, VALUE rfmt)
   return obj;
 }
 
+#endif
+
+/* @overload time_strftime (fmt)
+
+(Conversion) 
+Creates object type array consist of strings
+which are created by 'Time#strftime' applied to the elements of the object.
+This method assumes all the elements of the objetct to be Time or DateTime.
+*/
 
 static VALUE
 rb_ca_strftime (VALUE self, VALUE rfmt)
@@ -465,6 +455,10 @@ rb_ca_strftime (VALUE self, VALUE rfmt)
   return obj;
 }
 
+/* @private
+
+*/
+
 static VALUE 
 rb_test_ca_to_cptr (VALUE self)
 {
@@ -499,10 +493,8 @@ Init_carray_conversion ()
   rb_define_method(rb_cCArray, "to_a", rb_ca_to_a, 0);
   rb_define_method(rb_cCArray, "convert", rb_ca_convert, -1);
 
-  rb_define_method(rb_cCArray, "dump", rb_ca_dump, -1);
   rb_define_method(rb_cCArray, "dump_binary", rb_ca_dump_binary, -1);
   rb_define_method(rb_cCArray, "to_s", rb_ca_to_s, 0);
-  rb_define_method(rb_cCArray, "load", rb_ca_load, 1);
   rb_define_method(rb_cCArray, "load_binary", rb_ca_load_binary, 1);
 
   /* DO NOT define CArray#to_ary, it makes trouble with various situations */
@@ -510,8 +502,11 @@ Init_carray_conversion ()
 
   rb_define_method(rb_cCArray, "str_format", rb_ca_format, -1); 
 
+#ifdef HAVE_STRPTIME
   rb_define_method(rb_cCArray, "str_strptime", rb_ca_strptime, 1);
-  rb_define_method(rb_cCArray, "str_strftime", rb_ca_strftime, 1);
+#endif
+  
+  rb_define_method(rb_cCArray, "time_strftime", rb_ca_strftime, 1);
 
   rb_define_method(rb_cCArray, "test_ca_to_cptr", rb_test_ca_to_cptr, 0);
 

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

@@ -3,10 +3,8 @@
   carray_copy.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
 
 ---------------------------------------------------------------------------- */
 
@@ -25,7 +23,7 @@ ca_copy (void *ap)
     co = (CArray *) cscalar_new(ca->data_type, ca->bytes, 0);
   }
   else {                                /* create array without mask */
-    co = carray_new(ca->data_type, ca->rank, ca->dim, ca->bytes, 0);
+    co = carray_new(ca->data_type, ca->ndim, ca->dim, ca->bytes, 0);
   }
 
   if ( ca_is_attached(ca) ) {
@@ -43,12 +41,9 @@ ca_copy (void *ap)
   return co;
 }
 
-/* rdoc:
-  class CArray
-    # create CArray object from `self` with same contents includes mask state.
-    def to_ca
-    end
-  end
+/* @overload to_ca
+
+(Copy) Creates CArray object from `self` with same contents includes mask state.
 */
 
 VALUE
@@ -72,7 +67,7 @@ ca_template (void *ap)
     return (CArray*) cscalar_new(ca->data_type, ca->bytes, NULL);
   }
   else {                       /* create array without mask */
-    return carray_new(ca->data_type, ca->rank, ca->dim, ca->bytes, NULL);
+    return carray_new(ca->data_type, ca->ndim, ca->dim, ca->bytes, NULL);
   }
 }
 
@@ -84,7 +79,7 @@ ca_template_safe (void *ap)
     return (CArray*) cscalar_new(ca->data_type, ca->bytes, NULL);
   }
   else {                       /* create array filled with 0, without mask */
-    return carray_new_safe(ca->data_type, ca->rank, ca->dim, ca->bytes, NULL);
+    return carray_new_safe(ca->data_type, ca->ndim, ca->dim, ca->bytes, NULL);
   }
 }
 
@@ -97,19 +92,16 @@ ca_template_safe2 (void *ap, int8_t data_type, ca_size_t bytes)
     return (CArray*) cscalar_new(data_type, bytes, NULL);
   }
   else {                   /* create array filled with 0, without mask */
-    return carray_new_safe(data_type, ca->rank, ca->dim, bytes, NULL);
+    return carray_new_safe(data_type, ca->ndim, ca->dim, bytes, NULL);
   }
 }
 
-/* rdoc:
-  class CArray
-    # returns CArray object with same dimension with `self`
-    # The data type of the new carray object can be specified by `data_type`.
-    # For fixlen data type, the option `:bytes` is used to specified the
-    # data length.
-    def template(data_type=self.data_type, options={:bytes=>0})
-    end
-  end
+/* @overload template(data_type=self.data_type, bytes: 0)
+
+(Copy) Returns CArray object with same dimension with `self`
+The data type of the new carray object can be specified by `data_type`.
+For fixlen data type, the option `:bytes` is used to specified the
+data length.
 */
 
 static VALUE
@@ -209,7 +201,7 @@ ca_paste_loop (CArray *ca, ca_size_t *offset, ca_size_t *offset0,
                int32_t level, ca_size_t *idx, ca_size_t *idx0)
 {
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = offset[level];
     idx0[level] = offset0[level];
     memcpy(ca_ptr_at_index(ca, idx), ca_ptr_at_index(cs, idx0), size[level]*ca->bytes);
@@ -240,9 +232,9 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
   int8_t i;
 
   ca_check_same_data_type(ca, cs);
-  ca_check_same_rank(ca, cs);
+  ca_check_same_ndim(ca, cs);
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( offset[i] >= 0 ) {
       if ( ca->dim[i] <= cs->dim[i] + offset[i] ) {
         size[i] = ca->dim[i] - offset[i];
@@ -264,7 +256,7 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
     }
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     CA_CHECK_INDEX(offset[i], ca->dim[i]);
   }
 
@@ -284,14 +276,10 @@ ca_paste (void *ap, ca_size_t *offset, void *sp)
   ca_detach_n(2, ca, cs);
 }
 
-/* rdoc:
-  class CArray
-    # pastes `ary` to `self` at the index `idx`.
-    # `idx` should be Array object with the length same as `self.rank`.
-    # `ary` should have same shape with `self`.
-    def paste (idx, ary)
-    end
-  end
+/* @overload paste (idx, ary)
+(Copy) Pastes `ary` to `self` at the index `idx`.
+`idx` should be Array object with the length same as `self.ndim`.
+`ary` should have same shape with `self`.
 */
 
 static VALUE
@@ -307,12 +295,12 @@ rb_ca_paste (VALUE self, VALUE roffset, VALUE rsrc)
 
   Check_Type(roffset, T_ARRAY);
 
-  if ( RARRAY_LEN(roffset) != ca->rank ) {
+  if ( RARRAY_LEN(roffset) != ca->ndim ) {
     rb_raise(rb_eArgError,
-             "# of arguments should equal to the rank");
+             "# of arguments should equal to the ndim");
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     offset[i] = NUM2SIZE(rb_ary_entry(roffset,i));
   }
 
@@ -330,7 +318,7 @@ ca_clip_loop (CArray *ca, ca_size_t *offset, ca_size_t *offset0,
                int32_t level, ca_size_t *idx, ca_size_t *idx0)
 {
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     idx[level] = offset[level];
     idx0[level] = offset0[level];
     memcpy(ca_ptr_at_index(cs, idx0), ca_ptr_at_index(ca, idx), size[level]*ca->bytes);
@@ -358,9 +346,9 @@ ca_clip (void *ap, ca_size_t *offset, void *sp)
   int i;
 
   ca_check_same_data_type(ca, cs);
-  ca_check_same_rank(ca, cs);
+  ca_check_same_ndim(ca, cs);
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( offset[i] >= 0 ) {
       if ( ca->dim[i] <= cs->dim[i] + offset[i] ) {
         size[i] = ca->dim[i] - offset[i];
@@ -382,7 +370,7 @@ ca_clip (void *ap, ca_size_t *offset, void *sp)
     }
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     CA_CHECK_INDEX(offset[i], ca->dim[i]);
   }
 
@@ -402,12 +390,8 @@ ca_clip (void *ap, ca_size_t *offset, void *sp)
   ca_detach_n(2, ca, cs);
 }
 
-/* rdoc:
-  class CArray
-    # clips the data at `idx` from `self` to `ary`.
-    def clip (idx, ary)
-    end
-  end
+/* @overload clip (idx, ary)
+(copy) Clips the data at `idx` from `self` to `ary`.
 */
 
 static VALUE
@@ -421,12 +405,12 @@ rb_ca_clip (VALUE self, VALUE roffset, VALUE rsrc)
 
   Check_Type(roffset, T_ARRAY);
 
-  if ( RARRAY_LEN(roffset) != ca->rank ) {
+  if ( RARRAY_LEN(roffset) != ca->ndim ) {
     rb_raise(rb_eArgError,
-             "# of arguments should equal to the rank");
+             "# of arguments should equal to the ndim");
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     offset[i] = NUM2SIZE(rb_ary_entry(roffset, i));
   }