carray 1.5.2 → 1.5.3

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
 #
 # ----------------------------------------------------------------------------
 

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
 #
 # ----------------------------------------------------------------------------
 
@@ -318,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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/ordering.rb

@@ -3,10 +3,8 @@
 #  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
 #
 # ----------------------------------------------------------------------------
 

data/lib/carray/serialize.rb

@@ -3,10 +3,8 @@
 #  carray/serialize.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
 #
 # ----------------------------------------------------------------------------
 #
@@ -41,8 +39,10 @@
 #   has_attribute    : int32  
 #
 # offset 256 bytes
-#   data           : bytes*elements : value data
-#   mask           : int8*elements  : mask data if has_mask == 1
+#   data             : bytes*elements : value data
+#   mask             : int8*elements  : mask data if has_mask == 1
+#   attribute        : object marshal : attribute
+#   data_class_name  : string marshal : data_class_name
 
 require "stringio"
 
@@ -59,6 +59,7 @@ class CArray::Serializer   # :nodoc:
     int32     :has_mask
     array     :dim,            :type => CArray.int64(CA_RANK_MAX)
     int32     :has_attr
+    int32     :has_data_class
   }
 
   Header_Legacy = CA.struct(:pack=>1, :size=>256) {
@@ -95,15 +96,16 @@ class CArray::Serializer   # :nodoc:
     header[:ndim]           = ca.ndim
     header[:elements]       = ca.elements
     header[:has_mask]       = ca.has_mask? ? 1 : 0
+    header[:has_data_class] = ca.has_data_class? ? 1 : 0
     header[:dim][[0,ca.ndim]] = ca.dim
-    attr = nil
+    attributes = nil
     if ca.attribute
-      attr = ca.attribute.clone
+      attributes = ca.attribute.clone
     end
     if opt[:attribute]
-      (attr ||= {}).update(opt[:attribute])
+      (attributes ||= {}).update(opt[:attribute])
     end
-    header[:has_attr]       = attr.empty? ? 0 : 1
+    header[:has_attr]       = attributes.empty? ? 0 : 1
     unless CArray.endian == endian
       header.swap_bytes!
     end
@@ -121,8 +123,11 @@ class CArray::Serializer   # :nodoc:
     if ca.has_mask?
       ca.mask.dump_binary(@io)
     end
-    if attr
-      Marshal.dump(attr, @io)
+    if attributes
+      Marshal.dump(attributes, @io)
+    end
+    if ca.has_data_class?
+      Marshal.dump(ca.data_class.to_s, @io)
     end
     return ca
   end
@@ -151,7 +156,8 @@ class CArray::Serializer   # :nodoc:
     elements  = header[:elements]
     has_mask  = header[:has_mask] != 0 ? true : false
     dim       = header[:dim][[0, ndim]].to_a
-    has_attr  = header[:has_attr]
+    has_attr  = header[:has_attr] != 0 ? true : false
+    has_data_class = header[:has_data_class] != 0 ? true : false
     if data_type == 255
       data_type = header[:data_type_name].strip.to_sym
     end
@@ -172,9 +178,12 @@ class CArray::Serializer   # :nodoc:
       ca.mask = 0
       ca.mask.load_binary(@io)
     end
-    if has_attr == 1
+    if has_attr
       ca.attribute = Marshal.load(@io)
     end
+    if has_data_class 
+      ca.data_class = Kernel.const_get(Marshal.load(@io))
+    end
     return ca
   end
   

data/lib/carray/string.rb

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

@@ -3,19 +3,17 @@
 #  carray/struct.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
 #
 # ----------------------------------------------------------------------------
 #
 # The data class for fixed length carray are required to satisfy only
-# four conditions.
+# five conditions.
 #
 #   * constant data_class::DATA_SIZE    -> integer
-#   * constant data_class::MEMBERS      -> array of string
 #   * constant data_class::MEMBER_TABLE -> hash
+#   * constant data_class::MEMBERS      -> array (MEMBER_TABLE.keys as usual)
 #   * method   data_class.decode(data)  -> new data_class object
 #   * method   data_class#encode()      -> string 
 #

data/lib/carray/testing.rb

@@ -3,10 +3,8 @@
 #  carray/test.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
 #
 # ----------------------------------------------------------------------------
 
@@ -41,16 +39,13 @@ class CArray
   
   # Returns the array eliminated all the duplicated elements.
   def uniq
-    ary = to_a.uniq
+    ary = flatten.to_a.uniq
     if has_mask?
       ary.delete(UNDEF)
     end
-    if has_data_class?
-      return CArray.new(data_class, [ary.length]) { ary }
-    else
-      return CArray.new(data_type, [ary.length], :bytes=>bytes) { ary }
-    end
+    out = CArray.new(data_type, [ary.length], :bytes=>bytes) { ary }
+    out.data_class = data_class if has_data_class?
+    return out
   end
 
-
 end

data/lib/carray/time.rb

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