multiarray 0.5.2 → 0.6.0

data/test/tc_sequence.rb

@@ -127,8 +127,8 @@ class TC_Sequence < Test::Unit::TestCase
   end
 
   def test_typecode
-    assert_equal O, S.new( O, 3 ).typecode
-    assert_equal I, S.new( I, 3 ).typecode
+    assert_equal O, S.object( 3 ).typecode
+    assert_equal I, S.int( 3 ).typecode
   end
 
   def test_dimension
@@ -265,6 +265,7 @@ class TC_Sequence < Test::Unit::TestCase
 
   def test_collect
     assert_equal S[ 2, 3 ], S[ 1, 2 ].collect { |x| x + 1 }
+    assert_equal S[ 2, 4 ], S[ 1, 2 ].map { |x| 2 * x }
   end
 
   def test_sum
@@ -290,6 +291,13 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal C( 3, 2, 3 ), S[ C( 1, 2, 3 ), C( 3, 2, 1 ) ].max
   end
 
+  def test_sum
+    [ S( O, 3 ), S( I, 3 ) ].each do |t|
+      assert_equal 9, t[ 4, 2, 3 ].sum
+    end
+    assert_equal C( 4, 4, 4 ), S[ C( 1, 2, 3 ), C( 3, 2, 1 ) ].sum
+  end
+
   def test_convolve
     [ O, I ].each do |t|
       assert_equal S( t, 5 )[ 2, 3, 0, 0, 0 ],
@@ -312,6 +320,25 @@ class TC_Sequence < Test::Unit::TestCase
                  convolve( S[ C( 1, 0, 0 ), C( 0, 1, 0 ), C( 0, 0, 1 ) ] )
   end
 
+  def test_histogram
+    [ O, I ].each do |t|
+      assert_equal S( t, 5 )[ 0, 1, 2, 1, 1 ],
+                   S( t, 5 )[ 1, 2, 2, 3, 4 ].histogram( 5, :target => t )
+    end
+    assert_raise( RuntimeError ) { S[ -1, 0, 1 ].histogram 3 }
+    assert_raise( RuntimeError ) { S[ 1, 2, 3 ].histogram 3 }
+    assert_raise( RuntimeError ) { S[ 0, 0, 0 ].histogram 3, 2 }
+  end
+
+  def test_lut
+    [ O, I ].each do |t|
+      assert_equal S( t, 4 )[ 3, 1, 2, 1 ],
+                   S( t, 4 )[ 0, 2, 1, 2 ].lut( S( t, 3 )[ 3, 2, 1 ] )
+    end
+    assert_raise( RuntimeError ) { S[ -1, 0 ].lut S[ 0, 1 ] }
+    assert_raise( RuntimeError ) { S[ 1, 2 ].lut S[ 0, 1 ] }
+  end
+
   def test_zero
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal [ false, true, false ], t[ -1, 0, 1 ].zero?.to_a
@@ -456,9 +483,13 @@ class TC_Sequence < Test::Unit::TestCase
   end
 
   def test_arg
-    assert_equal S[ 0.0, Math::PI ], S[ 1, -1 ].arg
-    assert_equal S[ 0.0, Math::PI / 2, Math::PI, -Math::PI / 2 ],
-                 S[ X( 1, 0 ), X( 0, 1 ), X( -1, 0 ), X( 0, -1 ) ].arg
+    [ 0.0, Math::PI ].zip( S[ 1, -1 ].arg.to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    r = S[ X( 1, 0 ), X( 0, 1 ), X( -1, 0 ), X( 0, -1 ) ].arg
+    [ 0.0, Math::PI / 2, Math::PI, -Math::PI / 2 ].zip( r.to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
   end
 
   def test_mul
@@ -557,6 +588,191 @@ class TC_Sequence < Test::Unit::TestCase
   def test_sqrt
     assert_equal S( O, 3 )[ 1, 2, 3 ], Math.sqrt( S( O, 3 )[ 1, 4, 9 ] )
     assert_equal S[ 1.0, 2.0, 3.0 ], Math.sqrt( S[ 1.0, 4.0, 9.0 ] )
+    [ Math.sqrt( X( 1, 2 ) ), Math.sqrt( X( 2, -1 ) ) ].
+      zip( Math.sqrt( S[ X( 1, 2 ), X( 2, -1 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_exp
+    [ Math.exp( 2 ), Math.exp( 3 ) ].zip( Math.exp( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.exp( X( 1, 2 ) ) ].zip( Math.exp( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_cos
+    [ Math.cos( 2 ), Math.cos( 3 ) ].zip( Math.cos( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.cos( X( 1, 2 ) ) ].zip( Math.cos( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_sin
+    [ Math.sin( 2 ), Math.sin( 3 ) ].zip( Math.sin( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.sin( X( 1, 2 ) ) ].zip( Math.sin( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_tan
+    [ Math.tan( 2 ), Math.tan( 3 ) ].zip( Math.tan( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.tan( X( 1, 2 ) ) ].zip( Math.tan( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_cosh
+    [ Math.cosh( 2 ), Math.cosh( 3 ) ].
+      zip( Math.cosh( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.cosh( X( 1, 2 ) ) ].zip( Math.cosh( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_sinh
+    [ Math.sinh( 2 ), Math.sinh( 3 ) ].
+      zip( Math.sinh( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.sinh( X( 1, 2 ) ) ].zip( Math.sinh( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_tanh
+    [ Math.tanh( 2 ), Math.tanh( 3 ) ].
+      zip( Math.tanh( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.tanh( X( 1, 2 ) ) ].zip( Math.tanh( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_log
+    [ Math.log( 2 ), Math.log( 3 ) ].zip( Math.log( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.log( X( 1, 2 ) ) ].zip( Math.log( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_log10
+    [ Math.log10( 2 ), Math.log10( 3 ) ].
+      zip( Math.log10( S[ 2, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.log10( X( 1, 2 ) ) ].zip( Math.log10( S[ X( 1, 2 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_acos
+    [ Math.acos( 0.3 ), Math.acos( 0.6 ) ].
+      zip( Math.acos( S[ 0.3, 0.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.acos( X( 0.2, 0.3 ) ) ].
+      zip( Math.acos( S[ X( 0.2, 0.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_asin
+    [ Math.asin( 0.3 ), Math.asin( 0.6 ) ].
+      zip( Math.asin( S[ 0.3, 0.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.asin( X( 0.2, 0.3 ) ) ].
+      zip( Math.asin( S[ X( 0.2, 0.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_atan
+    [ Math.atan( 0.3 ), Math.atan( 0.6 ) ].
+      zip( Math.atan( S[ 0.3, 0.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.atan( X( 0.2, 0.3 ) ) ].
+      zip( Math.atan( S[ X( 0.2, 0.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_acosh
+    [ Math.acosh( 1.3 ), Math.acosh( 1.6 ) ].
+      zip( Math.acosh( S[ 1.3, 1.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.acosh( X( 1.2, 1.3 ) ) ].
+      zip( Math.acosh( S[ X( 1.2, 1.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_asinh
+    [ Math.asinh( 1.3 ), Math.asinh( 1.6 ) ].
+      zip( Math.asinh( S[ 1.3, 1.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.asinh( X( 1.2, 1.3 ) ) ].
+      zip( Math.asinh( S[ X( 1.2, 1.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_atanh
+    [ Math.atanh( 0.3 ), Math.atanh( 0.6 ) ].
+      zip( Math.atanh( S[ 0.3, 0.6 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.atanh( X( 0.2, 0.3 ) ) ].
+      zip( Math.atanh( S[ X( 0.2, 0.3 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+  end
+
+  def test_atan2
+    [ Math.atan2( 3, 4 ), Math.atan2( 4, 3 ) ].
+      zip( Math.atan2( S[ 3, 4 ], S[ 4, 3 ] ).to_a ).each do |x,y|
+      assert_in_delta x, y, 1.0e-5
+    end
+    [ Math.atan2( X( 1, 2 ), X( 3, 4 ) ) ].
+      zip( Math.atan2( S[ X( 1, 2 ) ], S[ X( 3, 4 ) ] ).to_a ).each do |x,y|
+      assert_in_delta x.real, y.real, 1.0e-5
+      assert_in_delta x.imag, y.imag, 1.0e-5
+    end
+    assert_raise( RuntimeError ) { Math.atan2( S[ 3 ], S[ 4, 3 ] ) }
+    assert_raise( RuntimeError ) { Math.atan2( S[ 3, 4 ], S[ 4 ] ) }
   end
 
   def test_hypot
@@ -565,10 +781,23 @@ class TC_Sequence < Test::Unit::TestCase
     assert_raise( RuntimeError ) { Math.hypot( S[ 3, 4 ], S[ 4 ] ) }
   end
 
+  def test_fill
+    [ S( O, 3 ), S( I, 3 ) ].each do |t|
+      s = t[ 1, 2, 3 ]
+      assert_equal t[ 1, 1, 1 ], s.fill!( 1 )
+      assert_equal t[ 1, 1, 1 ], s
+    end
+  end
+
   def test_to_type
-    assert_equal S( O, 3 )[ 1, 2, 3 ], S( I, 3 )[ 1, 2, 3 ].to_type( O )
-    assert_equal S( I, 3 )[ 1, 2, 3 ], S( O, 3 )[ 1, 2, 3 ].to_type( I )
-    assert_equal S( C, 3 )[ 1, 2, 3 ], S( I, 3 )[ 1, 2, 3 ].to_type( C )
+    assert_equal S( O, 3 )[ 1, 2, 3 ], S( I, 3 )[ 1, 2, 3 ].to_object
+    assert_equal S( I, 3 )[ 1, 2, 3 ], S( O, 3 )[ 1, 2, 3 ].to_int
+    assert_equal S( C, 3 )[ 1, 2, 3 ], S( I, 3 )[ 1, 2, 3 ].to_intrgb
+  end
+
+  def test_integral
+    assert_equal S( O, 3 )[ 1, 3, 6 ], S( O, 3 )[ 1, 2, 3 ].integral
+    assert_equal S( I, 3 )[ 1, 3, 6 ], S( I, 3 )[ 1, 2, 3 ].integral
   end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: multiarray
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +01:00
+date: 2010-09-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -70,6 +67,7 @@ files:
 - lib/multiarray/gcccache.rb
 - lib/multiarray/int.rb
 - lib/multiarray/gccfunction.rb
+- lib/multiarray/shortcuts.rb
 - lib/multiarray/float.rb
 - lib/multiarray/diagonal.rb
 - lib/multiarray/inject.rb
@@ -78,17 +76,21 @@ files:
 - lib/multiarray/lambda.rb
 - lib/multiarray/sequence.rb
 - lib/multiarray/methods.rb
+- lib/multiarray/integral.rb
 - lib/multiarray/multiarray.rb
 - lib/multiarray/node.rb
+- lib/multiarray/histogram.rb
 - lib/multiarray/malloc.rb
 - lib/multiarray/index.rb
 - lib/multiarray/rgb.rb
 - lib/multiarray/gcccontext.rb
 - lib/multiarray/composite.rb
+- lib/multiarray/store.rb
 - lib/multiarray/elementwise.rb
 - lib/multiarray/lookup.rb
 - lib/multiarray/gccvalue.rb
 - lib/multiarray/complex.rb
+- lib/multiarray/lut.rb
 - lib/multiarray.rb
 - test/ts_multiarray.rb
 - test/tc_float.rb
@@ -113,7 +115,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -122,7 +123,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"