carray 1.4.0 → 1.5.1

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/{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.4.0"
-#define CA_VERSION_CODE 140
+#define CA_VERSION "1.5.1"
+#define CA_VERSION_CODE 151
 #define CA_VERSION_MAJOR 1
-#define CA_VERSION_MINOR 4
-#define CA_VERSION_TEENY 0
-#define CA_VERSION_DATE "2020/06/15"
+#define CA_VERSION_MINOR 5
+#define CA_VERSION_TEENY 1
+#define CA_VERSION_DATE "2020/07/01"

data/lib/carray.rb

@@ -14,46 +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/obsolete'
-require 'carray/base/string'
-
-require "carray/carray_mathfunc"
-require "carray/carray_calculus"
-require "carray/math/calculus"
-
-require 'carray/base/autoload'
-require 'carray/autoload/autoload_base'
-require 'carray/autoload/autoload_io_imagemagick'
-require 'carray/autoload/autoload_io_table'
-require 'carray/autoload/autoload_math_histogram'
-require 'carray/autoload/autoload_math_interp'
-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_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_pg'
-#require 'carray/autoload/autoload_gem_zimg'
-
-undef autoload_method
 
+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

data/lib/carray/{base/autoload.rb → autoload.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/autoload.rb
+#  carray/autoload.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of

data/lib/carray/autoload/autoload_base.rb

@@ -1,5 +1,5 @@
 class CArray
-  serialize_rb = "carray/base/serialize"
+  serialize_rb = "carray/serialize"
   autoload :Serializer, serialize_rb
   autoload_method "self.save", serialize_rb
   autoload_method "self.load", serialize_rb

data/lib/carray/autoload/autoload_gem_numo_narray.rb

@@ -1,8 +1,10 @@
-#autoload :Numo, "carray-numo-narray"
-
 class CArray
   autoload_method :to_numo, "carray-numo-narray"
   autoload_method :numo, "carray-numo-narray"
+  autoload_method "self.as_numo", "carray-numo-narray"
+  autoload_method "self.as_numo!", "carray-numo-narray"
+  autoload_method :as_numo, "carray-numo-narray"
+  autoload_method :as_numo!, "carray-numo-narray"
 end
 
 module Numo
@@ -11,4 +13,3 @@ module Numo
     autoload_method :ca, "carray-numo-narray"
   end
 end
-

data/lib/carray/autoload/autoload_gem_random.rb

@@ -0,0 +1,8 @@
+class CArray
+  class << self
+    autoload_method :srand, "carray-random"
+  end
+  autoload_method :random!, "carray-random"
+  autoload_method :shuffle, "carray-random"
+  autoload_method :shuffle!, "carray-random"
+end

data/lib/carray/basic.rb

@@ -0,0 +1,193 @@
+# ----------------------------------------------------------------------------
+#
+#  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
+#
+# ----------------------------------------------------------------------------
+
+module CAMath
+  include Math
+end
+
+#
+# monkey patch
+#
+
+def nan
+  0.0/0.0
+end
+
+class Array                          # :nodoc:
+  def +@
+    return CA_SIZE(self)
+  end
+  def to_ca
+    return CA_OBJECT(self)
+  end
+end
+
+class Range                          # :nodoc: 
+  def +@
+    return CA_SIZE(self)    
+  end
+  def to_ca
+    return CA_OBJECT(self)
+  end
+end
+
+class Numeric
+  
+  def eq (other)
+    case other
+    when CArray
+      return other.eq(self)
+    else
+      return send(:eq, *other.coerce(self))
+    end
+  end
+
+  def ne (other)
+    case other
+    when CArray
+      return other.ne(self)
+    else
+      return send(:ne, *other.coerce(self))
+    end
+  end
+  
+end
+
+class CArray
+
+  def has_attribute?
+    if ( not @attribute ) or @attribute.empty?
+      return false
+    else
+      return true
+    end
+  end
+
+  def attribute= (obj)
+    unless obj.is_a?(Hash)
+      raise "attribute should be a hash object"
+    end
+    @attribute = obj
+  end
+
+  def attribute
+    @attribute ||= {}
+    return @attribute
+  end
+  
+  def first
+    self[0]
+  end
+  
+  def last
+    self[-1]
+  end
+
+  # matchup
+
+  def matchup (ref)
+    ri = ref.sort_addr
+    rs = ref[ri].to_ca
+    si = rs.bsearch(self)
+    return ri.project(si)
+  end
+
+  def matchup_nearest (ref, direction: "round")
+    ri = ref.sort_addr
+    rs = ref[ri].to_ca
+    si = rs.section(self).send(direction.intern).int64
+    si.trim!(0,si.size)
+    return ri[si].to_ca
+  end
+
+
+  # index / indices / axes
+
+  def address ()
+    return CArray.int32(*dim).seq!
+  end
+
+  def index (n = 0)
+    unless n.is_a?(Integer)
+      raise ArgumentError, "argument should be an integer"
+    end
+    if n.between?(0, ndim-1)
+      return CArray.int32(dim[n]).seq!
+    else
+      raise ArgumentError,
+            "invalid dimension specifier #{n} (0..#{self.ndim-1})"
+    end
+  end
+
+  #
+  #
+  #
+
+  def indices
+    list = Array.new(ndim) {|i|
+      rpt = self.dim
+      rpt[i] = :%
+      index(i)[*rpt]
+    }
+    if block_given?
+      return yield(*list)
+    else
+      return list
+    end
+  end
+
+    
+
+end
+
+class CArray
+
+  # Returns object carray has elements of splitted carray at dimensions 
+  #      which is given by arguments
+  #
+  #    a = CA_INT([[1,2,3], [4,5,6], [7,8,9]])
+  #
+  #    a.split(0) 
+  #      [1,2,3], [4,5,6], [7,8,9]
+  #
+  #    a.split(1)
+  #      [1,4,7], [2,5,8], [3,6,9]
+  #
+
+  def split (*argv)
+    odim = dim.values_at(*argv)
+    out  = CArray.object(*odim)
+    idx  = [nil] * ndim
+    attach {
+      out.map_with_index! do |o, v|
+        argv.each_with_index do |r, i|
+          idx[r] = v[i]
+        end
+        self[*idx].to_ca
+      end
+    }
+    return out
+  end
+
+end
+
+class CAUnboundRepeat
+
+  def template (*argv, &block)
+    return parent.template(*argv,&block)[*spec.map{|x| x != :* ? nil : x}]
+  end
+
+end
+
+
+
+

data/lib/carray/compose.rb

@@ -0,0 +1,291 @@
+# ----------------------------------------------------------------------------
+#
+#  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
+#
+# ----------------------------------------------------------------------------
+
+class CArray
+  
+  # Returns the array resized to the dimension given as `newdim`.
+  # The new area is filled by the value returned by the block.
+  def resize (*newdim, &block)
+    if newdim.size != ndim
+      raise "ndim mismatch"
+    end
+    offset = Array.new(ndim){0}
+    ndim.times do |i|
+      d = newdim[i]
+      case d
+      when nil
+        newdim[i] = dim[i]
+      when Integer
+        if d < 0
+          newdim[i] *= -1
+          offset[i] = newdim[i] - dim[i]
+        end
+      else
+        raise "invalid dimension size"
+      end
+    end
+    out = CArray.new(data_type, newdim, &block)
+    if out.has_mask?
+      out.mask.paste(offset, self.false)
+    end
+    out.paste(offset, self)
+    return out
+  end
+
+  # insert
+  def insert_block (offset, bsize, &block)
+    if offset.size != ndim or
+        bsize.size != ndim
+      raise "ndim mismatch"
+    end
+    newdim = dim
+    grids = dim.map{|d| CArray.int32(d) }
+    ndim.times do |i|
+      if offset[i] < 0
+        offset[i] += dim[i]
+      end
+      if offset[i] < 0 or offset[i] >= dim[i] or bsize[i] < 0
+        raise "invalid offset or size"
+      end
+      if bsize[i] > 0
+        newdim[i] += bsize[i]
+      end
+      grids[i][0...offset[i]].seq!
+      grids[i][offset[i]..-1].seq!(offset[i]+bsize[i])
+    end
+    out = CArray.new(data_type, newdim)
+    if block_given?
+      sel = out.true
+      sel[*grids] = 0
+      out[sel] = block.call
+    end
+    out[*grids] = self
+    return out
+  end
+
+  def delete_block (offset, bsize)
+    if offset.size != ndim or
+      bsize.size != ndim
+      raise "ndim mismatch"
+    end
+    newdim = dim
+    grids  = []
+    ndim.times do |i|
+      if offset[i] < 0
+        offset[i] += dim[i]
+      end
+      if bsize[i] >= 0
+        if offset[i] < 0 or offset[i] >= dim[i]
+          raise "invalid offset or size"
+        end
+        newdim[i] -= bsize[i]
+      else
+        if offset[i] + bsize[i] + 1 < 0 or offset[i] + bsize[i] > dim[i]
+          raise "invalid offset or size"
+        end
+        newdim[i] += bsize[i]
+      end
+      grids[i] = CArray.int32(newdim[i])
+      if bsize[i] >= 0
+        if offset[i] > 0
+          grids[i][0...offset[i]].seq!
+        end
+        if offset[i] + bsize[i] < dim[i]
+          grids[i][offset[i]..-1].seq!(offset[i]+bsize[i])
+        end
+      else
+        if offset[i]+bsize[i] > 0
+          grids[i][0..offset[i]+bsize[i]].seq!
+        end
+        if offset[i]+bsize[i]+1 < dim[i]-1
+          grids[i][offset[i]+bsize[i]+1..-1].seq!(offset[i]+1)
+        end
+      end
+    end
+    return self[*grids].to_ca
+  end
+  
+  def self.combine (data_type, tdim, list, at = 0)
+    has_fill_value = false
+    if block_given?
+      fill_value = yield
+      has_fill_value = true
+    end
+    if not tdim.is_a?(Array) or tdim.size == 0
+      raise "invalid binding dimension"
+    end
+    if not list.is_a?(Array) or list.size == 0
+      raise "invalid list"
+    end
+    list = list.map{|x| CArray.wrap_readonly(x, data_type) }
+    ref  = list.detect{|x| x.is_a?(CArray) or not x.scalar? }
+    unless ref
+      raise "at least one element in list should be a carray"
+    end
+    dim   = ref.dim
+    ndim  = ref.ndim
+    tndim = tdim.size
+    if at < 0
+      at += ndim - tndim + 1
+    end
+    unless at.between?(0, ndim - tndim)
+      raise "concatnating position out of range"
+    end
+    list.map! do |x|
+      if x.scalar?
+        rdim = dim.clone
+        rdim[at] = :%
+        x = x[*rdim]        # convert CScalar to CARepeat
+      end
+      x
+    end
+    block = CArray.object(*tdim){ list }
+    edim = tdim.clone
+    idx = Array.new(tdim)
+    offset = Array.new(tdim.size) { [] }
+    tdim.each_with_index do |td, i|
+      edim[i] = 0
+      idx.map!{0}
+      idx[i] = nil
+      block[*idx].each do |e|
+        offset[i] << edim[i]
+        edim[i] += e.dim[at+i]  # extended dimension size
+      end
+    end
+    newdim = dim.clone
+    newdim[at,tndim] = edim     # extended dimension size
+    if has_fill_value
+      obj = CArray.new(data_type, newdim) { fill_value }
+    else      
+      obj = CArray.new(data_type, newdim)
+    end
+    idx = newdim.map{0}
+    block.each_with_index do |item, tidx|
+      (at...at+tndim).each_with_index do |d,i|
+        idx[d] = offset[i][tidx[i]]
+      end
+      obj.paste(idx, item)
+    end
+    obj
+  end
+
+  def self.bind (data_type, list, at = 0)
+    return CArray.combine(data_type, [list.size], list, at)
+  end
+
+  def self.composite (data_type, tdim, list, at = 0)
+    if not tdim.is_a?(Array) or tdim.size == 0
+      raise "invalid tiling dimension"
+    end
+    if not list.is_a?(Array) or list.size == 0
+      raise "invalid carray list"
+    end
+    list = list.map{|x| CArray.wrap_readonly(x, data_type) }
+    ref  = list.detect{|x| x.is_a?(CArray) or not x.scalar? }
+    unless ref
+      raise "at least one element in list should be a carray"
+    end
+    dim   = ref.dim
+    ndim  = ref.ndim
+    if at < 0
+      at += ndim + 1 #  "+ 1" is needed here
+    end
+    unless at.between?(0,ndim)
+      raise "tiling position is out of range"
+    end
+    tndim = tdim.size
+    list.map! do |x|
+      if x.scalar?
+        rdim = dim.clone
+        rdim[at] = :%
+        x = x[*rdim]     # convert CScalar to CARepeat
+      end
+      x
+    end
+    newdim = dim.clone
+    newdim[at,0] = tdim
+    obj = CArray.new(data_type, newdim)
+    idx = Array.new(ndim+tndim) { nil }
+    CArray.each_index(*tdim) do |*tidx|
+      idx[at,tndim] = tidx
+      obj[*idx] = list.shift
+    end
+    obj
+  end
+
+  def self.merge (data_type, list, at = -1)
+    return CArray.composite(data_type, [list.size], list, at)
+  end
+  
+  def self.join (*argv)
+    # get options
+    case argv.first
+    when Integer, Symbol, String
+      type, = *CArray.guess_type_and_bytes(argv.shift, 0)
+    else
+      type = argv.flatten.first.data_type
+    end
+    # process
+    conc = argv.map do |list|
+      case list
+      when CArray
+        if list.ndim == 1
+          list[:%,1]
+        else
+          list
+        end
+      when Array
+        x0 = list.first
+        if list.size == 1 and
+            x0.is_a?(CArray) and
+            x0.ndim == 1
+          list = [x0[:%,1]]
+        else
+        list = list.map { |x|
+          case x
+          when CArray
+            if x.ndim == 1
+              x[:%,1]
+            else
+              x
+            end
+          when Array
+            y = x.first
+            if x.size == 1 and
+                y.is_a?(CArray) and
+                y.ndim == 1
+              y[1,:%]
+            else
+              CArray.join(*x)
+            end
+          else
+            x
+          end
+        }
+        end
+        if block_given?
+          CArray.bind(type, list, 1, &block)
+        else
+          CArray.bind(type, list, 1)
+        end 
+      else
+        list
+      end
+    end
+    if conc.size > 1
+      return CArray.bind(type, conc)
+    else
+      return conc.first
+    end
+  end
+  
+end