carray 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519ed0ddc6f3cf2268a644428085e86ab3926aba4798400586e33e33b21a27e3
-  data.tar.gz: ea59dd3b333f4d707db96ce2a4f945a9c4508baa32a70bfbd1882a250b4279e3
+  metadata.gz: 17e4fbee624a609253882db54f549e00916542bf9f98e3b3c42ed4e5d59d66e5
+  data.tar.gz: 482567a72214af98ccd8153b382ac04ea479b0b429831a6a604fb4af5f8d81a1
 SHA512:
-  metadata.gz: 6fcf6cd610bbeaf160396ff553ea2ed8f0a4faff97836824b13f1e5d426b13bc068c7ae3c938b4f426a95a0e7928f58ae7c9af83d79b713f069ddbec4ab85cf7
-  data.tar.gz: d9bc322d676d67ea423ac9f370230d72c8331392b0fba7b77ee34712bf8e1b5d7b337dfdcfe79bf0b0fce374f88e78dcb197da433b46dc866d7142f358a1b0d9
+  metadata.gz: 2de7c7b26e38aa9b66e050616c69fdb2587d71da4f37e9fa0d1b3022427656260fda644d5eee913c64d8104823f1a34c70a813e15baa04c7fa64b855be202506
+  data.tar.gz: de95a6f88c5408677170014c2e6d1661e9c020bb130d6a22c506483588cd3a1373a44aba427acd0883a1161cfa27ad001dd686747682bef790dde516e2358a33

data/.yardopts

@@ -0,0 +1,32 @@
+--markup markdown
+--markup-provider kramdown
+--no-private
+--exclude lib/carray/obsolete.rb
+--exclude lib/carray/autoload.rb
+--exclude 'lib/carray/autoload/'
+--readme README.md
+--files NEWS.md,TODO.md 
+lib/carray.rb 
+ext/ruby_carray.c 
+ext/ca_obj_array.c 
+ext/ca_obj_bitarray.c 
+ext/ca_obj_bitfield.c 
+ext/ca_obj_block.c 
+ext/carray_attribute.c 
+ext/carray_call_cfunc.c 
+ext/carray_cast.c 
+ext/carray_class.c 
+ext/carray_conversion.c 
+ext/carray_copy.c 
+ext/carray_core.c 
+ext/carray_data_type.c 
+ext/carray_element.c 
+ext/carray_generate.c 
+ext/carray_loop.c
+ext/carray_mask.c 
+ext/carray_operator.c 
+ext/carray_order.c 
+ext/carray_sort_addr.c 
+ext/carray_test.c 
+ext/carray_utils.c 
+

data/NEWS.md

@@ -1,6 +1,29 @@
 ChangeLog of Ruby/CArray
 ========================
 
+1.5.2 -> 1.5.3
+--------------
+
+* [New] Add new method 'CArray#exp2'
+* [New] Add new method 'CArray#log2'
+* [New] Add new method 'CArray#logb'
+* [New] Add new method 'CArray#remainder'
+* [New] Add new method 'CArray.guard_undef'
+* [New] Add new method 'CArray#data_class='
+* [New] Add new method 'CArray.data_class?'
+* [Mod] Modify 'CArray#pmax' to use 'fmax' for float type
+* [Mod] Modify 'CArray#pmin' to use 'fmin' for float type
+* [Mod] Remove method 'Object#undef?'
+* [Mod] Remove method '::nan', '::inf'
+* [Mod] Remove method 'TrueClass#*', 'FalseClass#*' (unknown origin)
+* [Fix] Fix invalid access for CAUnboundRepeat using index
+* [Fix] Fix treatment of extra :* in operation between CAUnboundRepeat objects
+* [Fix] Fix to accept Symbol for the name of data_class member
+* [Fix] Fix 'CArray#uniq' to accept the array with the dimension more than 2.
+* [Fix] Fix for CArray serialization to include data_class
+* [Fix] Fix data_class inheritance in some methods in which new CArray is created.
+* [Fix] Fix 'CArray#broadcast_to' to accept the case of dimension extension.
+
 1.5.1 -> 1.5.2
 --------------
 
@@ -13,8 +36,8 @@ ChangeLog of Ruby/CArray
 * [New] Add new API function `rb_ca_wrap_new`
 * [Mod] Modify 'CArray#linspace' to return float64 array for integer arguments
 * [Mod] Modify CAUnboundRepeat to have `ndim` same as the bounded array (before `ndim` same as parent array)
-* [Mod] Depret the obsolete mothod 'CArray#dump'.
-* [Mod] Depret the obsolete mothod 'CArray#load'.
+* [Mod] Remove the obsolete mothod 'CArray#dump'.
+* [Mod] Remove the obsolete mothod 'CArray#load'.
 * [Mod] Modify CArray.wrap_readonly to wrap string as array.
 * [Fix] Add support for Integer (same as for Fixnum, Bignum)
 
@@ -23,12 +46,12 @@ ChangeLog of Ruby/CArray
 
 * [New] Add data type classes like 'Float64' ... to provide the methods like 'CArray::Float64.linspace'
 * [Mod] Modify 'CArray.float64' ... without aruguments to return the corresponding data type class 
+* [Mod] Set obsolete flag to 'CAIterator#sort_with'
 * [Fix] Move C extension files into 'ext/'
 * [Fix] Rename member 'rank' to 'ndim' in struct CArray in C extension
 * [Fix] Remove 'CArray#shuffle' (gone to 'carray-random' gem)
 * [Fix] Remove dependencies on 'rb_secure()' and 'rb_safe_level()'
 * [Fix] Modify 'CArray#span' to handle fractional step for integer array
-* [Obsolete] Set obsolete flag to 'CAIterator#sort_with'
 
 1.4.0 -> 1.5.0
 --------------

data/Rakefile

@@ -15,7 +15,7 @@ task :install do
     exit(1)
   end
   system %{
-    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
+    gem build #{GEMSPEC}; gem install #{spec.full_name}.gem --no-document
   }
 end
 

data/TODO.md

@@ -3,13 +3,14 @@ ToDo List
 
 ToDo
 -------
-
+ * Implement CArray.broadcast in C
+ * Implement Integer#{|,&,^,<<,>>} with Refinement (remove monkey patch)
+ * Remove RSTRUCT hack in carray_access.c for handling of Range object.
+ * Solve abs probrems
  * Create spec
    - str_format (cyclic format)
    - CA_SIZE
- * Remove RSTRUCT hack in carray_access.c for handling of Range object.
- * Implement CArray.broadcast in C
- * Solve abs probrems
+   - serialization of carray which has data_class
 
 Done
 -------

data/carray.gemspec

@@ -1,24 +1,26 @@
 Gem::Specification::new do |s|
 
-  version = "1.5.2"
+  version = "1.5.3"
 
-  files = Dir.glob("**/*") - [ 
+  files = Dir.glob("**/*") + [".yardopts"] -
+                             [ 
                                Dir.glob("carray-*.gem"), 
                                Dir.glob("ext/**/{Makefile,mkmf.log}"),
                                Dir.glob("**/*.{o,so,bundle}"),
                                Dir.glob("**/*~"),
                                Dir.glob("doc/**/*"),
+                               Dir.glob("test/**/*"),
                              ].flatten
 
   s.platform    = Gem::Platform::RUBY
   s.name        = "carray"
   s.summary     = "Multi-dimesional array class for Ruby"
   s.description = <<-HERE
-    Ruby/CArray is an extension library for the multi-dimensional array class.
+    Ruby/CArray is an extension library for the multi-dimensional numerical array class.
     CArray can store integers and floating point numbers to perform calculations
     efficiently. Therefore, Ruby/CArray is suitable for numerical computation and data
     analysis. Ruby/CArray has different features from other multidimensional array
-    libraries (narray, numo-narray, nmatrix), such as element-specific masks, 
+    libraries (narray, numo-narray, nmatrix), such as element-wise masks, 
     creation of reference arrays that can reflect changes to the referent, 
     the ability to access memory pointers of other objects, user-defined arrays,
     and so on.
@@ -26,7 +28,7 @@ Gem::Specification::new do |s|
   s.version     = version
   s.author      = "Hiroki Motoyoshi"
   s.email       = ""
-  s.licenses    = ['MIT']
+  s.license     = 'MIT'
   s.homepage    = 'https://github.com/himotoyoshi/carray'
   s.files       = files
   s.extensions  = [ "ext/extconf.rb" ] 

data/ext/ca_obj_bitarray.c

@@ -462,12 +462,9 @@ rb_ca_bitarray_new (VALUE cary)
   return obj;
 }
 
-/* yard:
-  class CArray
-    def bits
-    end
-    alias bitarray bits
-  end
+/* @overload bitarray
+
+[TBD]
 */
 
 VALUE
@@ -511,8 +508,8 @@ Init_ca_obj_bitarray ()
   CA_OBJ_BITARRAY = ca_install_obj_type(rb_cCABitarray, ca_bitarray_func);
   rb_define_const(rb_cObject, "CA_OBJ_BITARRAY", INT2NUM(CA_OBJ_BITARRAY));
 
-  rb_define_method(rb_cCArray, "bits", rb_ca_bitarray, 0);
   rb_define_method(rb_cCArray, "bitarray", rb_ca_bitarray, 0);
+  rb_define_alias(rb_cCArray, "bits", "bitarray");
 
   rb_define_alloc_func(rb_cCABitarray, rb_ca_bitarray_s_allocate);
   rb_define_method(rb_cCABitarray, "initialize_copy",

data/ext/ca_obj_bitfield.c

@@ -557,11 +557,9 @@ rb_ca_bitfield_new (VALUE cary, ca_size_t offset, ca_size_t bitlen)
   return obj;
 }
 
-/* yard:
-  class CArray
-    def bitfield (range, type)
-    end
-  end
+/* @overload bitfield (range, type)
+
+[TBD]
 */
 
 VALUE

data/ext/ca_obj_block.c

@@ -12,11 +12,6 @@
 
 VALUE rb_cCABlock;
 
-/* yard:
-  class CABlock < CAVirtual # :nodoc:
-  end
-*/
-
 static int
 ca_block_setup (CABlock *ca, CArray *parent, int8_t ndim, ca_size_t *dim,
                ca_size_t *start, ca_size_t *step, ca_size_t *count, ca_size_t offset)
@@ -733,7 +728,7 @@ rb_cb_initialize_copy (VALUE self, VALUE other)
     return ary;                                     \
 }
 
-/* yard:
+/* @overload size0:
   class CABlock
     def size0
     end

data/ext/ca_obj_unbound_repeat.c

@@ -50,15 +50,9 @@ ca_ubrep_setup (CAUnboundRepeat *ca, CArray *parent,
   ca->rep_ndim  = rep_ndim;
   ca->rep_dim   = ALLOC_N(ca_size_t, rep_ndim);
 
-  memcpy(ca->rep_dim, rep_dim, rep_ndim * sizeof(ca_size_t));
-
-  for (i=0; i<ca->ndim; i++) {
-    if ( ca->rep_dim[i] ) {
-      ca->dim[i] = ca->rep_dim[i];      
-    }
-    else {
-      ca->dim[i] = 1;
-    }
+  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) ) {
@@ -104,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)
 {
@@ -118,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)
 {
@@ -132,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)
 {
@@ -227,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,
@@ -304,11 +277,10 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
   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;
       }
@@ -321,8 +293,8 @@ 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];
-      elements *= ca->dim[count];
+      dim[ndim]  = ca->dim[count];
+      elements  *= ca->dim[count];
       count++; ndim++;
     }
   }
@@ -334,9 +306,8 @@ rb_ca_unbound_repeat (int argc, VALUE *argv, VALUE self)
   if ( ndim != ca->ndim ) {
     rb_raise(rb_eArgError, "invalid number of nil's (%i for %i)", ndim, ca->ndim);
   }
-  else {
-    return rb_ca_ubrep_new(self, rep_ndim, rep_dim);
-  }
+
+  return rb_ca_ubrep_new(self, rep_ndim, rep_dim);
 }
 
 static VALUE
@@ -388,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);
@@ -398,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 ) {
@@ -410,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 {
@@ -430,11 +405,8 @@ ca_ubrep_bind2 (VALUE self, int32_t new_ndim, ca_size_t *new_dim)
   }
 }
 
-/* yard:
-  class CAUnboundRepeat
-    def bind_with(other)
-    end
-  end
+/* @overload bind_with (other)
+
 */
 
 VALUE
@@ -460,11 +432,8 @@ ca_ubrep_bind_with (VALUE self, VALUE other)
   }
 }
 
-/* yard:
-  class CAUnboundRepeat
-    def bind(*index)
-    end
-  end
+/* @overload bind (*index)
+
 */
 
 static VALUE

data/ext/carray_attribute.c

@@ -17,7 +17,7 @@
 (Attribute) 
 Returns the object type (e.g. CA_OBJ_ARRAY, CA_OBJ_BLOCK, ...).
 Since the object type can be known from the class of the object,
-this attribute method is rarely used.
+this attribute methods is rarely used.
 */
 
 VALUE
@@ -711,6 +711,20 @@ rb_ca_data_type_import (VALUE self, VALUE data_type)
   return Qnil;
 }
 
+static VALUE
+rb_ca_set_data_class (VALUE self, VALUE klass)
+{
+  if ( RTEST(rb_ca_is_fixlen_type(self)) &&
+       rb_obj_is_data_class(klass) ) {
+    rb_ivar_set(self, rb_intern("member"), rb_hash_new());
+    return rb_ivar_set(self, id_data_class, klass);
+  }
+  else {
+    rb_raise(rb_eTypeError, "invalid data_class or self is not fixlen array.");
+  }
+  return Qnil;
+}
+
 /* ------------------------------------------------------------------- */
 
 CArray *
@@ -824,6 +838,7 @@ Init_carray_attribute ()
   rb_define_method(rb_cCArray, "parent", rb_ca_parent, 0);
 
   rb_define_method(rb_cCArray, "data_class", rb_ca_data_class, 0);
+  rb_define_method(rb_cCArray, "data_class=", rb_ca_set_data_class, 1);
 
   rb_define_method(rb_cCArray, "scalar?", rb_ca_is_scalar, 0);
 

data/ext/carray_core.c

@@ -1186,7 +1186,7 @@ rb_ca_data_class_encode (VALUE self, VALUE obj)
 VALUE
 rb_ca_members (VALUE self)
 {
-  VALUE data_class = rb_ca_data_class(self);
+  volatile VALUE data_class = rb_ca_data_class(self);
   if ( NIL_P(data_class) ) {
     rb_raise(rb_eRuntimeError, "carray doesn't have data class");
   }
@@ -1198,9 +1198,9 @@ rb_ca_members (VALUE self)
 VALUE
 rb_ca_field_as_member (VALUE self, VALUE sym)
 {
-  VALUE data_class = rb_ca_data_class(self);
-  VALUE member;
-  VALUE obj;
+  volatile VALUE data_class = rb_ca_data_class(self);
+  volatile VALUE member;
+  volatile VALUE obj;
 
   if ( NIL_P(data_class) ) {
     rb_raise(rb_eRuntimeError, "carray doesn't have data class");
@@ -1214,23 +1214,29 @@ rb_ca_field_as_member (VALUE self, VALUE sym)
              "for data_class array");
   }
 
-  if ( TYPE(sym) == T_SYMBOL ) {
-    sym = rb_funcall(sym, rb_intern("to_s"), 0);
-  }
-  else if ( rb_obj_is_kind_of(sym, rb_cInteger) ) {
-    VALUE member_names = rb_const_get(data_class, rb_intern("MEMBERS"));
-    sym = rb_ary_entry(member_names, NUM2SIZE(sym));
+  if ( rb_obj_is_kind_of(sym, rb_cInteger) ) {
+      volatile VALUE member_names = rb_const_get(data_class, rb_intern("MEMBERS"));
+      sym = rb_ary_entry(member_names, NUM2SIZE(sym));
+      obj = rb_hash_aref(member, sym);
+    }
+  else {
+    obj = rb_hash_aref(member, sym);
+    if ( NIL_P(obj) ) {
+      sym = rb_funcall(sym, rb_intern("to_s"), 0);
+      obj = rb_hash_aref(member, sym);      
+    }
   }
 
-  obj = rb_hash_aref(member, sym);
-
   if ( rb_obj_is_carray(obj) ) {
     return obj;
   }
   else {
-    VALUE MEMBER_TABLE = rb_const_get(data_class, rb_intern("MEMBER_TABLE"));
-    VALUE info = rb_hash_aref(MEMBER_TABLE, sym);
+    volatile VALUE MEMBER_TABLE = rb_const_get(data_class, rb_intern("MEMBER_TABLE"));
+    volatile VALUE info = rb_hash_aref(MEMBER_TABLE, sym);
     if ( NIL_P(info) ) {
+      if ( TYPE(sym) != T_STRING ) {
+        sym = rb_funcall(sym, rb_intern("to_s"), 0);
+      }
       rb_raise(rb_eRuntimeError,
                "can't find data_member named <%s>", StringValuePtr(sym));
     }
@@ -1249,7 +1255,7 @@ rb_ca_field_as_member (VALUE self, VALUE sym)
 VALUE
 rb_ca_fields (VALUE self)
 {
-  VALUE data_class = rb_ca_data_class(self);
+  volatile VALUE data_class = rb_ca_data_class(self);
   volatile VALUE member_names, list;
   int i;
   if ( NIL_P(data_class) ) {
@@ -1272,7 +1278,7 @@ Returns an array of data class members (fields) with names specified
 VALUE
 rb_ca_fields_at (int argc, VALUE *argv, VALUE self)
 {
-  VALUE data_class = rb_ca_data_class(self);
+  volatile VALUE data_class = rb_ca_data_class(self);
   volatile VALUE member_names, list;
   int i;
   if ( NIL_P(data_class) ) {