carray 1.5.1 → 1.5.6

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
 #
 # ----------------------------------------------------------------------------
 
@@ -58,10 +56,23 @@ class CArray
   def span! (range)
     first = range.begin.to_r
     last  = range.end.to_r
-    if range.exclude_end?
-      seq!(first, (last-first)/elements)
+    if integer?
+      if range.exclude_end?
+        step = ((last-1)-first+1)/elements
+      else
+        step = (last-first+1)/elements
+      end      
     else
-      seq!(first, (last-first)/(elements-1))
+      if range.exclude_end?
+        step = (last-first)/elements
+      else
+        step = (last-first)/(elements-1)
+      end
+    end
+    if integer? && step.denominator != 1
+      self[] = (first + seq * step).floor
+    else
+      seq!(first, step)
     end
     return self
   end
@@ -384,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
@@ -397,7 +408,11 @@ class CArray
   
     def linspace (x1, x2, n = 100)
       data_type = self::DataType
-      data_type ||= guess_data_type_from_values(x1, x2)
+      unless data_type
+        guess = guess_data_type_from_values(x1, x2)
+        guess = CA_FLOAT64 if guess == CA_INT64
+        data_type = guess
+      end
       CArray.new(data_type, [n]).span(x1..x2)
     end
   
@@ -415,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)
@@ -430,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

data/lib/carray/info.rb

@@ -3,10 +3,8 @@
 #  carray/info.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/inspect.rb

@@ -3,10 +3,8 @@
 #  carray/inspect.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
 #
 # ----------------------------------------------------------------------------
 
@@ -159,7 +157,7 @@ class CArray::Inspector  # :nodoc:
       dim[level].times do |i|
         idx[level] = i
         v = @carray[*idx]
-        if v.undef?
+        if v == UNDEF
           io << '_'
         else
           io << formatter[v]
@@ -178,7 +176,7 @@ class CArray::Inspector  # :nodoc:
       if over
         idx[level] = dim[level] - 1
         v = @carray[*idx]
-        if v.undef?
+        if v == UNDEF
           io << ", _"
         else
           io << ", " + formatter[v]

data/lib/carray/io/imagemagick.rb

@@ -3,10 +3,8 @@
 #  carray/io/imagemagick.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/iterator.rb

@@ -3,10 +3,8 @@
 #  carray/iterator.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
 #
 # ----------------------------------------------------------------------------
 
@@ -280,6 +278,7 @@ class CAIterator
   end
 
   def sort_with (&block)
+    warn "CAIterator#sort_with will be obsolete"
     out = reference.template
     idx = CA.sort_addr(*yield(self))
     ca[idx].each_with_addr do |blk, i|
@@ -317,6 +316,7 @@ class CAClassIterator < CAIterator # :nodoc:
     @reference = reference
     @classifier = classifier || @reference.uniq.sort
     @null = CArray.new(@reference.data_type,[0])
+    @null.data_class = @reference.data_class if @reference.has_data_class?
     @table = {}
     @ndim = 1
     @dim  = [0]

data/lib/carray/mask.rb

@@ -3,21 +3,32 @@
 #  carray/mask.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
 #
 # ----------------------------------------------------------------------------
 
 class CArray
-  
-  # mask
-  
+
+  # Guard methods for handling variables that can be UNDEF values.
+  # Provide different processing depending on whether 
+  # the given value is UNDEF or not.
   #
-  # Returns the number of masked elements.
+  # @param value [Object] target object
+  # @param fill_value [Object] alternative value if the given value is UNDEF
+  # 
+  # @return fill_value if the given value is UNDEF, block return value if block
+  #         is given, or value itself
   #
+  def self.guard_undef (*values, fill_value: UNDEF, &block)
+    return fill_value if values.any?{|v| v == UNDEF }
+    return block.(*values)
+  end
 
+  # mask
+  # 
+  # Returns the number of masked elements.
+  # 
   def count_masked (*axis)
     if has_mask?  
       return mask.int64.accumulate(*axis)

data/lib/carray/math.rb

@@ -3,10 +3,8 @@
 #  carray/math.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
 #
 # ----------------------------------------------------------------------------
 
@@ -318,7 +316,7 @@ class CArray
       count = x.count_not_masked
       xm = x.mean(:min_count => min_count)
       ym = y.mean(:min_count => min_count)
-      if ( xm.undef? or ym.undef? )
+      if ( xm == UNDEF or ym == UNDEF )
         return fill_value || UNDEF
       else
         return (x-xm).wsum(y-ym)/count
@@ -337,7 +335,7 @@ class CArray
       count = x.count_not_masked
       xm = x.mean(:min_count=>min_count)
       ym = y.mean(:min_count=>min_count)
-      if ( xm.undef? or ym.undef? )
+      if ( xm == UNDEF or ym == UNDEF )
         return fill_value || UNDEF
       else
         return (x-xm).wsum(y-ym)/(count-1)
@@ -355,7 +353,7 @@ class CArray
       y.inherit_mask(x)
       xm = x.mean(:min_count=>min_count)
       ym = y.mean(:min_count=>min_count)
-      if ( xm.undef? or ym.undef? )
+      if ( xm == UNDEF or ym == UNDEF )
         return fill_value || UNDEF
       else
         xd, yd = x-xm, y-ym

data/lib/carray/math/histogram.rb

@@ -3,10 +3,8 @@
 #  carray/math/histogram.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/math/recurrence.rb

@@ -3,10 +3,8 @@
 #  carray/math/recurrence.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/mkmf.rb

@@ -3,10 +3,8 @@
 #  carray/mkmf.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/object/ca_obj_iterator.rb

@@ -3,10 +3,8 @@
 #  carray/object/ca_obj_iterator.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/object/ca_obj_link.rb

@@ -3,10 +3,8 @@
 #  carray/object/ca_obj_link.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/object/ca_obj_pack.rb

@@ -3,10 +3,8 @@
 #  carray/object/ca_obj_pack.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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/obsolete.rb

@@ -3,10 +3,8 @@
 #  carray/obsolete.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
 #
 # ----------------------------------------------------------------------------
 
@@ -25,20 +23,6 @@ class CArray
     self
   end
 
-  # pulled
-
-  def pulled (*args)
-    warn "CArray#pulled will be obsolete"
-    idx = args.map{|s| s.nil? ? :% : s}
-    return self[*idx]
-  end
-  
-  def pull (*args)
-    warn "CArray#pull will be obsolete"
-    idx = args.map{|s| s.nil? ? :% : s}
-    return self[*idx].to_ca
-  end
-
   # Returns the array eliminated all the duplicated elements.
   def duplicated_values
     warn "CArray#duplicated_values will be obsolete"

data/lib/carray/ordering.rb

@@ -3,17 +3,14 @@
 #  carray/ordering.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
 #
 # ----------------------------------------------------------------------------
 
 class CArray
   
   # reversed
-
   def reversed
     return self[*([-1..0]*ndim)]
   end
@@ -42,7 +39,6 @@ class CArray
   def roll (*argv)
     return self.rolled(*argv).to_ca
   end
-
     
   # Returns the reference which elements are sorted by the comparison method
   # given as block
@@ -61,6 +57,16 @@ class CArray
     cmpary = convert(type, :bytes=>bytes, &block)
     return self[cmpary.sort_addr].to_ca
   end
+  
+  def sorted_with (*others)
+    addr = sort_addr
+    ([self] + others).map { |x| x[addr] }
+  end
+
+  def sort_with (*others)
+    addr = sort_addr
+    ([self] + others).map { |x| x[addr].to_ca }
+  end
 
   def max_by (&block)
     if empty?
@@ -71,6 +77,15 @@ class CArray
     end
   end
 
+  def max_with (*others)
+    if empty?
+      return ([self] + others).map { |x| UNDEF }
+    else
+      addr = max_addr
+      return ([self] + others).map { |x| x[addr] }
+    end
+  end
+
   def min_by (&block)
     if empty?
       return UNDEF
@@ -80,6 +95,15 @@ class CArray
     end
   end
 
+  def min_with (*others)
+    if empty?
+      return ([self] + others).map { |x| UNDEF }
+    else
+      addr = min_addr
+      return ([self] + others).map { |x| x[addr] }
+    end
+  end
+
   def range 
     return (self.min)..(self.max)
   end