carray 1.5.8 → 2.0.0

data/ext/carray_stat_proc.rb

@@ -745,7 +745,7 @@ static void
 ca_proc_stddev_<type> (ca_size_t elements, ca_size_t min_count,
                      boolean8_t *m, void *ptr, CAStatIterator *it,
                      int return_object, VALUE *retobj,
-                     boolean8_t *retmask, <atype> *retval)
+                     boolean8_t *retmask, float64_t *retval)
 {
   volatile <atype> sum = <azero>, sum2 = <azero>, ave, var, diff;
   <type> *p = (<type> *) ptr;
@@ -802,7 +802,7 @@ ca_proc_stddev_<type> (ca_size_t elements, ca_size_t min_count,
     if ( retmask ) {
       *retmask = ( count > min_count ) ? 1 : 0;
     }
-    *retval  = sqrt_<op_type>(var);
+    *retval  = <type2dbl>(sqrt_<op_type>(var));
   }
 }
 
@@ -1343,7 +1343,7 @@ rb_ca_stat_1d (VALUE self, VALUE rmc, VALUE vfval,
   boolean8_t *m;
   ca_size_t mc;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( ! ca_proc[ca->data_type] ) {
     rb_raise(rb_eCADataTypeError,
@@ -1411,7 +1411,7 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
   CArray *ca, *co;
   ca_size_t mc, ndim;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( ! ca_proc[ca->data_type] ) {
     rb_raise(rb_eCADataTypeError,
@@ -1425,7 +1425,7 @@ rb_ca_stat_nd_contig (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
   }
 
   out = rb_carray_new(data_type, ndim, ca->dim, 0, NULL);
-  Data_Get_Struct(out, CArray, co);
+  TypedData_Get_Struct(out, CArray, &carray_data_type, co);
 
 	if ( ca_has_mask(ca) ) {
 		ca_create_mask(co);
@@ -1515,7 +1515,7 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
   ca_size_t mc;
   ca_size_t i, k;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   for (i=0; i<ca->ndim; i++) {
     dm[i] = 0;
@@ -1542,7 +1542,7 @@ rb_ca_stat_nd_discrete (VALUE self, VALUE vaxis, VALUE rmc, VALUE vfval,
   }
 
   out    = rb_carray_new(data_type, out_ndim, out_dim, 0, NULL);
-  Data_Get_Struct(out, CArray, co);
+  TypedData_Get_Struct(out, CArray, &carray_data_type, co);
   
   first  = carray_new(CA_SIZE, out_ndim, out_dim, 0, NULL);
   first->ptr = realloc(first->ptr, first->bytes*(first->elements+1));
@@ -1619,7 +1619,7 @@ rb_ca_stat_general (int argc, VALUE *argv, VALUE self,
                  vfval = CA_NIL, vaxis;
   CArray *ca;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   ropt = rb_pop_options(&argc, &argv);
   rb_scan_options(ropt,
@@ -1746,7 +1746,7 @@ static VALUE
 rb_ca_min (int argc, VALUE *argv, VALUE self)
 {
   CArray *ca;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   return rb_ca_stat_general(argc, argv, self, ca->data_type, ca_proc_min);
 }
 
@@ -1760,7 +1760,7 @@ static VALUE
 rb_ca_max (int argc, VALUE *argv, VALUE self)
 {
   CArray *ca;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   return rb_ca_stat_general(argc, argv, self, ca->data_type, ca_proc_max);
 }
 
@@ -1774,7 +1774,7 @@ static VALUE
 rb_ca_accum (int argc, VALUE *argv, VALUE self)
 {
   CArray *ca;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   return rb_ca_stat_general(argc, argv, self, ca->data_type, ca_proc_accum);
 }
 
@@ -1788,7 +1788,7 @@ rb_ca_stat_type2 (int argc, VALUE *argv, VALUE self,
 
   rb_scan_args(argc, argv, "02", (VALUE *) &rmc, (VALUE *) &rfval);
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( ! ca_proc[ca->data_type] ) {
     rb_raise(rb_eCADataTypeError,
@@ -1797,7 +1797,7 @@ rb_ca_stat_type2 (int argc, VALUE *argv, VALUE self,
   }
 
   out = rb_carray_new(data_type, 1, &ca->elements, 0, NULL);
-  Data_Get_Struct(out, CArray, co);
+  TypedData_Get_Struct(out, CArray, &carray_data_type, co);
 
   if ( ca->elements == 0 ) {
     ;
@@ -1893,7 +1893,7 @@ rb_ca_dimstat_type2 (int argc, VALUE *argv, VALUE self,
 
   rb_scan_args(argc, argv, "12", (VALUE *) &rndim, (VALUE *) &rmc, (VALUE *) &rfval);
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( ! ca_proc[ca->data_type] ) {
     rb_raise(rb_eCADataTypeError,
@@ -1914,7 +1914,7 @@ rb_ca_dimstat_type2 (int argc, VALUE *argv, VALUE self,
   odim[ndim] = ca->elements/n;
 
   out = rb_carray_new(data_type, ndim+1, odim, 0, NULL);
-  Data_Get_Struct(out, CArray, co);
+  TypedData_Get_Struct(out, CArray, &carray_data_type, co);
 
 	if ( ca_has_mask(ca) ) {
 		ca_create_mask(co);

data/ext/carray_test.c

@@ -173,7 +173,7 @@ rb_ca_is_type (VALUE arg, int type)
   if ( ! rb_obj_is_carray(arg) ) {
     rb_raise(rb_eRuntimeError, "CArray required");
   }
-  Data_Get_Struct(arg, CArray, ca);
+  TypedData_Get_Struct(arg, CArray, &carray_data_type, ca);
   return ca->data_type == type;
 }
 
@@ -237,7 +237,7 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self)
   ca_size_t idx;
   int i;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
 
   if ( argc != ca->ndim ) {
     rb_raise(rb_eArgError,
@@ -270,7 +270,7 @@ rb_ca_is_valid_addr (VALUE self, VALUE raddr)
   CArray *ca;
   ca_size_t addr;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   addr = NUM2SIZE(raddr);
 	/*
   if ( addr < 0 ) {
@@ -295,7 +295,7 @@ static VALUE
 rb_ca_has_same_shape (VALUE self, VALUE other)
 {
   CArray *ca, *cb;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   cb = ca_wrap_readonly(other, ca->data_type);
   return ca_has_same_shape(ca, cb) ? Qtrue : Qfalse;
 }
@@ -486,8 +486,8 @@ rb_ca_equal (VALUE self, VALUE other)
     }
   }
 
-  Data_Get_Struct(self, CArray, ca);
-  Data_Get_Struct(other, CArray, cb);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
+  TypedData_Get_Struct(other, CArray, &carray_data_type, cb);
 
   return ( ca_equal(ca, cb) ) ? Qtrue : Qfalse;
 }
@@ -560,7 +560,7 @@ rb_ca_hash (VALUE self)
   CArray *ca;
   int32_t hash;
 
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   hash = ca_hash(ca);
   return ULONG2NUM(hash);
 }
@@ -590,7 +590,7 @@ VALUE
 rb_ca_freeze (VALUE self)
 {
   CArray *ca;
-  Data_Get_Struct(self, CArray, ca);
+  TypedData_Get_Struct(self, CArray, &carray_data_type, ca);
   ca_set_flag(ca, CA_FLAG_READ_ONLY);
   return rb_obj_freeze(self);
 }

data/ext/ruby_carray.c

@@ -101,6 +101,13 @@ Init_carray_ext ()
   rb_cCARepeat   = rb_define_class("CARepeat",  rb_cCAVirtual);
   rb_cCAUnboundRepeat  = rb_define_class("CAUnboundRepeat",  rb_cCAVirtual);
 
+  rb_cCArrayMask     = rb_define_class("CArrayMask",    rb_cCArray);
+  rb_cCAReferMask    = rb_define_class("CAReferMask",   rb_cCARefer);
+  rb_cCABlockMask    = rb_define_class("CABlockMask",   rb_cCABlock);
+  rb_cCASelectMask   = rb_define_class("CASelectMask",  rb_cCASelect);
+  rb_cCARepeatMask   = rb_define_class("CARepeatMask",  rb_cCARepeat);
+  rb_cCAUnboundRepeatMask  = rb_define_class("CAUnboundRepeatMask",  rb_cCAUnboundRepeat);
+
   /* -- Exception class -- */
 
   rb_eCADataTypeError =

data/ext/ruby_ccomplex.c

@@ -19,6 +19,20 @@
 static VALUE rb_cComplex;
 #endif
 
+extern const rb_data_type_t ccomplex_data_type;
+
+const rb_data_type_t ccomplex_data_type = {
+    .parent = NULL,
+    .wrap_struct_name = "CComplex",
+    .function = {
+        .dmark = NULL,
+        .dfree = xfree,
+        .dsize = NULL,
+        .dcompact = NULL
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rb_cCComplex;
 
 VALUE rb_ccomplex_new2 (double re, double im);
@@ -69,7 +83,7 @@ rb_num2cc(VALUE num)
 {
   if ( rb_obj_is_kind_of(num, rb_cCComplex) ) {
     double complex *cp;
-    Data_Get_Struct(num, double complex, cp);
+    TypedData_Get_Struct(num, double complex, &ccomplex_data_type, cp);
     return *cp;
   }
   switch ( TYPE(num) ) {
@@ -101,7 +115,7 @@ rb_num_to_cc (VALUE num)
   if ( rb_obj_is_kind_of(num, rb_cCComplex) ) {
     double complex cc = 0.0, *cp;
     cp = &cc;
-    Data_Get_Struct(num, double complex, cp);
+    TypedData_Get_Struct(num, double complex, &ccomplex_data_type, cp);
     return rb_ccomplex_new(cc);
   }
   switch ( TYPE(num) ) {
@@ -129,7 +143,7 @@ rb_ccomplex_new (double complex c)
 {
   VALUE obj;
   double complex *cp;
-  obj = Data_Make_Struct(rb_cCComplex, double complex, 0, xfree, cp);
+  obj = TypedData_Make_Struct(rb_cCComplex, double complex, &ccomplex_data_type, cp);
   *cp = c;
   return obj;
 }
@@ -171,7 +185,7 @@ rb_cc_initialize (int argc, VALUE *argv, VALUE self)
   volatile VALUE rre, rim;
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   rb_scan_args(argc, argv, "11", (VALUE *)&rre, (VALUE *)&rim);
 
@@ -189,7 +203,7 @@ static VALUE
 rb_cc_to_c (VALUE self)
 {
   double complex *cp;
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
   return rb_Complex(rb_float_new(creal(*cp)), rb_float_new(cimag(*cp)));
 }
 
@@ -210,7 +224,7 @@ rb_cc_real(VALUE self)
 {
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   return rb_float_new(creal(*cp));
 }
@@ -220,7 +234,7 @@ rb_cc_imag(VALUE self)
 {
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   return rb_float_new(cimag(*cp));
 }
@@ -232,7 +246,7 @@ rb_cc_inspect (VALUE self)
   double complex *cp;
   double re, im;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   re = creal(*cp);
   im = cimag(*cp);
@@ -256,7 +270,7 @@ rb_cc_conj(VALUE self)
 {
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   return CC2NUM(conj(*cp));
 }
@@ -266,7 +280,7 @@ rb_cc_arg(VALUE self)
 {
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   return rb_float_new(carg(*cp));
 }
@@ -276,7 +290,7 @@ rb_cc_abs(VALUE self)
 {
   double complex *cp;
 
-  Data_Get_Struct(self, double complex, cp);
+  TypedData_Get_Struct(self, double complex, &ccomplex_data_type, cp);
 
   return rb_float_new(cabs(*cp));
 }

data/ext/version.h

@@ -8,9 +8,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.5.8"
-#define CA_VERSION_CODE 158
-#define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 5
-#define CA_VERSION_TEENY 8
-#define CA_VERSION_DATE "2023/01/13"
+#define CA_VERSION "2.0.0"
+#define CA_VERSION_CODE 200
+#define CA_VERSION_MAJOR 2
+#define CA_VERSION_MINOR 0
+#define CA_VERSION_TEENY 0
+#define CA_VERSION_DATE "2025/06/03"

data/lib/carray/inspect.rb

@@ -32,9 +32,6 @@ class CArray::Inspector  # :nodoc:
               data_spec,
               ">"
              ].join
-    if @carray.tainted?
-      output.taint
-    end
     return output
   end
   

data/lib/carray/io/imagemagick.rb

@@ -87,19 +87,18 @@ class CArray
                    else
                      raise "invalid data_type"
                    end
-    tempfile = "CA_Magick_#{$$}_#{@@magick_tempfile_count}.dat"
-    @@magick_tempfile_count += 1
+#    tempfile = "CA_Magick_#{$$}_#{@@magick_tempfile_count}.dat"
+#    @@magick_tempfile_count += 1
     stream_command = [
                       "stream",
                       "-storage-type #{storage_type}",
                       "-map #{imap}",
                       filename,
-                      tempfile,
+                      "-",
                       "2>/dev/null"
                      ].join(" ")
     begin
-      system stream_command
-      return open(tempfile) { |io|
+      return IO.popen(stream_command) { |io|
         if imap.size == 1
           CArray.new(data_type, [height, width]).load_binary(io)
         else
@@ -109,9 +108,9 @@ class CArray
     rescue
       raise "ImageMagick's stream command failed to read image file '#{filename}'"
     ensure
-      if File.exist?(tempfile)
-        File.unlink(tempfile)
-      end
+#      if File.exist?(tempfile)
+#        File.unlink(tempfile)
+#      end
     end
   end
 
@@ -171,7 +170,7 @@ class CArray
       depth = "-depth 8"
     end
     convert_command = [
-                       "convert",
+                       "magick convert",
                        depth,
                        "-size " + [dim1, dim0].join("x"),
                        quantum_format,

data/lib/carray/mkmf.rb

@@ -112,6 +112,7 @@ def possible_prefix (*postfixes)
     File.expand_path("~/local"), ### user's home / local
     File.expand_path("~"),       ### user's home
     "/opt/local",                ### MacPorts
+    "/opt/homebrew",             ### Homebrew
     "/opt",                      ### UNIX 
     "/sw/local",                 ### Mac Fink
     "/sw/",                      ### Mac Fink

data/lib/carray/time.rb

@@ -53,7 +53,7 @@ class CArray
   end
 
   def time_minute
-    return convert(:int, &:minute)
+    return convert(:int, &:min)
   end
 
   def time_second

data/spec/Classes/ex1.rb

@@ -0,0 +1,46 @@
+require_relative "../../lib/carray"
+#require_relative "../../ext/carray_ext"
+
+class CArray
+  
+  def count_masked (*axis)
+    p "rw"
+    if has_mask?  
+      p "rb"
+      p self.class
+      p self.mask.ndim
+      p "rk"
+#      j=self.mask
+      p "rj"
+      #p mask.int64
+      #return mask.int64.accumulate(*axis)
+    else
+      if axis.empty?
+        return 0
+      else
+        spec = shape.map{:i}
+        axis.each do |k|
+          spec[k] = nil
+        end
+        return self[*spec].ca.template(:int64) { 0 }
+      end
+    end
+  end
+  
+end
+a = CArray.int(3).seq!
+a[1] = UNDEF
+r1 = a[3,:%]
+x1 = r1.to_ca
+ 3 == x1.count_masked 
+ p "ro"
+#is_asserted_by { 3 == r1[nil, 1].count_masked }
+#is_asserted_by { 3 == x1.count_masked }
+#is_asserted_by { 3 == x1[nil, 1].count_masked }
+
+#r2 = a[:%,3]
+#x2 = r2.to_ca
+#is_asserted_by { 3 == r2.count_masked }
+#is_asserted_by { 3 == r2[1, nil].count_masked }
+#is_asserted_by { 3 == x2.count_masked }
+#is_asserted_by { 3 == x2[1, nil].count_masked }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Hiroki Motoyoshi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Ruby/CArray is an extension library for the multi-dimensional numerical array
@@ -154,6 +153,7 @@ files:
 - spec/Classes/CAWrap_spec.rb
 - spec/Classes/CArray_spec.rb
 - spec/Classes/CScalar_spec.rb
+- spec/Classes/ex1.rb
 - spec/Features/feature_130_spec.rb
 - spec/Features/feature_attributes_spec.rb
 - spec/Features/feature_boolean_spec.rb
@@ -207,7 +207,6 @@ homepage: https://github.com/himotoyoshi/carray
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Multi-dimesional array class for Ruby
 test_files: []