multiarray 0.10.2 → 0.10.3

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.10.2'
+PKG_VERSION = '0.10.3'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/multiarray/complex.rb

@@ -201,8 +201,8 @@ module Hornetseye
     #
     # @return [Node] Returns an array with the real and imaginary component as
     #         elements.
-    def decompose
-      Hornetseye::Sequence[ @real, @imag ]
+    def decompose( i )
+      [ @real, @imag ][ i ]
     end
 
   end
@@ -696,7 +696,7 @@ module Hornetseye
 
     def real_with_decompose
       if typecode < COMPLEX_
-        decompose.roll.element 0
+        decompose 0
       elsif typecode == OBJECT
         real_without_decompose
       else
@@ -708,7 +708,7 @@ module Hornetseye
 
     def real=( value )
       if typecode < COMPLEX_
-        decompose.roll[ 0 ] = value
+        decompose( 0 )[] = value
       elsif typecode == OBJECT
         self[] = Hornetseye::lazy do
           value + imag * Complex::I
@@ -720,7 +720,7 @@ module Hornetseye
 
     def imag_with_decompose
       if typecode < COMPLEX_
-        decompose.roll.element 1
+        decompose 1
       elsif typecode == OBJECT
         imag_without_decompose
       else
@@ -732,7 +732,7 @@ module Hornetseye
 
     def imag=( value )
       if typecode < COMPLEX_
-        decompose.roll[ 1 ] = value
+        decompose( 1 )[] = value
       elsif typecode == OBJECT
         self[] = Hornetseye::lazy do
           real + value * Complex::I

data/lib/multiarray/elementwise.rb

@@ -192,8 +192,8 @@ module Hornetseye
     # This method decomposes composite elements into array.
     #
     # @return [Node] Result of decomposition.
-    def decompose
-      values = @values.collect { |value| value.decompose }
+    def decompose( i )
+      values = @values.collect { |value| value.decompose i }
       self.class.new( *values ).demand
     end
 

data/lib/multiarray/lambda.rb

@@ -164,8 +164,8 @@ module Hornetseye
     # This method decomposes composite elements into array.
     #
     # @return [Node] Result of decomposition.
-    def decompose
-      Lambda.new @index, @term.decompose
+    def decompose( i )
+      Lambda.new @index, @term.decompose( i )
     end
 
     # Check whether this term is compilable

data/lib/multiarray/lookup.rb

@@ -153,11 +153,11 @@ module Hornetseye
     # This method decomposes composite elements into array.
     #
     # @return [Node] Result of decomposition.
-    def decompose
+    def decompose( i )
       if typecode < Composite
-        Lookup.new @p.decompose, @index, @stride * typecode.num_elements
+        Lookup.new @p.decompose( i ), @index, @stride * typecode.num_elements
       else
-        Lookup.new @p.decompose, @index, @stride
+        Lookup.new @p.decompose( i ), @index, @stride
       end
     end
 

data/lib/multiarray/lut.rb

@@ -88,8 +88,8 @@ module Hornetseye
       end
     end
 
-    def decompose
-      self.class.new @source, @table.decompose, @n
+    def decompose( i )
+      self.class.new @source, @table.decompose( i ), @n
     end
 
     def compilable?

data/lib/multiarray/node.rb

@@ -682,7 +682,7 @@ module Hornetseye
     # This method decomposes composite elements into array.
     #
     # @return [Node] Returns +self+.
-    def decompose
+    def decompose( i )
       self
     end
 

data/lib/multiarray/operations.rb

@@ -395,11 +395,11 @@ module Hornetseye
       left
     end
 
-    def histogram_with_composite( *ret_shape )
-      decompose.histogram_without_composite *ret_shape
-    end
+    #def histogram_with_composite( *ret_shape )
+    #  decompose.histogram_without_composite *ret_shape
+    #end
 
-    alias_method_chain :histogram, :composite
+    #alias_method_chain :histogram, :composite
 
     def lut( table, options = {} )
       options = { :safe => true }.merge options
@@ -441,11 +441,11 @@ module Hornetseye
       end
     end
 
-    def lut_with_composite( table, options = {} )
-      decompose.lut_without_composite table, options
-    end
+    #def lut_with_composite( table, options = {} )
+    #  decompose.lut_without_composite table, options
+    #end
 
-    alias_method_chain :lut, :composite
+    #alias_method_chain :lut, :composite
 
     def integral
       left = pointer_type.new

data/lib/multiarray/pointer.rb

@@ -208,12 +208,10 @@ module Hornetseye
     # This method decomposes composite elements into array.
     #
     # @return [Node] Result of decomposition.
-    def decompose
+    def decompose( i )
       if self.class.target < Composite
         pointer = Hornetseye::Pointer( self.class.target.element_type ).new @value
-        num_elements = self.class.target.num_elements
-        var = Variable.new Hornetseye::INDEX( INT.new( num_elements ) )
-        Lambda.new var, Lookup.new( pointer, var, INT.new( 1 ) )
+        pointer.lookup INT.new( i ), INT.new( 1 )
       else
         super
       end

data/lib/multiarray/rgb.rb

@@ -173,8 +173,8 @@ module Hornetseye
     # This method decomposes the RGB value into an array.
     #
     # @return [Node] An array with the three channel values as elements.
-    def decompose
-      Hornetseye::Sequence[ @r, @g, @b ]
+    def decompose( i )
+      [ @r, @g, @b ][ i ]
     end
 
   end
@@ -456,10 +456,10 @@ module Hornetseye
     define_unary_op :b, :scalar
 
     def r_with_decompose
-      if typecode < RGB_
-        decompose.roll.element 0
-      elsif typecode == OBJECT
+      if typecode == OBJECT or is_a?( Variable )
         r_without_decompose
+      elsif typecode < RGB_
+        decompose 0
       else
         self
       end
@@ -469,7 +469,7 @@ module Hornetseye
 
     def r=( value )
       if typecode < RGB_
-        decompose.roll[ 0 ] = value
+        decompose( 0 )[] = value
       elsif typecode == OBJECT
         self[] = Hornetseye::lazy do
           value * RGB.new( 1, 0, 0 ) + g * RGB.new( 0, 1, 0 ) + b * RGB.new( 0, 0, 1 )
@@ -480,10 +480,10 @@ module Hornetseye
     end
 
     def g_with_decompose
-      if typecode < RGB_
-        decompose.roll.element 1
-      elsif typecode == OBJECT
+      if typecode == OBJECT or is_a?( Variable )
         g_without_decompose
+      elsif typecode < RGB_
+        decompose 1
       else
         self
       end
@@ -493,7 +493,7 @@ module Hornetseye
 
     def g=( value )
       if typecode < RGB_
-        decompose.roll[ 1 ] = value
+        decompose( 1 )[] = value
       elsif typecode == OBJECT
         self[] = Hornetseye::lazy do
           r * RGB.new( 1, 0, 0 ) + value * RGB.new( 0, 1, 0 ) + b * RGB.new( 0, 0, 1 )
@@ -504,10 +504,10 @@ module Hornetseye
     end
 
     def b_with_decompose
-      if typecode < RGB_
-        decompose.roll.element 2
-      elsif typecode == OBJECT
+      if typecode == OBJECT or is_a?( Variable )
         b_without_decompose
+      elsif typecode < RGB_
+        decompose 2
       else
         self
       end
@@ -517,7 +517,7 @@ module Hornetseye
 
     def b=( value )
       if typecode < RGB_
-        decompose.roll[ 2 ] = value
+        decompose( 2 )[] = value
       elsif typecode == OBJECT
         self[] = Hornetseye::lazy do
           r * RGB.new( 1, 0, 0 ) + g * RGB.new( 0, 1, 0 ) + value * RGB.new( 0, 0, 1 )

data/test/tc_multiarray.rb

@@ -363,6 +363,7 @@ class TC_MultiArray < Test::Unit::TestCase
   def test_collect
     assert_equal M[ [ 2, 3, 4 ], [ 5, 6, 7 ] ], 
                  M[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].collect { |x| x + 1 }
+    assert_equal M[ [ 6 ] ], M[ [ C( 1, 2, 3 ) ] ].collect { |x| x.r + x.g + x.b }
   end
 
   def test_sum
@@ -428,8 +429,8 @@ class TC_MultiArray < Test::Unit::TestCase
                  M[ [ 1, 2 ], [ 3, 3 ] ].histogram( 5, :target => I )
     assert_equal M( I, 2, 2 )[ [ 1, 0 ], [ 1, 1 ] ],
                  M[ [ 0, 0 ], [ 0, 1 ], [ 1, 1 ] ].histogram( 2, 2, :target => I )
-    assert_equal M( I, 2, 2, 1 )[ [ [ 0, 1 ], [ 1, 0 ] ] ],
-                 S[ C( 1, 0, 0 ), C( 0, 1, 0 ) ].histogram( 2, 2, 1, :target => I )
+    #assert_equal M( I, 2, 2, 1 )[ [ [ 0, 1 ], [ 1, 0 ] ] ],
+    #             S[ C( 1, 0, 0 ), C( 0, 1, 0 ) ].histogram( 2, 2, 1, :target => I )
     assert_raise( RuntimeError ) { S[ 1, 2, 3 ].histogram 4, 4 }
     assert_raise( RuntimeError ) { M[ [ -1, 0 ] ].histogram 3, 2 }
     assert_raise( RuntimeError ) { M[ [ 0, -1 ] ].histogram 3, 2 }

data/test/tc_rgb.rb

@@ -162,10 +162,6 @@ class TC_RGB < Test::Unit::TestCase
                  inject( RGB( 2, 3, 4 ) ) { |a,b| a + b }[]
   end
 
-  def test_decompose
-    assert_equal [ 1, 2, 3 ], RGB( 1, 2, 3 ).decompose.to_a
-  end
-
   def test_not
     assert !RGB( 0, 0, 0 ).not
     assert !RGB( 1, 2, 3 ).not

data/test/tc_sequence.rb

@@ -277,6 +277,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 }
+    assert_equal S[ 6 ], S[ C( 1, 2, 3 ) ].collect { |x| x.r + x.g + x.b }
   end
 
   def test_sum

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Jan Wedekind