carray 1.3.5 → 1.5.1

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

@@ -1383,7 +1383,7 @@ ca_stat_nd_contig_loop (CArray *ca, CArray *co, ca_size_t mc,
   void *p;
   boolean8_t *m;
   ca_size_t i, n;
-  if ( level == co->rank ) {
+  if ( level == co->ndim ) {
     CAStatIterator it;
     n = ca->elements/co->elements;
     idx[level] = 0;
@@ -1421,8 +1421,8 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
              ca_type_name[ca->data_type]);
   }
 
-  ndim = ca->rank - RARRAY_LEN(vaxis);
-  if ( ndim <= 0 || ndim > ca->rank ) {
+  ndim = ca->ndim - RARRAY_LEN(vaxis);
+  if ( ndim <= 0 || ndim > ca->ndim ) {
     rb_raise(rb_eRuntimeError, "invalid dimension specified");
   }
 
@@ -1449,7 +1449,7 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
     char *op;
     boolean8_t *om;
     int8_t i;
-    for (i=0; i<ca->rank; i++) {
+    for (i=0; i<ca->ndim; i++) {
       idx[i] = 0;
     }
     ca_attach_n(2, ca, co);
@@ -1474,7 +1474,7 @@ ca_stat_get_offset_loop (CArray *ca, ca_size_t *dm,
                         CArray *offset)
 {
   ca_size_t i;
-  if ( level == ca->rank - 1 ) {
+  if ( level == ca->ndim - 1 ) {
     if ( dm[level] == 0 ) {
       idx[level] = 0;
       *(ca_size_t *)ca_ptr_at_index(offset, idx1) = ca_index2addr(ca, idx);
@@ -1513,13 +1513,13 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
   ca_size_t loop_dim[CA_RANK_MAX];
   ca_size_t dm[CA_RANK_MAX], dn[CA_RANK_MAX];
   CArray *ca, *co, *first, *offset;
-  ca_size_t out_rank, loop_rank;
+  ca_size_t out_ndim, loop_ndim;
   ca_size_t mc;
   ca_size_t i, k;
 
   Data_Get_Struct(self, CArray, ca);
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     dm[i] = 0;
     dn[i] = 1;
   }
@@ -1530,26 +1530,26 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
     dn[k] = 0;
   }
 
-  out_rank  = 0;
-  loop_rank = 0;
-  for (i=0; i<ca->rank; i++) {
+  out_ndim  = 0;
+  loop_ndim = 0;
+  for (i=0; i<ca->ndim; i++) {
     if ( dm[i] ) {
-      loop_dim[loop_rank] = ca->dim[i];
-      loop_rank += 1;
+      loop_dim[loop_ndim] = ca->dim[i];
+      loop_ndim += 1;
     }
     else {
-      out_dim[out_rank] = ca->dim[i];
-      out_rank += 1;
+      out_dim[out_ndim] = ca->dim[i];
+      out_ndim += 1;
     }
   }
 
-  out    = rb_carray_new(data_type, out_rank, out_dim, 0, NULL);
+  out    = rb_carray_new(data_type, out_ndim, out_dim, 0, NULL);
   Data_Get_Struct(out, CArray, co);
   
-  first  = carray_new(CA_SIZE, out_rank, out_dim, 0, NULL);
+  first  = carray_new(CA_SIZE, out_ndim, out_dim, 0, NULL);
   first->ptr = realloc(first->ptr, first->bytes*(first->elements+1));
 
-  offset = carray_new(CA_SIZE, loop_rank, loop_dim, 0, NULL);
+  offset = carray_new(CA_SIZE, loop_ndim, loop_dim, 0, NULL);
   offset->ptr = realloc(offset->ptr, offset->bytes*(offset->elements+1));
 
   ca_stat_get_offset_loop(ca, dn, 0, idx, 0, idx1, first);
@@ -1673,14 +1673,14 @@ rb_ca_stat_general (int argc, VALUE *argv, VALUE self,
 
     for (i=0; i<RARRAY_LEN(vaxis); i++) {
       k = NUM2SIZE(rb_ary_entry(vaxis, RARRAY_LEN(vaxis)-1-i));
-      CA_CHECK_INDEX(k, ca->rank);
-      if ( k != ca->rank-1-i ) {
+      CA_CHECK_INDEX(k, ca->ndim);
+      if ( k != ca->ndim-1-i ) {
         is_contig = 0;
       }
     }
 
     if ( is_contig ) {
-      if ( RARRAY_LEN(vaxis) == ca->rank ) {
+      if ( RARRAY_LEN(vaxis) == ca->ndim ) {
         return rb_ca_stat_1d(self, rmc, vfval, ca_proc);
       }
       else {
@@ -1841,7 +1841,7 @@ ca_dimstat_type2_loop (CArray *ca, CArray *co, ca_size_t mc,
   void *p;
   boolean8_t *m;
   ca_size_t i, n;
-  if ( level == co->rank ) {
+  if ( level == co->ndim ) {
     CAStatIterator it;
     n = ca->elements/co->elements;
     idx[level] = 0;
@@ -1871,7 +1871,7 @@ ca_dimstat_type2 (CArray *ca, CArray *co, ca_size_t mc, ca_stat_proc_t *ca_proc)
   char *op;
   boolean8_t *om;
   int8_t i;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     idx[i] = 0;
   }
   ca_attach_n(2, ca, co);
@@ -1904,7 +1904,7 @@ rb_ca_dimstat_type2 (int argc, VALUE *argv, VALUE self,
   }
 
   ndim = NUM2SIZE(rndim);
-  if ( ndim <= 0 || ndim > ca->rank ) {
+  if ( ndim <= 0 || ndim > ca->ndim ) {
     rb_raise(rb_eRuntimeError, "invalid dimension specified");
   }
 

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

@@ -34,26 +34,26 @@ ca_check_type (void *ap, int8_t data_type)
 }
 
 void
-ca_check_rank (void *ap, int rank)
+ca_check_ndim (void *ap, int ndim)
 {
   CArray *ca = (CArray *) ap;
   if ( ! ca_is_scalar(ca) ) {
-    if ( ca->rank != rank ) {
-      rb_raise(rb_eRuntimeError, "rank mismatch");
+    if ( ca->ndim != ndim ) {
+      rb_raise(rb_eRuntimeError, "ndim mismatch");
     }
   }
 }
 
 void
-ca_check_shape (void *ap, int rank, ca_size_t *dim)
+ca_check_shape (void *ap, int ndim, ca_size_t *dim)
 {
   CArray *ca = (CArray *) ap;
   int i;
   if ( ! ca_is_scalar(ca) ) {
-    if ( ca->rank != rank ) {
+    if ( ca->ndim != ndim ) {
       rb_raise(rb_eRuntimeError, "shape mismatch");
     }
-    for (i=0; i<rank; i++) {
+    for (i=0; i<ndim; i++) {
       if ( ca->dim[i] != dim[i] ) {
         rb_raise(rb_eRuntimeError, "shape mismatch");
       }
@@ -72,12 +72,12 @@ ca_check_same_data_type (void *ap1, void *ap2)
 }
 
 void
-ca_check_same_rank (void *ap1, void *ap2)
+ca_check_same_ndim (void *ap1, void *ap2)
 {
   CArray *ca1 = (CArray *) ap1;
   CArray *ca2 = (CArray *) ap2;
-  if ( ca1->rank != ca2->rank ) {
-    rb_raise(rb_eRuntimeError, "rank mismatch");
+  if ( ca1->ndim != ca2->ndim ) {
+    rb_raise(rb_eRuntimeError, "ndim mismatch");
   }
 }
 
@@ -98,10 +98,10 @@ ca_check_same_shape (void *ap1, void *ap2)
   CArray *ca2 = (CArray *) ap2;
   int i;
   if ( ( ! ca_is_scalar(ca1) ) && ( ! ca_is_scalar(ca2) ) ) {
-    if ( ca1->rank != ca2->rank ) {
+    if ( ca1->ndim != ca2->ndim ) {
       rb_raise(rb_eRuntimeError, "shape mismatch");
     }
-    for (i=0; i<ca1->rank; i++) {
+    for (i=0; i<ca1->ndim; i++) {
       if ( ca1->dim[i] != ca2->dim[i] ) {
         rb_raise(rb_eRuntimeError, "shape mismatch");
       }
@@ -114,7 +114,7 @@ ca_check_index (void *ap, ca_size_t *idx)
 {
   CArray *ca = (CArray *) ap;
   int i;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( idx[i] < 0 || idx[i] >= ca->dim[i] ) {
       rb_raise(rb_eRuntimeError, "invalid index");
     }
@@ -140,11 +140,11 @@ ca_has_same_shape (void *ap1, void *ap2)
   if ( ca_is_scalar(ca1) || ca_is_scalar(ca2) ) {
     return 1;
   }
-  else if ( ca1->rank != ca2->rank ) {
+  else if ( ca1->ndim != ca2->ndim ) {
     return 0;
   }
   else {
-    for (i=0; i<ca1->rank; i++) {
+    for (i=0; i<ca1->ndim; i++) {
       if ( ca1->dim[i] != ca2->dim[i] ) {
         return 0;
       }
@@ -158,7 +158,7 @@ ca_is_valid_index (void *ap, ca_size_t *idx)
 {
   CArray *ca = (CArray *) ap;
   int8_t i;
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( idx[i] < 0 || idx[i] >= ca->dim[i] ) {
       return 0;
     }
@@ -236,11 +236,11 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
 
   Data_Get_Struct(self, CArray, ca);
 
-  if ( argc != ca->rank ) {
+  if ( argc != ca->ndim ) {
     rb_raise(rb_eArgError,
-             "invalid # of arguments (%i for %i)", argc, ca->rank);
+             "invalid # of arguments (%i for %i)", argc, ca->ndim);
   }
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     idx = NUM2SIZE(argv[i]);
     if ( idx < 0 ) {
       idx += ca->dim[i];
@@ -381,7 +381,7 @@ ca_equal (void *ap, void *bp)
     return 0;
   }
 
-  if ( ca->rank != cb->rank )  {          /* rank comparison */
+  if ( ca->ndim != cb->ndim )  {          /* ndim comparison */
     return 0;
   }
 
@@ -389,7 +389,7 @@ ca_equal (void *ap, void *bp)
     return 0;
   }
 
-  for (i=0; i<ca->rank; i++) {
+  for (i=0; i<ca->ndim; i++) {
     if ( ca->dim[i] != cb->dim[i] ) {     /* dimensional shape comparison */
       return 0;
     }
@@ -571,9 +571,11 @@ rb_ca_modify (VALUE self)
   if ( OBJ_FROZEN(self) ) {
     rb_error_frozen("CArray object");
   }
+  /*
   if ( ( ! OBJ_TAINTED(self) ) && rb_safe_level() >= 4 ) {
     rb_raise(rb_eSecurityError, "Insecure: can't modify carray");
   }
+  */
 }
 
 VALUE
@@ -585,7 +587,6 @@ rb_ca_freeze (VALUE self)
   return rb_obj_freeze(self);
 }
 
-
 void
 Init_carray_test ()
 {

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

@@ -189,11 +189,6 @@ if ( not File.exist?("carray_stat_proc.c") ) or
   system("ruby carray_stat_proc.rb > carray_stat_proc.c")
 end
 
-puts "creating rdoc_ext.rb"
-system %{
-  ruby utils/extract_rdoc.rb > rdoc_ext.rb
-}
-
 # --- create Makefile
 
 create_makefile("carray_ext")

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

@@ -289,7 +289,12 @@ ca_binop_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_binop(self, other, ca_binop_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_binop(self, other, ca_binop_#{name}); 
+}
 static VALUE rb_ca_#{name}_bang (VALUE self, VALUE other)
 { return rb_ca_call_binop_bang(self, other, ca_binop_#{name}); }
   }
@@ -529,7 +534,12 @@ ca_bincmp_#{name}_#{type} (ca_size_t n, boolean8_t *m,
   io.puts
   io.print %{
 static VALUE rb_ca_#{name} (VALUE self, VALUE other)
-{ return rb_ca_call_bincmp(self, other, ca_bincmp_#{name}); }
+{ 
+  if ( ! rb_ca_test_castable(other) ) {
+    return rb_ca_binop_pass_to_other(self, other, rb_intern("#{op}"));
+  }
+  return rb_ca_call_bincmp(self, other, ca_bincmp_#{name});
+}
   }
   DEFINITIONS << io.string
   if op

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

@@ -24,6 +24,7 @@ void Init_numeric_float_function ();
 void Init_carray_core ();
 void Init_carray_undef ();
 void Init_carray_class ();
+void Init_carray_data_type ();
 void Init_carray_test ();
 void Init_carray_attribute ();
 void Init_carray_loop ();
@@ -34,7 +35,6 @@ void Init_carray_iterator ();
 void Init_carray_operator ();
 void Init_carray_numeric ();
 void Init_carray_math ();
-void Init_carray_random ();
 void Init_carray_utils ();
 void Init_carray_order ();
 void Init_carray_sort_addr ();
@@ -70,6 +70,9 @@ void Init_ca_iter_dimension ();
 void Init_ca_iter_block ();
 void Init_ca_iter_window ();
 
+void Init_carray_mathfunc ();
+
+
 void
 Init_carray_ext ()
 {
@@ -193,6 +196,7 @@ Init_carray_ext ()
   Init_numeric_float_function();
 
   Init_carray_class();
+  Init_carray_data_type();
   Init_carray_test();
   Init_carray_attribute();
   Init_carray_undef();
@@ -203,7 +207,6 @@ Init_carray_ext ()
   Init_carray_operator();
   Init_carray_math();      /* order of math, numeric should not be changed */
   Init_carray_numeric();   /* order of math, numeric should not be changed */
-  Init_carray_random();
   Init_carray_order();
   Init_carray_sort_addr();  
   Init_carray_stat();
@@ -240,5 +243,9 @@ Init_carray_ext ()
   Init_ca_iter_dimension();
   Init_ca_iter_block();
   Init_ca_iter_window();
+
+  Init_carray_mathfunc();
+
+
 }
 

data/{version.h → ext/version.h}

@@ -10,9 +10,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.3.5"
-#define CA_VERSION_CODE 135
+#define CA_VERSION "1.5.1"
+#define CA_VERSION_CODE 151
 #define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 3
-#define CA_VERSION_TEENY 5
-#define CA_VERSION_DATE "2019/08/27"
+#define CA_VERSION_MINOR 5
+#define CA_VERSION_TEENY 1
+#define CA_VERSION_DATE "2020/07/01"

data/lib/carray.rb

@@ -14,15 +14,57 @@ major = RbConfig::CONFIG['MAJOR'].to_i
 minor = RbConfig::CONFIG['MINOR'].to_i
 teeny = RbConfig::CONFIG['TEENY'].to_i
 ruby_version_code = major * 100 + minor * 10 + teeny
+
 if ruby_version_code < 190
   require 'complex'
 end
 
+# main 
+
 require 'carray_ext'
-require 'carray/base/basic'
-require 'carray/base/math'
-require 'carray/base/iterator'
-require 'carray/base/struct'
-require 'carray/base/inspect'
-require 'carray/base/autoload'
-require 'carray/base/obsolete'
+
+require 'carray/inspect'
+require 'carray/basic'
+require 'carray/construct'
+require 'carray/mask'
+require 'carray/compose'
+require 'carray/transform'
+require 'carray/convert'
+require 'carray/testing'
+require 'carray/ordering'
+
+require 'carray/math'
+require 'carray/iterator'
+require 'carray/struct'
+require 'carray/table'
+require 'carray/string'
+
+# obsolete methods
+
+require 'carray/obsolete'
+
+# autoload
+
+unless $CARRAY_NO_AUTOLOAD 
+  require 'carray/autoload'
+  require 'carray/autoload/autoload_base'
+  require 'carray/autoload/autoload_io_imagemagick'
+  require 'carray/autoload/autoload_math_histogram'
+  require 'carray/autoload/autoload_math_recurrence'
+  require 'carray/autoload/autoload_object_iterator'
+  require 'carray/autoload/autoload_object_link'
+  require 'carray/autoload/autoload_object_pack'
+
+  require 'carray/autoload/autoload_gem_random'
+  require 'carray/autoload/autoload_gem_gnuplot'
+  require 'carray/autoload/autoload_gem_narray'
+  require 'carray/autoload/autoload_gem_numo_narray'
+  require 'carray/autoload/autoload_gem_io_csv'
+  require 'carray/autoload/autoload_gem_io_sqlite3'
+  require 'carray/autoload/autoload_gem_rmagick'
+  require 'carray/autoload/autoload_gem_cairo'
+  require 'carray/autoload/autoload_gem_opencv'
+  require 'carray/autoload/autoload_gem_ffi'
+
+  undef autoload_method
+end