carray 1.5.1 → 1.5.2

data/spec/Features/method_ref_spec.rb

@@ -0,0 +1,27 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#[]" do
+
+  example "should return one element array with [nil,-1]" do
+    ca = CArray.int(4,4).seq!
+    is_asserted_by { ca[[nil,-1]].elements == 1 }
+    is_asserted_by { ca[[nil,-1]] == ca[[0]] }
+  end
+
+  example "should return self[[0],nil] with [nil,-1], nil" do
+    ca = CArray.int(4,4).seq!
+    is_asserted_by { ca[[nil,-1],nil] == ca[[0],nil] }
+  end
+
+  example "should return self[[0],nil] with nil, [nil,-1]" do
+    ca = CArray.int(4,4).seq!
+    is_asserted_by { ca[nil,[nil,-1]] == ca[nil,[0]] }
+  end
+
+  example "should return self[[0],nil] with [nil,-1], [nil,-1]" do
+    ca = CArray.int(4,4).seq!
+    is_asserted_by { ca[[nil,-1],[nil,-1]] == ca[[0],[0]] }
+  end
+
+end

data/spec/Features/method_round_spec.rb

@@ -0,0 +1,11 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#round" do
+  example "returns the nearest Integer" do
+    is_asserted_by { CA_DOUBLE(5.5).round[0] == 6 }
+    is_asserted_by { CA_DOUBLE(0.4).round[0] == 0 }
+    is_asserted_by { CA_DOUBLE(-2.8).round[0] == -3 }
+    is_asserted_by { CA_DOUBLE(0.0).round[0] == 0 }
+  end
+end

data/spec/Features/method_s_linspace_spec.rb

@@ -0,0 +1,48 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray.linspace" do
+
+  # 2020-07-10
+  example "float range" do
+
+    a = CArray.linspace(0.0,1.0)
+    b = CArray.double(100).span(0.0..1.0)
+    
+    is_asserted_by { a == b }
+
+  end
+
+  # 2020-07-10
+  example "integer range -> float array" do
+
+    a = CArray.linspace(0,1)
+    b = CArray.double(100).span(0.0..1.0)
+    
+    is_asserted_by { a == b }
+
+  end
+
+  # 2020-07-10
+  example "specify number" do
+
+    a = CArray.linspace(0.0,1.0,5)
+    b = CArray.double(5).span(0.0..1.0)
+    
+    is_asserted_by { a == b }
+
+  end
+
+  # 2020-07-10
+  example "integer array" do
+
+    a = CArray::Int32.linspace(0.0,1.0)
+    b = CArray.int32(100).span(0.0..1.0)
+    
+    is_asserted_by { a == b }
+
+  end
+
+  
+end
+  

data/spec/Features/method_s_span_spec.rb

@@ -0,0 +1,14 @@
+require 'carray'
+require "rspec-power_assert"
+
+describe "CArray.span" do
+
+  # 2020-07-22
+  example "s_span" do
+    a = CArray.span(CA_FLOAT32, 0..2, 0.5)
+    is_asserted_by { a == CA_FLOAT32([0, 0.5, 1, 1.5, 2]) }
+    a = CArray.span(CA_FLOAT32, 0...2, 0.5)
+    is_asserted_by { a == CA_FLOAT32([0, 0.5, 1, 1.5]) }
+  end
+
+end

data/spec/Features/method_seq_spec.rb

@@ -0,0 +1,47 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#seq" do
+  
+  example "basic" do
+    res = CA_INT32([[0, 1, 2],
+                    [3, 4, 5],
+                    [6, 7, 8]])
+    a = CArray.int32(3, 3)
+    is_asserted_by { a.seq(0,1) == res }
+    is_asserted_by { a.seq(0) == res }
+    is_asserted_by { a.seq() == res }
+  end
+
+  example "offset" do
+    res = CA_INT32([[3, 4, 5],
+                    [6, 7, 8],
+                    [9, 10, 11]])
+    a = CArray.int32(3, 3)
+    is_asserted_by { a.seq(3,1) == res }
+    is_asserted_by { a.seq(3) == res }
+  end
+
+  example "step" do
+    res = CA_INT32([[0, 3, 6],
+                    [9, 12, 15],
+                    [18, 21, 24]])
+    a = CArray.int32(3, 3)
+    is_asserted_by { a.seq(0,3) == res }
+  end
+
+  example "fractional step for integer" do
+    res = CA_INT32([0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5])
+    a = CArray.int32(11)
+    is_asserted_by { a.seq(0,0.5) == res }
+
+    res = CA_INT32([0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2])
+    a = CArray.int32(11)
+    is_asserted_by { a.seq(0,0.2) == res }
+
+    res = CA_INT32([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1])
+    a = CArray.int32(11)
+    is_asserted_by { a.seq(0,0.1) == res }
+  end
+
+end

data/spec/Features/method_sort_with.rb

@@ -0,0 +1,43 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#sort_with" do
+
+  # 2020-07-09
+  example "basic" do
+   
+    a1 = CA_INT([3,2,4,1])
+    b1 = CA_INT([13,12,14,11])
+    c1 = CA_INT([23,22,24,21])
+    
+    a2,b2,c2 = a1.sort_with(b1,c1)
+    
+    is_asserted_by { a2 == CA_INT([1,2,3,4]) }
+    is_asserted_by { b2 == CA_INT([11,12,13,14]) }
+    is_asserted_by { c2 == CA_INT([21,22,23,24]) }
+
+    a2[0] = -999    
+    b2[0] = -999    
+    c2[0] = -999    
+    is_asserted_by { a1[3] != -999 }
+    is_asserted_by { b1[3] != -999 }
+    is_asserted_by { c1[3] != -999 }
+    
+  end
+
+  example "technique: reverse sort" do
+   
+    a1 = CA_INT([3,2,4,1])
+    b1 = CA_INT([13,12,14,11])
+    c1 = CA_INT([23,22,24,21])
+    
+    _,a2,b2,c2 = (-a1).sort_with(a1,b1,c1)
+    
+    is_asserted_by { a2 == CA_INT([1,2,3,4]).reverse }
+    is_asserted_by { b2 == CA_INT([11,12,13,14]).reverse }
+    is_asserted_by { c2 == CA_INT([21,22,23,24]).reverse }
+
+  end
+  
+end
+

data/spec/Features/method_sorted_with.rb

@@ -0,0 +1,29 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#sorted_with" do
+
+  # 2020-07-09
+  example "basic" do
+   
+    a1 = CA_INT([3,2,4,1])
+    b1 = CA_INT([13,12,14,11])
+    c1 = CA_INT([23,22,24,21])
+    
+    a2,b2,c2 = a1.sorted_with(b1,c1)
+    
+    is_asserted_by { a2 == CA_INT([1,2,3,4]) }
+    is_asserted_by { b2 == CA_INT([11,12,13,14]) }
+    is_asserted_by { c2 == CA_INT([21,22,23,24]) }
+    
+    a2[0] = -999    
+    b2[0] = -999    
+    c2[0] = -999    
+    is_asserted_by { a1[3] == -999 }
+    is_asserted_by { b1[3] == -999 }
+    is_asserted_by { c1[3] == -999 }
+    
+  end
+  
+end
+

data/spec/Features/method_span_spec.rb

@@ -0,0 +1,42 @@
+require "carray"
+require 'rspec-power_assert'
+
+describe "CArray#span" do
+
+  # 2020-07-10
+  example "integer range (integer steps)" do
+
+    a = CArray.int(10).span(1..10)
+    
+    is_asserted_by { a == CA_INT([1,2,3,4,5,6,7,8,9,10]) }
+
+    b = CArray.int(10).span(1...11)
+    
+    is_asserted_by { b == CA_INT([1,2,3,4,5,6,7,8,9,10]) }
+
+  end
+
+  # 2020-07-10
+  example "integer range (fraction steps)" do
+
+    a = CArray.int(10).span(1..5)
+    
+    is_asserted_by { a == CA_INT([1,1,2,2,3,3,4,4,5,5]) }
+
+    b = CArray.int(10).span(1...6)
+    
+    is_asserted_by { b == CA_INT([1,1,2,2,3,3,4,4,5,5]) }
+
+  end
+
+  # 2020-07-10
+  example "float range" do
+
+    a = CArray.double(11).span(0..5)
+    
+    is_asserted_by { a == CA_DOUBLE([0.0,0.5,1.0,1.5,2.0,2.5,3.0,3.5,4.0,4.5,5.0]) }
+
+  end
+  
+end
+  

data/spec/Features/method_wrap_readonly_spec.rb

@@ -0,0 +1,43 @@
+require 'carray'
+require "rspec-power_assert"
+
+describe "CArray#wrap_readonly" do
+
+  # 2020-07-22
+  example "array" do
+    ary = [[1,2,3], 
+           [4,5,6],
+           [7,8,9]]
+    a = CArray.wrap_readonly(ary, CA_INT32)
+    is_asserted_by { a.class == CAFake }
+    is_asserted_by { a.entity? == false }
+    is_asserted_by { a.data_type == CA_INT32 }
+    is_asserted_by { a.shape == [3,3] }
+    is_asserted_by { a == CA_INT32(ary) }
+  end
+
+  # 2020-07-22
+  example "string" do
+    a = CA_UINT8([0,1,2,3,4,5,6,7])
+    b = CArray.wrap_readonly(a.to_s, CA_UINT8)
+    is_asserted_by { b == a }
+
+    c = CArray.wrap_readonly(a.to_s, CA_OBJECT)
+    is_asserted_by { c == CA_OBJECT(a.to_s) }
+  end
+
+  # 2020-07-22
+  example "nil" do
+    a = CA_INT(0)
+    b = CArray.wrap_readonly(nil, CA_INT)
+    is_asserted_by { b == a }
+  end
+
+  # 2020-07-22
+  example "object" do
+    a = CA_FLOAT64(1.5)
+    b = CArray.wrap_readonly(1.5, CA_FLOAT64)
+    is_asserted_by { b == a }
+  end
+
+end

data/spec/spec_all.rb

@@ -1,7 +1,6 @@
 dirname = File.dirname(__FILE__)
 $:.unshift(File.join(dirname, "..", "lib"))
 
-
 require "carray"
   
 Dir.chdir(File.dirname(__FILE__)) {

data/utils/convert_test.rb

@@ -0,0 +1,73 @@
+require 'parser/current'
+require 'unparser'
+
+module YourHelper
+  def s(type, *children)
+    Parser::AST::Node.new(type, children)
+  end
+end
+
+include YourHelper
+
+while line = gets
+  if line =~ /require .test\/unit./ or line =~ /\$\:\.unshift/
+    next
+  end
+  line.gsub!(/(require .carray.\s*$)/, %{\\1require "rspec-power_assert"})
+  line.gsub!(/class (Test.*)\s*<\s*Test::Unit::TestCase/, 'describe "\1" do')
+  line.gsub!(/def test_(.*)/, 'example "\1" do')
+  line.gsub!(/\A(\s*)(assert_raise\((.*)\))\s*{(.*)}/, "\\1expect {\\4}.to raise_error(\\3)")
+  line.gsub!(/\A(\s*)assert_nothing_raised\s*{(.*)}/, "\\1expect {\\2}.not_to raise_error()")
+
+  if line =~ /\A(\s*)(assert_equal\(.*\))\s*\z/
+    prespc = $1
+    body   = $2
+    ast = Unparser.parse(body)
+    newast = s(:block,
+                s(:send, nil, :is_asserted_by),
+                s(:args),
+                s(:send,
+                  ast.children[2], :==,
+                  ast.children[3]))
+    conv = Unparser.unparse(newast).dup # => 'your(ruby(code))'
+    conv.gsub!(/do\n\s*/, "{ ")
+    conv.gsub!(/\n\s*end/, " }")
+    line = prespc + conv
+  end
+  line.gsub!(/assert_equal\(/, 'is_asserted_by { ')
+
+  if line =~ /\A(\s*)(assert_not_equal\(.*\))/
+    prespc = $1
+    body   = $2
+    ast = Unparser.parse(body)
+    newast = s(:block,
+                s(:send, nil, :is_asserted_by),
+                s(:args),
+                s(:send,
+                  ast.children[2], :!=,
+                  ast.children[3]))
+    conv = Unparser.unparse(newast).dup # => 'your(ruby(code))'
+    conv.gsub!(/do\n\s*/, "{ ")
+    conv.gsub!(/\n\s*end/, " }")
+    line = prespc + conv
+  end
+
+  if line =~ /\A(\s*)(assert_instance_of\(.*\))/
+    prespc = $1
+    body   = $2
+    ast = Unparser.parse(body)
+    newast = s(:block,
+                s(:send, nil, :is_asserted_by),
+                s(:args),
+                s(:send,
+                  s(:send,
+                    ast.children[3], :class), :==,
+                      ast.children[2]))
+    conv = Unparser.unparse(newast).dup # => 'your(ruby(code))'
+    conv.gsub!(/do\n\s*/, "{ ")
+    conv.gsub!(/\n\s*end/, " }")
+    line = prespc + conv
+  end
+
+  puts line
+end

data/utils/{extract_rdoc.rb → extract_yard.rb}

@@ -1,27 +1,22 @@
 
-puts %{
-class CArray
-end
-class CScalar
-end
-module CA
-end
-}
-
 Dir["*.c"].each do |file|
   open(file) { |io|
     while line = io.gets
-      if line =~ /\A\s*\/\*\s*rdoc:/
+      if line =~ /\A\s*\/\*\s*(@overload\s+(.*))$/
+        method_spec = $2
+        #        puts "  # " + line
         while line = io.gets
           case line
           when /\A\s*\*\//
+            puts "  def " + method_spec
+            puts "  end"
             break
           else
-            print line
+            print "  # " + line
           end
         end
         puts
       end
     end
-}
+  }
 end

metadata

@@ -1,29 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: carray
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies: []
-description: |2
-      CArray is a uniform multi-dimensional rectangular array class.
-      It provides the various types of sub-arrays and references
-      pointing the data elements of original array (slice, grid, selection ...).
-      Element-wise masking and mathematical operations are natively supported.
+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"
 email: ''
 executables: []
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- LICENSES
+- LICENSE
+- NEWS.md
 - README.md
 - Rakefile
+- TODO.md
 - carray.gemspec
 - ext/ca_iter_block.c
 - ext/ca_iter_dimension.c
@@ -102,6 +107,7 @@ files:
 - lib/carray/autoload/autoload_object_link.rb
 - lib/carray/autoload/autoload_object_pack.rb
 - lib/carray/basic.rb
+- lib/carray/broadcast.rb
 - lib/carray/compose.rb
 - lib/carray/construct.rb
 - lib/carray/convert.rb
@@ -128,61 +134,72 @@ files:
 - lib/carray/transform.rb
 - misc/Methods.ja.md
 - misc/NOTE
-- spec/CABlockIterator/CABlockIterator_spec.rb
-- spec/CArray/bug/store_spec.rb
-- spec/CArray/index/repeat_spec.rb
-- spec/CArray/method/eq_spec.rb
-- spec/CArray/method/is_nan_spec.rb
-- spec/CArray/method/ne_spec.rb
-- spec/CArray/method/round_spec.rb
-- spec/CArray/object/_attribute_spec.rb
-- spec/CArray/object/s_new_spec.rb
-- spec/CArray/serialize/Serialization_spec.rb
+- spec/Classes/CABitfield_spec.rb
+- spec/Classes/CABlockIterator_spec.rb
+- spec/Classes/CABlock_spec.rb
+- spec/Classes/CAField_spec.rb
+- spec/Classes/CAGrid_spec.rb
+- spec/Classes/CAMap_spec.rb
+- spec/Classes/CAMapping_spec.rb
+- spec/Classes/CAObject_attribute_spec.rb
+- spec/Classes/CAObject_spec.rb
+- spec/Classes/CARefer_spec.rb
+- spec/Classes/CARepeat_spec.rb
+- spec/Classes/CASelect_spec.rb
+- spec/Classes/CAShift_spec.rb
+- spec/Classes/CAStruct_spec.rb
+- spec/Classes/CATranspose_spec.rb
+- spec/Classes/CAUnboudRepeat_spec.rb
+- spec/Classes/CAWindow_spec.rb
+- spec/Classes/CAWrap_spec.rb
+- spec/Classes/CArray_spec.rb
+- spec/Classes/CScalar_spec.rb
+- spec/Features/feature_130_spec.rb
+- spec/Features/feature_attributes_spec.rb
+- spec/Features/feature_boolean_spec.rb
+- spec/Features/feature_broadcast.rb
+- spec/Features/feature_cast_function.rb
+- spec/Features/feature_cast_spec.rb
+- spec/Features/feature_class_spec.rb
+- spec/Features/feature_complex_spec.rb
+- spec/Features/feature_composite_spec.rb
+- spec/Features/feature_convert_spec.rb
+- spec/Features/feature_copy_spec.rb
+- spec/Features/feature_creation_spec.rb
+- spec/Features/feature_element_spec.rb
+- spec/Features/feature_extream_spec.rb
+- spec/Features/feature_generate_spec.rb
+- spec/Features/feature_index_spec.rb
+- spec/Features/feature_mask_spec.rb
+- spec/Features/feature_math_spec.rb
+- spec/Features/feature_order_spec.rb
+- spec/Features/feature_ref_store_spec.rb
+- spec/Features/feature_serialization_spec.rb
+- spec/Features/feature_stat_spec.rb
+- spec/Features/feature_virtual_spec.rb
+- spec/Features/method_eq_spec.rb
+- spec/Features/method_is_nan_spec.rb
+- spec/Features/method_map_spec.rb
+- spec/Features/method_max_with.rb
+- spec/Features/method_min_with.rb
+- spec/Features/method_ne_spec.rb
+- spec/Features/method_project_spec.rb
+- spec/Features/method_ref_spec.rb
+- spec/Features/method_round_spec.rb
+- spec/Features/method_s_linspace_spec.rb
+- spec/Features/method_s_span_spec.rb
+- spec/Features/method_seq_spec.rb
+- spec/Features/method_sort_with.rb
+- spec/Features/method_sorted_with.rb
+- spec/Features/method_span_spec.rb
+- spec/Features/method_wrap_readonly_spec.rb
+- spec/UnitTest/test_CAVirtual.rb
 - spec/spec_all.rb
-- test/test_130.rb
-- test/test_ALL.rb
-- test/test_CABitfield.rb
-- test/test_CABlock.rb
-- test/test_CAField.rb
-- test/test_CAGrid.rb
-- test/test_CAMapping.rb
-- test/test_CAMmap.rb
-- test/test_CARefer.rb
-- test/test_CARepeat.rb
-- test/test_CASelect.rb
-- test/test_CAShift.rb
-- test/test_CATranspose.rb
-- test/test_CAVirtual.rb
-- test/test_CAWindow.rb
-- test/test_CAWrap.rb
-- test/test_CArray.rb
-- test/test_CComplex.rb
-- test/test_CScalar.rb
-- test/test_attribute.rb
-- test/test_block_iterator.rb
-- test/test_boolean.rb
-- test/test_cast.rb
-- test/test_class.rb
-- test/test_complex.rb
-- test/test_composite.rb
-- test/test_convert.rb
-- test/test_copy.rb
-- test/test_creation.rb
-- test/test_element.rb
-- test/test_extream.rb
-- test/test_generate.rb
-- test/test_index.rb
-- test/test_mask.rb
-- test/test_math.rb
-- test/test_order.rb
-- test/test_ref_store.rb
-- test/test_stat.rb
-- test/test_struct.rb
-- test/test_virtual.rb
 - utils/ca_ase.rb
 - utils/ca_methods.rb
 - utils/cast_checker.rb
-- utils/extract_rdoc.rb
+- utils/convert_test.rb
+- utils/extract_yard.rb
 - utils/guess_shape.rb
 - utils/monkey_patch_methods.rb
 - utils/remove_resource_fork.sh
@@ -205,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multi-dimesional array class for Ruby