carray 1.5.2 → 1.5.7

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
 #
 # ----------------------------------------------------------------------------
 
@@ -96,5 +94,16 @@ class CArray
     return self[:%,1]
   end
 
+  # pulled
+
+  def pulled (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx]
+  end
   
+  def pull (*args)
+    idx = args.map{|s| s.nil? ? :% : s}
+    return self[*idx].to_ca
+  end
+
 end

data/misc/NOTE

@@ -1,42 +1,6 @@
 Note for developper
 ===================
 
-Make targets
-------------
-
-### create Makefile
-
-    ruby extconf.rb
-
-### build extensions
-
-    make all
-    
-### install via RubyGems
-
-    make build-gem
-    make install-gem
-    make uninstall-gem  ### for uninstall this version
-
-### install via extconf.rb
-
-    ruby extconf.rb
-    make all
-    make install
-
-### cleaning temporary files
-
-    make clean
-    make distclean
-
-### create gem package
-
-    make package        ### -> rake package
-    
-### run test
-
-    make test           ### -> rake test
-
 Utility scripts
 ---------------
 
@@ -53,8 +17,11 @@ Check Points for Debug
 
   * 'elements' should be checked with double float number
 
-  * ca_update_mask/ca_attach/ca_create_mask/ca_has_mask should be called 
-    before ca->mask refered
+  * One of the following methods should be called before ca->mask refered
+    + ca_attach
+    + ca_has_mask 
+    + ca_update_mask
+    + ca_create_mask
 
   * Avoid the exposition of raw VALUE data in object array
 
@@ -71,3 +38,14 @@ OpenMP
 ------
 
   * '--with-cc="gcc -fopenmp"' ... and so on.
+
+Range
+-----
+
+ int rb_arithmetic_sequence_extract(VALUE, VALUE *, VALUE *, VALUE *, int *);
+
+ /* range.c */
+ #define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
+ #define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
+ #define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2])
+ 

data/spec/Classes/CAUnboudRepeat_spec.rb

@@ -19,6 +19,20 @@ describe "CAUnboundRepeat" do
 
   end
   
+  example "ref" do 
+    a = CA_INT(0..2)[:*,nil]
+    is_asserted_by { a[0] == 0 }
+    is_asserted_by { a[1] == 1 }
+    is_asserted_by { a[2] == 2 }
+    is_asserted_by { a.bind(3,3) == CA_INT([[0,1,2],
+                                            [0,1,2],
+                                            [0,1,2]]) }
+    is_asserted_by { a[0,0] == 0 }
+    is_asserted_by { a[0,1] == 1 }
+    is_asserted_by { a[0,2] == 2 }
+    is_asserted_by { a.to_a == [[0,1,2]] }
+  end
+  
   example "bind" do 
   
     a = CA_INT([1,2,3])
@@ -75,4 +89,14 @@ describe "CAUnboundRepeat" do
     is_asserted_by { a[:*,nil][:*,nil,nil].shape == [1,1,3] }
   end
   
+  example "extra * in arithmetic operation" do
+    a = CA_INT(1..3)
+    b = CA_INT(1..3)
+    aa = a[:*,:*,nil]
+    bb = b[:*,nil,:*]
+    is_asserted_by { aa.bind_with(bb) == a[3,:%][:*,nil,nil] }
+    is_asserted_by { aa + bb == (a[3,:%]+b[:%,3])[:*,nil,nil] }
+  end
+  
+  
 end

data/spec/Features/feature_attributes_spec.rb

@@ -255,19 +255,19 @@ describe "TestCArrayAttribute " do
     a = CArray.int32(3,3)
     is_asserted_by {  true == a.valid_index?(2, 2) }
     is_asserted_by {  true == a.valid_index?(1, 1) }
-    is_asserted_by {  true == a.valid_index?((-1), (-1)) }
-    is_asserted_by {  true == a.valid_index?((-3), (-3)) }
+#    is_asserted_by {  true == a.valid_index?((-1), (-1)) }
+#    is_asserted_by {  true == a.valid_index?((-3), (-3)) }
 
     is_asserted_by {  true == a.valid_addr?(8) }
     is_asserted_by {  true == a.valid_addr?(4) }
-    is_asserted_by {  true == a.valid_addr?((-4)) }
-    is_asserted_by {  true == a.valid_addr?((-8)) }
+#    is_asserted_by {  true == a.valid_addr?((-4)) }
+#    is_asserted_by {  true == a.valid_addr?((-8)) }
       
     is_asserted_by {  false == a.valid_index?(1, 3) }
-    is_asserted_by {  false == a.valid_index?((-4), 1) }
+#    is_asserted_by {  false == a.valid_index?((-4), 1) }
 
     is_asserted_by {  false == a.valid_addr?(9) }
-    is_asserted_by {  false == a.valid_addr?((-10)) }
+#    is_asserted_by {  false == a.valid_addr?((-10)) }
   end
 
   example "same_shape?" do

data/spec/Features/feature_boolean_spec.rb

@@ -75,23 +75,24 @@ describe "TestBooleanType " do
 
   end
 
-  example "boolean_bit_operation_with_non_boolean_type" do
+  example "boolean_bit_operation_with_non_boolean_integer_type" do
 
-    a = CArray.int(3,3).seq!
-    b = CArray.int(3,3).seq! + 1
-    e0 = a < 4
-    e1 = a >= 4
-
-    # ---
-    expect { e0 & b }.not_to raise_error
-    expect { e0 | b }.not_to raise_error
-    expect { e0 ^ b }.not_to raise_error
-    # ---             
-    expect { b & e0 }.not_to raise_error
-    expect { b | e0 }.not_to raise_error
-    expect { b ^ e0 }.not_to raise_error
+    a = CA_BOOLEAN([1,1,1,1])
+    b = CA_INT([0,1,2,3])
+    
+    is_asserted_by { a & b == CA_INT([0, 1, 0, 1]) }
+    is_asserted_by { a | b == CA_INT([1, 1, 3, 3]) }
+    is_asserted_by { a ^ b == CA_INT([1, 0, 3, 2]) }
 
   end
 
+  example "boolean_arithmetic_operation" do
+    a = CA_BOOLEAN([1,1,0,0])
+    b = CA_INT(    [0,1,1,0])
+
+    expect { a + a }.to raise_error(CArray::DataTypeError)
+
+    is_asserted_by { a + b == CA_INT([1, 2, 1, 0]) }
+  end
 
 end

data/spec/Features/feature_broadcast.rb

@@ -97,4 +97,20 @@ describe "CArray.broadcast" do
     is_asserted_by { cc == c }
   end
   
+  example "extension of dimension" do
+    a = CA_INT([[1,2,3],[4,5,6]])
+    
+    is_asserted_by { a.broadcast_to(1,2,1,3) == CA_INT([[[[ 1, 2, 3 ]],
+                                                         [[ 4, 5, 6 ]]]]) }
+
+    is_asserted_by { a.reshape(2,1,3).broadcast_to(1,2,1,3) == CA_INT([[[[ 1, 2, 3 ]],
+                                                                        [[ 4, 5, 6 ]]]]) }
+      
+    is_asserted_by { a.reshape(1,2,3).broadcast_to(1,2,1,3) == CA_INT([[[[ 1, 2, 3 ]],
+                                                                        [[ 4, 5, 6 ]]]]) }
+      
+      
+  end
+  
+  
 end

data/spec/Features/feature_cast_spec.rb

@@ -26,7 +26,7 @@ describe "TestCast " do
     # ---
     a = CA_OBJECT(["a", "b", "c"])
     expect { a.int32 }.to raise_error(ArgumentError)
-    expect { a.float32 }.to raise_error(ArgumentError)
+#    expect { a.float32 }.to raise_error(ArgumentError)
   end
 
 

data/spec/Features/feature_mask_spec.rb

@@ -199,6 +199,12 @@ describe "Feature: Masking" do
   example "count_not_masked" do
     # test_basic_featrues
   end
+  
+  example "compare with UNDEF" do
+    a = CA_INT([1,UNDEF,2])
+    is_asserted_by { a.eq(UNDEF) == a.is_masked }
+    is_asserted_by { a.ne(UNDEF) == a.is_not_masked }
+  end
 
   example "unmask" do
     # ---

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.7
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies: []
-description: "    Ruby/CArray is an extension library for the multi-dimensional array
-  class.\n    CArray can store integers and floating point numbers to perform calculations\n
-  \   efficiently. Therefore, Ruby/CArray is suitable for numerical computation and
-  data\n    analysis. Ruby/CArray has different features from other multidimensional
-  array\n    libraries (narray, numo-narray, nmatrix), such as element-specific masks,
-  \n    creation of reference arrays that can reflect changes to the referent, \n
-  \   the ability to access memory pointers of other objects, user-defined arrays,\n
-  \   and so on.\n"
+description: |2
+      Ruby/CArray is an extension library for the multi-dimensional numerical array
+      class. The name "CArray" comes from the meaning of a wrapper to a numerical array
+      handled by the C language. CArray stores integers or floating-point numbers in
+      memory block and treats them collectively to ensure efficient performance.
+      Therefore, Ruby/CArray is suitable for numerical computation and data analysis.
 email: ''
 executables: []
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE
 - NEWS.md
 - README.md
@@ -222,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Multi-dimesional array class for Ruby