carray 1.5.2 → 1.5.7

data/ext/extconf.rb

@@ -135,11 +135,23 @@ end
 # --- check tgmath.h
 
 have_header("tgmath.h")
+have_func("atan2",  "math.h")
+have_func("hypot",  "math.h")
+have_func("lgamma", "math.h")
+have_func("expm1",  "math.h")
 
 # --- check mergesort routine
 
 have_func("mergesort", "stdlib.h")
 
+# --- check mergesort routine
+
+have_func("strptime", "time.h")
+
+# --- check raneg object
+
+have_func("rb_arithmetic_sequence_extract")
+
 # --- setup install files
 
 $INSTALLFILES = []
@@ -153,7 +165,7 @@ $INSTALLFILES << ['carray_config.h', '$(archdir)']
 #
 
 if /cygwin|mingw/ =~ RUBY_PLATFORM
-  sitearchdir = Config::CONFIG["sitearchdir"]
+  sitearchdir = RbConfig::CONFIG["sitearchdir"]
   $DLDFLAGS << " -L#{sitearchdir} -Wl,--out-implib=libcarray.a "
   unless File.exist? "libcarray.a"
     $TOUCHED_LIBCARRAY_A = true

data/ext/mkmath.rb

@@ -385,7 +385,7 @@ ca_moncmp_#{name}_#{type} (ca_size_t n, boolean8_t *m, char *ptr1, ca_size_t i1,
   io.puts "};"
   io.puts
   io.print %{
-static VALUE rb_ca_#{name} (VALUE self, VALUE other)
+static VALUE rb_ca_#{name} (VALUE self)
 { return rb_ca_call_moncmp(self, ca_moncmp_#{name}); }
   }
   DEFINITIONS << io.string

data/ext/ruby_carray.c

@@ -11,6 +11,10 @@
 #include "carray.h"
 #include "version.h"
 
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+VALUE rb_cArithSeq;
+#endif
+  
 VALUE rb_eCADataTypeError;
 VALUE rb_mCA;
 
@@ -70,13 +74,16 @@ void Init_ca_iter_window ();
 
 void Init_carray_mathfunc ();
 
-
 void
 Init_carray_ext ()
 {
 
   /* Classes and Modules */
 
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+  rb_cArithSeq   = rb_const_get(rb_cEnumerator, rb_intern("ArithmeticSequence"));
+#endif
+
   /* -- CArray class -- */
 
   rb_cCArray     = rb_define_class("CArray",    rb_cObject);

data/ext/ruby_ccomplex.c

@@ -460,7 +460,7 @@ Init_ccomplex ()
   rb_define_method(rb_cCComplex, "coerce", rb_cc_coerce, 1);
 
   rb_define_method(rb_cCComplex, "==", rb_cc_equal, 1);
-  rb_define_method(rb_cCComplex, "-@", rb_cc_uminus, 1);
+  rb_define_method(rb_cCComplex, "-@", rb_cc_uminus, 0);
   rb_define_method(rb_cCComplex, "+", rb_cc_plus, 1);
   rb_define_method(rb_cCComplex, "-", rb_cc_minus, 1);
   rb_define_method(rb_cCComplex, "*", rb_cc_asterisk, 1);

data/ext/version.h

@@ -8,9 +8,9 @@
 
 ---------------------------------------------------------------------------- */
 
-#define CA_VERSION "1.5.2"
-#define CA_VERSION_CODE 152
+#define CA_VERSION "1.5.7"
+#define CA_VERSION_CODE 157
 #define CA_VERSION_MAJOR 1
 #define CA_VERSION_MINOR 5
-#define CA_VERSION_TEENY 2
-#define CA_VERSION_DATE "2020/07/22"
+#define CA_VERSION_TEENY 7
+#define CA_VERSION_DATE "2021/06/16"

data/lib/carray.rb

@@ -3,10 +3,8 @@
 #  lib/carray.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 
@@ -61,12 +59,12 @@ unless $CARRAY_NO_AUTOLOAD
   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'
+#  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

data/lib/carray/autoload.rb

@@ -3,8 +3,6 @@
 #  carray/autoload.rb
 #
 #  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-2010  Hiroki Motoyoshi
 #

data/lib/carray/basic.rb

@@ -3,10 +3,8 @@
 #  carray/basic.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 
@@ -85,11 +83,11 @@ class CArray
   end
   
   def first
-    self[0]
+    ( self.elements == 0 ) ? nil : self[0]
   end
   
   def last
-    self[-1]
+    ( self.elements == 0 ) ? nil :self[-1]
   end
 
   # matchup

data/lib/carray/broadcast.rb

@@ -1,45 +1,101 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/broadcast.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#
+#  Copyright (C) 2005-2020 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
 
 class CArray
-  def broadcast_to (*new_dim)
-    if new_dim.size < ndim
-      raise "can't broadcast to #{new_dim.inspect} because of mismatch in rank"
+
+  def broadcast_to (*newdim)
+    
+    if newdim.size < ndim
+      raise "(Broadcasting) can't broadcast to #{newdim.inspect} because too small rank is specified"
     end
-    flag_unbound_repeat = false
-    sdim = []
-    ([1]*(new_dim.size-ndim) + dim).each_with_index do |d, k|
-      if new_dim[k] == 1
-        sdim << 1
-      elsif d == 1
-        flag_unbound_repeat = true
-        sdim << :*
-      elsif d != new_dim[k]
-        raise "can't broadcast to #{new_dim.inspect} because of mismatch in #{d} for #{new_dim[k]} in #{k}th dim"
+
+    #
+    # Try to build unbound repeat index (includes :*)
+    #                     with broadcasting rule in Numpy.
+    #
+    repdim = []
+    shape  = []
+
+    srcdim = dim.dup 
+    dstdim = newdim.dup
+    sd = srcdim.pop
+    dd = dstdim.pop
+    while dd
+      if sd == dd
+        repdim.unshift nil
+        shape.unshift(dd)
+        sd = srcdim.pop
+      elsif dd == 1
+        repdim.unshift :*
+      elsif sd == 1 
+        repdim.unshift :*
+        sd = srcdim.pop
       else
-        sdim << nil
+        raise "(Broadcasting) can't broadcast to #{newdim.inspect} " 
       end
+      dd = dstdim.pop
     end
-    return self[*sdim].bind(*new_dim) if flag_unbound_repeat
-    return self
+
+    #
+    # Call Unbound repeat's bind
+    #
+    return self.reshape(*shape)[*repdim].bind(*newdim) if repdim.include?(:*)
+    
+    self
   end
+
 end
 
 class CScalar
-  def broadcast_to (*new_dim)
-    return self
+  
+  def broadcast_to (*newdim)
+    out = CArray.new(data_type, newdim, bytes: bytes)
+    out[] = self
+    out
   end
+
 end
 
 class CAUnboundRepeat
+
   alias broadcast_to bind
+
 end
 
-def CArray.broadcast (*argv)
-  sel = argv.select {|arg| arg.is_a?(CArray) }
+def CArray.broadcast (*argv, expand_scalar: false, &block)
+  
+  sel = argv.select { |arg| arg.is_a?(CArray) }
   return argv if sel.empty?
+  
   dim = []
   ndim = sel.map(&:ndim).max
   ndim.times do |k|
-    dim[k] = sel.map{|arg| arg.dim[k] || 1 }.max
+    dim[k] = sel.map { |arg| arg.dim[k] || 1 }.max
+  end
+
+  if not expand_scalar
+    list = argv.map { |arg| 
+      case arg
+      when CScalar
+        arg
+      when CArray
+        arg.broadcast_to(*dim)
+      else
+        arg
+      end
+    }
+  else
+    list = argv.map { |arg| arg.is_a?(CArray) ? arg.broadcast_to(*dim) : arg }
   end
-  return argv.map{|arg| arg.is_a?(CArray) ? arg.broadcast_to(*dim) : arg }
+  
+  return block.call(*list) if block
+  return list
 end
+

data/lib/carray/compose.rb

@@ -3,10 +3,8 @@
 #  carray/composition.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 
@@ -34,6 +32,7 @@ class CArray
       end
     end
     out = CArray.new(data_type, newdim, &block)
+    out.data_class = data_class if has_data_class?
     if out.has_mask?
       out.mask.paste(offset, self.false)
     end
@@ -63,6 +62,7 @@ class CArray
       grids[i][offset[i]..-1].seq!(offset[i]+bsize[i])
     end
     out = CArray.new(data_type, newdim)
+    out.data_class = data_class if has_data_class?
     if block_given?
       sel = out.true
       sel[*grids] = 0
@@ -114,7 +114,14 @@ class CArray
     return self[*grids].to_ca
   end
   
-  def self.combine (data_type, tdim, list, at = 0)
+  def self.combine (data_type, tdim, list, at = 0, bytes: nil)
+    if CArray.data_class?(data_type)
+      data_class = data_type
+      data_type  = :fixlen
+      bytes = data_class::DATA_SIZE
+    else
+      data_class = nil
+    end
     has_fill_value = false
     if block_given?
       fill_value = yield
@@ -168,6 +175,7 @@ class CArray
     else      
       obj = CArray.new(data_type, newdim)
     end
+    out.data_class = data_class if data_class
     idx = newdim.map{0}
     block.each_with_index do |item, tidx|
       (at...at+tndim).each_with_index do |d,i|
@@ -178,11 +186,18 @@ class CArray
     obj
   end
 
-  def self.bind (data_type, list, at = 0)
-    return CArray.combine(data_type, [list.size], list, at)
+  def self.bind (data_type, list, at = 0, bytes: nil)
+    return CArray.combine(data_type, [list.size], list, at, bytes: bytes)
   end
 
-  def self.composite (data_type, tdim, list, at = 0)
+  def self.composite (data_type, tdim, list, at = 0, bytes: nil)
+    if CArray.data_class?(data_type)
+      data_class = data_type
+      data_type  = :fixlen
+      bytes = data_class::DATA_SIZE
+    else
+      data_class = nil
+    end
     if not tdim.is_a?(Array) or tdim.size == 0
       raise "invalid tiling dimension"
     end
@@ -213,7 +228,8 @@ class CArray
     end
     newdim = dim.clone
     newdim[at,0] = tdim
-    obj = CArray.new(data_type, newdim)
+    obj = CArray.new(data_type, newdim, bytes: bytes)
+    out.data_class = data_class if data_class
     idx = Array.new(ndim+tndim) { nil }
     CArray.each_index(*tdim) do |*tidx|
       idx[at,tndim] = tidx
@@ -222,13 +238,21 @@ class CArray
     obj
   end
 
-  def self.merge (data_type, list, at = -1)
-    return CArray.composite(data_type, [list.size], list, at)
+  def self.merge (data_type, list, at = -1, bytes: nil)
+    return CArray.composite(data_type, [list.size], list, at, bytes: bytes)
   end
   
   def self.join (*argv)
     # get options
     case argv.first
+    when Class
+      if CArray.data_class?(argv.first)
+        data_class = argv.shift
+        data_type = "fixlen"
+        bytes = data_class::DATA_SIZE
+      else
+        raise "#{argv.first} can not to be a data_class for CArray"
+      end
     when Integer, Symbol, String
       type, = *CArray.guess_type_and_bytes(argv.shift, 0)
     else

data/lib/carray/construct.rb

@@ -3,10 +3,8 @@
 #  carray/constructor.rb
 #
 #  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
 #
 # ----------------------------------------------------------------------------
 
@@ -397,7 +395,7 @@ class CArray
     def eye (n, m = nil, k = 0)
       m ||= n
       mat = CArray.new(self::DataType || CA_FLOAT64, [n, m])
-      start = k > 0 ? k : m - k - 1
+      start = ( k == 0 ) ? k : ( k > 0 ? k : m - k - 1 )
       mat[[start..-1,m+1]] = 1
       mat
     end
@@ -432,7 +430,7 @@ class CArray
       end
       data_type = self::DataType
       data_type ||= guess_data_type_from_values(start, stop, step)
-      CArray.__new__(data_type, start..stop, step)
+      CArray.__new__(data_type, start..stop-step, step)
     end
   
     def full (shape, fill_value)
@@ -447,16 +445,40 @@ class CArray
 end
 
 class CArray
-  
-  def self.meshgrid (*args)
-    dim = args.map(&:size)
-    out = []
-    args.each_with_index do |arg, i|
-      newdim = dim.dup
-      newdim[i] = :%
-      out[i] = arg[*newdim].to_ca
+
+  def self.meshgrid (*axes, indexing: "xy", copy: true, sparse: false, &block)
+    case indexing 
+    when "xy"
+      ### no operation
+    when "ij"
+      axes = axes.map{|axis| axis.seq }
+    else
+      raise ArgumentError, %{indexing option should be one of "xy" and "ij"}
+    end
+    shape = axes.map(&:size).reverse
+    if sparse                           ### => CAUnboundRepeat
+      list = axes.map.with_index do |axis, k|
+        extended_shape = (shape.size-1).downto(0).map { |i| ( i == k ) ? nil : :* }
+        if copy
+          axis[*extended_shape].to_ca
+        else
+          axis[*extended_shape]
+        end
+      end
+    else                                ### => CARepeat
+      naxes = shape.size
+      list = axes.map.with_index do |axis, k|
+        extended_shape = shape.dup
+        extended_shape[naxes - k - 1] = :%
+        if copy
+          axis[*extended_shape].to_ca
+        else
+          axis[*extended_shape]
+        end
+      end
     end
-    return *out
+    return block.call(*list) if block
+    return list
   end
   
 end