carray 1.4.0 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19670c9fa370952b777655dbbfc938a93deecbbe62452559f572951d8a083078
-  data.tar.gz: bc7dae442eee84400725a45c804332426f72a0405299d785ecccb3cae27f1d2b
+  metadata.gz: 4c7a72221863bbee2085dc603cd57a4970c34dc5236640e47819f3fa503d2b00
+  data.tar.gz: e09709eedecd9679ddf8cfa13d047cfa60014728a07d864fa6c29a372f49ea08
 SHA512:
-  metadata.gz: d1f76a7cdc3448844557c05c0375b01221a2d7a6d9d48ed36223cbc3a39b379e3dab966a48c8a6aaa57d0d6521e4222f2849dca8749e7137e693ec9379d12b9f
-  data.tar.gz: 82b3ff4f50775df6f6699533826e8494a29a34f15256d2874b271dc6cd64f1c24878d4639185c4837a66ee15daf33fa25c1ec3f0bf80c487b80553c353939cbd
+  metadata.gz: 7c096ade9e0141172eec06ed71660c6930929231b94b57c3a659e30ffe90c323117a5fb4f5c533517c4460355549586b193e134e4a456876fbab9deea78a4360
+  data.tar.gz: 04e3c2e157f3a5a088d008cccdb1307549cbb0105538f1495e728e61f9c824b5034315d07faae0498795671d055c892ee8f596a5ad8b4700ecc79c0a6fd993a1

data/.yardopts

@@ -0,0 +1,32 @@
+--markup markdown
+--markup-provider redcarpet
+--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/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2020 Hiroki Motoyoshi.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/NEWS.md

@@ -0,0 +1,83 @@
+ChangeLog of Ruby/CArray
+========================
+
+1.5.4 -> 1.5.5
+
+* [Fix] Fix recognition of "atan2", ... in "math.h"
+* [Fix] Fix serialize.rb of keyword parameters for Ruby2.7
+
+1.5.3 -> 1.5.4
+--------------
+
+* [New] Import method 'CArray#section' from gem 'carray-calculus'
+* [New] Add new method 'CArray#pull', 'CArray#pulled'
+* [New] Add new option 'expand_scalar' to 'CArray.broadcast'
+* [Mod] Modify the method 'CArray.broadcast' to accept block.
+* [Mod] Modify the method 'CArray.meshgrid' to accept block.
+* [Mod] Modify 'CScalar#broadcast_to' to return CArray
+* [Mod] Modify 'CScalar#is_masked' and 'CScalar#is_masked' to return CScalar
+* [Fix] Fix order of repetitive dimensions in 'CArray#meshgrid'
+* [Fix] Fix errors in installing on MinGW+msys2
+
+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
+--------------
+
+* [New] Add new method 'CArray#sorted_with'
+* [New] Add new method 'CArray#sort_with'
+* [New] Add new method 'CArray#max_with'
+* [New] Add new method 'CArray#min_with'
+* [New] Add new method 'CArray.broadcast'
+* [New] Add new method 'CArray#broadcast_to', 'CScalar#broadcast_to'
+* [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] 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)
+
+1.5.0 -> 1.5.1
+--------------
+
+* [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
+
+1.4.0 -> 1.5.0
+--------------
+
+* [Mod] Remove 'Carray#random!' (gone to 'carray-random' gem)
+* [Mod] Relocate file 'lib/carray/io/table.rb' to 'lib/carray/table.rb'
+* [Mod] Rename class 'CA::TableMethods' to 'CArray::TableMethods'
+* [Mod] Rename method 'CArray#cast_other' to 'CArray#cast_with'
+* [Mod] Change license from "Ruby's" to "MIT"
+* [Mod] Remove files 'COPYING', 'LEGAL'(for MT), 'GPL'
+* [Fix] Fix bug lib/carray/struct.rb

data/README.md

@@ -3,34 +3,54 @@ Ruby/CArray
 
 Ruby/CArray is an extension library for the multi-dimensional array class.
 
+Features
+--------
+
+* Collection class for multidimensional array storing the value with uniform data type
+* Element-wise mathematical operations and functions
+* Statistical operation for the elements
+* Various methods for referencing data elements
+* Internally included element-wise mask to handle missing values
+* Indirect data manipulation to referent by virtual array 
+* Special iterators (dimension, block, window, categorical)
+* User-defined array class with same multi-dimensional interfaces as CArray
+* Accessing the partial data in fixed length data via data_class interface
+* Wrapping the memory block owned by the other object (such as NArray).
+
 Requirements
 ------------
 
-* Ruby 2.2.0 or later
+* Ruby 2.4.0 or later
 * C compiler 
   + IEEE754 floating point number
   + C99 complex number
-* Optional command
-  + ImageMagick (stream, convert, display, identify)
 
-Directories
------------
+What is Ruby/CArray 
+------------------
+
+Ruby/CArray is an extension library for the multi-dimensional numerical array class. The name "CArray" comes from a wrapper's meaning to a numerical array handled by the C language. CArray stores integers or floating-point numbers in memory block and treats them collectively to ensure efficient performance. Therefore, Ruby/CArray is suitable for numerical computation and data analysis. 
+
+#### Multi-dimensional uniform array ####
+
+CArray is a collection class that can store the array of values with a uniform data type of one of fixed-width integer (8,16,32,64bits), floating-point number (32,64bits), complex number (64,128bits), fixed-length string, ruby object. These values are stored in memory block as binary data. CArray has multi-dimensional interfaces for the array to access their values. The multi-dimensional array has the attributes of the dimension size (1,2,3,...) and the shape of dimension ([dim0], [dim0,dim1], [dim0,dim1,dim2],...) which define the size of array. 
+
+#### Collective mathematical operations ####
+
+CArray supports the collective calculation for the element-wise arithmetic operations and elementary mathematical functions. Additionally, some basic statistical summarization along specific dimensions are also provided.
+
+#### Referencing data and virtual arrays ####
+
+CArray provides various methods for referencing data, such as addressing, slicing, selection by condition, address mapping, grid reference, transposing, shifting, rolling, data type conversion, reshaping, and so on. These data referencing are realized by the creation of virtual arrays, so-called 'view'. The virtual array doesn't have its data and retrieves the data from the referent only on-demand, including dereferencing, copying, or calculation. Since virtual array classes are sub-class of CArray, it has the same interfaces to access data as CArray. The changes in a virtual array by storing data are also reflected in the referent (if not a read_only array). Multiple heterogeneous chains of reference are also allowed, although the trade-offs with performance must be carefully considered.
+
+#### Built-in element-wise mask handling ####
 
-    .         - Ruby/CArray extension source codes
-    lib       - Ruby/CArray standard library in Ruby
-    ext       - optional extension libraries for Ruby/CArray
-    examples  - some examples
-    test      - some unit tests (incomplete)
-    spec      - some rspec (incomplete)
-    utils     - support tools for development.
+CArray possesses masked states about each element (so-called "element-wise mask"). By referring the element-wise mask, CArray can perform mathematical and statistical calculations on the data with missing values by appropriate handling of masked elements. , which include the propagation of mask state to result in element-wise arithmetics and ignoring the masked elements in a statistical calculation, and so on.
 
-Author
-------
+#### User-defined array ####
 
-Hiroki Motoyoshi 
+Users can define a new virtual array class in Ruby level or C-extension level with TemplateMethod pattern. They are defined as a subclass of CAObject in Ruby level and as a subclass of CAVirtual in C-extension level. In particular, at the Ruby level, you can easily define a CArray-like class by implementing just a few template methods.
 
-Copying
+License
 -------
 
-You can redistribute this library package and/or modify it under the terms of
-the Ruby Licence. See the file 'COPYING' in this directory.
+MIT (after version 1.5.0)

data/Rakefile

@@ -6,7 +6,7 @@ GEMSPEC = "carray.gemspec"
 
 task :install do
   spec = eval File.read(GEMSPEC)
-  version_h = `ruby version.rb`.chomp
+  version_h = `ruby ext/version.rb`.chomp
   if spec.version.to_s != version_h
     STDERR.puts "Mismatch in version between carray.gemspec and version.h"
     STDERR.puts "  carray.gemspec - #{spec.version.to_s }"
@@ -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

@@ -0,0 +1,17 @@
+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
+   - serialization of carray which has data_class
+
+Done
+-------
+

data/carray.gemspec

@@ -1,39 +1,34 @@
 Gem::Specification::new do |s|
 
-  version = "1.4.0"
+  version = "1.5.5"
 
-  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"
+  s.summary     = "Multi-dimesional array class for Ruby"
   s.description = <<-HERE
-    CArray is a uniform multi-dimensional rectangular array class.
-    It provides the various types of sub-arrays and references
-    pointing the data elements of original array (slice, grid, selection ...).
-    Element-wise masking and mathematical operations are natively supported.
+    Ruby/CArray is an extension library for the multi-dimensional numerical array
+    class. The name "CArray" comes from the meaning of a wrapper to a numerical array
+    handled by the C language. CArray stores integers or floating-point numbers in
+    memory block and treats them collectively to ensure efficient performance.
+    Therefore, Ruby/CArray is suitable for numerical computation and data analysis.
   HERE
   s.version     = version
   s.author      = "Hiroki Motoyoshi"
   s.email       = ""
+  s.license     = 'MIT'
   s.homepage    = 'https://github.com/himotoyoshi/carray'
   s.files       = files
-  s.extensions  = [ "extconf.rb" ] + 
-                     Dir["ext/*/extconf.rb"].select{|f| File.exist?(f) }
-  s.rdoc_options = [
-		"-m rdoc_main.rb", 
-		"rdoc_main.rb", 
-		"rdoc_ext.rb",
-		"rdoc_math.rb", 
-		"rdoc_stat.rb", 
-		Dir.glob("lib/carray/**/*.rb"),
-	].flatten
-  s.required_ruby_version = ">= 1.8.1"
+  s.extensions  = [ "ext/extconf.rb" ] 
+  s.required_ruby_version = ">= 2.4.0"
 end
 

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

@@ -3,16 +3,14 @@
   ca_iter_block.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 CABlockIterator < CAIterator # :nodoc: 
   end
 */
@@ -23,7 +21,7 @@ VALUE rb_cCABlockIterator;
 typedef struct {
   int16_t   obj_type;
   int8_t    data_type;
-  int8_t    rank;
+  int8_t    ndim;
   int32_t   flags;
   ca_size_t   bytes;
   ca_size_t   elements;
@@ -42,11 +40,11 @@ typedef struct {
   ca_size_t  *step;
   ca_size_t  *count;
   ca_size_t  *size0;
-} CABlock;                  // 68 + 20*(rank) (bytes) 
+} CABlock;                  // 68 + 20*(ndim) (bytes) 
 */
 
 typedef struct {
-  int8_t  rank;
+  int8_t  ndim;
   ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
   CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
@@ -73,14 +71,14 @@ ca_bi_kernel_at_index (void *it, ca_size_t *idx, CArray *ref)
   else {
     CABlock *ck = (CABlock *)bit->kernel;
     kernel = ca_block_new(ref,
-                          ck->rank, ck->size0,
+                          ck->ndim, ck->size0,
                           ck->start, ck->step, ck->count,
                           ck->offset);
   }
 
   ca_update_mask(kernel);
 
-  for (i=0; i<kernel->rank; i++) {
+  for (i=0; i<kernel->ndim; i++) {
     j = idx[i];
     CA_CHECK_INDEX(j, bit->dim[i]);
     kernel->start[i] += j * kernel->dim[i];
@@ -99,7 +97,7 @@ ca_bi_kernel_at_addr (void *it, ca_size_t addr, CArray *ref)
   ca_size_t *dim = bit->dim;
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
-  for (i=bit->rank-1; i>=0; i--) {
+  for (i=bit->ndim-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
   }
@@ -117,7 +115,7 @@ ca_bi_kernel_move_to_index (void *it, ca_size_t *idx, CArray *kern)
 
   ca_update_mask(kernel);
 
-  for (i=0; i<kernel->rank; i++) {
+  for (i=0; i<kernel->ndim; i++) {
     j = idx[i];
     CA_CHECK_INDEX(j, bit->dim[i]);
     kernel->start[i] = j * kernel->dim[i];
@@ -136,7 +134,7 @@ ca_bi_kernel_move_to_addr (void *it, ca_size_t addr, CArray *ref)
   ca_size_t *dim = bit->dim;
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
-  for (i=bit->rank-1; i>=0; i--) {
+  for (i=bit->ndim-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
   }
@@ -158,11 +156,11 @@ ca_bi_setup (VALUE self, VALUE rref, VALUE rker)
   Data_Get_Struct(rref, CArray, ref);
   Data_Get_Struct(rker, CABlock, ker);
 
-  if ( ref->rank != ker->rank ) {
-    rb_raise(rb_eRuntimeError, "rank mismatch between reference and kernel");
+  if ( ref->ndim != ker->ndim ) {
+    rb_raise(rb_eRuntimeError, "ndim mismatch between reference and kernel");
   }
 
-  for (i=0; i<ref->rank; i++) {
+  for (i=0; i<ref->ndim; i++) {
     if ( ker->step[i] != 1 ) {
       rb_raise(rb_eRuntimeError, "block should be contiguous");
     }
@@ -174,8 +172,8 @@ ca_bi_setup (VALUE self, VALUE rref, VALUE rker)
     */
   }
 
-  it->rank      = ref->rank;
-  memcpy(it->dim, dim, it->rank * sizeof(ca_size_t));
+  it->ndim      = ref->ndim;
+  memcpy(it->dim, dim, it->ndim * sizeof(ca_size_t));
   it->reference = ref;
   it->kernel    = ker;
   it->kernel_at_addr  = ca_bi_kernel_at_addr;
@@ -202,7 +200,7 @@ rb_bi_initialize_copy (VALUE self, VALUE other)
   return self;
 }
 
-/* rdoc:
+/* yard:
   class CArray
     # Create block iterator.
     def blocks (*args)

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

@@ -3,10 +3,8 @@
   ca_iter_dimension.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
 
 ---------------------------------------------------------------------------- */
 
@@ -15,13 +13,13 @@
 
 VALUE rb_cCADimIterator;
 
-/* rdoc: 
+/* yard: 
   class CADimensionIterator < CAIterator # :nodoc:
   end
 */
 
 typedef struct {
-  int8_t  rank;
+  int8_t  ndim;
   ca_size_t dim[CA_RANK_MAX];
   CArray *reference;
   CArray * (*kernel_at_addr)(void *, ca_size_t, CArray *);
@@ -50,14 +48,14 @@ ca_di_kernel_at_index (void *it, ca_size_t *idx, CArray *ref)
   else {
     CABlock *ck = (CABlock *)dit->kernel;
     kernel = ca_block_new(ref,
-                          ck->rank, ck->size0,
+                          ck->ndim, ck->size0,
                           ck->start, ck->step, ck->count,
                           ck->offset);
   }
 
   ca_update_mask(kernel);
 
-  for (i=0; i<dit->rank; i++) {
+  for (i=0; i<dit->ndim; i++) {
     val = idx[i];
     CA_CHECK_INDEX(val, dit->dim[i]);
     kernel->start[dit->symindex[i]] = val * kernel->step[dit->symindex[i]];
@@ -77,7 +75,7 @@ ca_di_kernel_at_addr (void *it, ca_size_t addr, CArray *ref)
   ca_size_t *dim = dit->dim;
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
-  for (i=dit->rank-1; i>=0; i--) {
+  for (i=dit->ndim-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
   }
@@ -94,7 +92,7 @@ ca_di_kernel_move_to_index (void *it, ca_size_t *idx, CArray *kern)
 
   ca_update_mask(kernel);
 
-  for (i=0; i<dit->rank; i++) {
+  for (i=0; i<dit->ndim; i++) {
     val = idx[i];
     CA_CHECK_INDEX(val, dit->dim[i]);
     kernel->start[dit->symindex[i]] = val * kernel->step[dit->symindex[i]];
@@ -114,7 +112,7 @@ ca_di_kernel_move_to_addr (void *it, ca_size_t addr, CArray *ref)
   ca_size_t *dim = dit->dim;
   ca_size_t idx[CA_RANK_MAX];
   int8_t i;
-  for (i=dit->rank-1; i>=0; i--) {
+  for (i=dit->ndim-1; i>=0; i--) {
     idx[i] = addr % dim[i];
     addr  /= dim[i];
   }
@@ -129,7 +127,7 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
   volatile VALUE rindex, rker, rsymtbl;
   CADimIterator *it;
   CAIndexInfo blk_spec;
-  int8_t rank;
+  int8_t ndim;
   int i, j, k;
 
   Data_Get_Struct(self, CADimIterator, it);
@@ -142,7 +140,7 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
 
   blk_spec      = *info;
   blk_spec.type = CA_REG_BLOCK;
-  for (i=0; i<info->rank; i++) {
+  for (i=0; i<info->ndim; i++) {
     if ( info->index_type[i] == CA_IDX_SYMBOL ) {
       blk_spec.index_type[i] = CA_IDX_ALL;
       rb_hash_aset(rsymtbl, ID2SYM(blk_spec.index[i].symbol.id), INT2NUM(i));
@@ -151,13 +149,13 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
 
   rref = rb_ca_ref_block(rref, &blk_spec);
 
-  rindex = rb_ary_new2(info->rank);
-  rank = 0;
+  rindex = rb_ary_new2(info->ndim);
+  ndim = 0;
 
   j = 0;
   k = 0;
 
-  for (i=0; i<info->rank; i++) {
+  for (i=0; i<info->ndim; i++) {
     if ( info->index_type[i] == CA_IDX_SCALAR ) {
       rb_ary_store(rindex, i, SIZE2NUM(info->index[i].scalar));
       continue; /* escape from j++ */
@@ -165,8 +163,8 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
     else if ( info->index_type[i] == CA_IDX_SYMBOL ) {
       rb_ary_store(rindex, i, rb_ary_new3(1, SIZE2NUM(0)));
       it->symflag[j]       = 1;
-      it->symindex[rank] = j;
-      rank++;
+      it->symindex[ndim] = j;
+      ndim++;
     }
     else if ( info->index_type[i] == CA_IDX_ALL ) {
       rb_ary_store(rindex, i, Qnil);
@@ -184,7 +182,7 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
 
   rker = rb_apply(rref, rb_intern("[]"), rindex);
 
-  it->rank = rank;
+  it->ndim = ndim;
   Data_Get_Struct(rref, CArray, it->reference);
   Data_Get_Struct(rker, CArray, it->kernel);
   it->kernel_at_addr  = ca_di_kernel_at_addr;
@@ -192,7 +190,7 @@ ca_di_setup (VALUE self, VALUE rref, CAIndexInfo *info)
   it->kernel_move_to_addr  = ca_di_kernel_move_to_addr;
   it->kernel_move_to_index = ca_di_kernel_move_to_index;
 
-  for (i=0; i<it->rank; i++) {
+  for (i=0; i<it->ndim; i++) {
     it->dim[i] = it->reference->dim[it->symindex[i]];
   }
 
@@ -239,7 +237,8 @@ rb_ca_dim_iterator (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  rb_ca_scan_index(ca->rank, ca->dim, ca->elements, argc, argv, &info);
+  info.range_check = 1;
+  rb_ca_scan_index(ca->ndim, ca->dim, ca->elements, argc, argv, &info);
 
   obj = rb_di_s_allocate(rb_cCADimIterator);
   ca_di_setup(obj, self, &info);
@@ -258,7 +257,7 @@ rb_dim_iter_new (VALUE rref, CAIndexInfo *info)
   return obj;
 }
 
-/* rdoc:
+/* yard:
   class CADimensionIterator
     def sym2dim (sym)
     end