multiarray 0.14.0 → 0.14.1

data/Rakefile

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

data/lib/multiarray/operations.rb

@@ -183,7 +183,7 @@ module Hornetseye
     #
     # @return [Node] Array with results.
     def <=>( other )
-      Hornetseye::lazy do
+      Hornetseye::finalise do
         ( self < other ).conditional -1, ( self > other ).conditional( 1, 0 )
       end
     end
@@ -431,14 +431,19 @@ module Hornetseye
     # @private
     def product( filter )
       filter = Node.match( filter, typecode ).new filter unless filter.is_a? Node
-      if dimension != filter.dimension
+      if filter.dimension > dimension
         raise "Filter has #{filter.dimension} dimension(s) but should " +
-              "have #{dimension}"
+              "not have more than #{dimension}"
       end
-      if dimension == 0
-        self * filter
+      array = self
+      while filter.dimension < dimension
+        filter = Hornetseye::lazy( 1 ) { filter }
+        array = array.unroll
+      end
+      if filter.dimension == 0
+        array * filter
       else
-        Hornetseye::lazy { |i,j| self[j].product filter[i] }
+        Hornetseye::lazy { |i,j| array[j].product filter[i] }
       end
     end
 
@@ -487,6 +492,38 @@ module Hornetseye
       end
     end
 
+    # Warp an array
+    #
+    # @overload warp( *field, options = {} )
+    #   @param [Array<Integer>] ret_shape Dimensions of resulting histogram.
+    #   @option options [Object] :default (typecode.default) Default value for out of
+    #           range warp vectors.
+    #   @option options [Boolean] :safe (true) Apply clip to warp vectors.
+    #
+    # @return [Node] The result of the lookup operation.
+    def warp( *field )
+
+      #elsif shape.first > lut.dimension or dimension == 1
+      #  reshape( *( [ 1 ] + shape ) ).map lut, options
+
+
+      options = field.last.is_a?( Hash ) ? field.pop : {}
+      options = { :safe => true, :default => typecode.default }.merge options
+      if options[ :safe ]
+        if field.size > dimension
+          raise "Number of arrays for warp (#{field.size}) is greater than the " +
+                "number of dimensions of source (#{dimension})"
+        end
+        Hornetseye::lazy do
+          ( 0 ... field.size ).
+            collect { |i| ( field[i] >= 0 ).and( field[i] < shape[i] ) }.
+            inject { |a,b| a.and b }
+        end.conditional Lut.new( *( field + [ self ] ) ), options[ :default ]
+      else
+        field.lut self
+      end
+    end
+
     # Compute integral image
     #
     # @return [Node] The integral image of this array.
@@ -572,7 +609,7 @@ class Array
     if options[ :safe ]
       if size > table.dimension
         raise "Number of arrays for lookup (#{size}) is greater than the " +
-              " number of dimensions of LUT (#{table.dimension})"
+              "number of dimensions of LUT (#{table.dimension})"
       end
       array_types = collect { |source| source.array_type }
       source_type = array_types.inject { |a,b| a.coercion b }
@@ -593,7 +630,7 @@ class Array
     if all? { |source| source.dimension == 0 and source.variables.empty? }
       result = table
       ( table.dimension - 1 ).downto( 0 ) do |i|
-        result = result.element self[ i ].demand
+        result = result.element( self[ i ].demand ).demand
       end
       result
     else

data/test/tc_lazy.rb

@@ -41,6 +41,10 @@ class TC_Lazy < Test::Unit::TestCase
     Hornetseye::lazy *args, &action
   end
 
+  def finalise( *args, &action )
+    Hornetseye::finalise *args, &action
+  end
+
   def sum( *args, &action )
     Hornetseye::sum *args, &action
   end
@@ -114,5 +118,10 @@ class TC_Lazy < Test::Unit::TestCase
                  M( I, 4, 3 ).indgen.diagonal { |a,b| a + b }.to_a
   end
 
+  def test_lut
+    assert_equal S( I, 4 )[ 4, 2, 3, 2 ],
+                 finalise { S( I, 4 )[ 0, 2, 1, 2 ].lut( S( I, 3 )[ 3, 2, 1 ] ) + 1 }
+  end
+
 end
 

data/test/tc_multiarray.rb

@@ -417,14 +417,17 @@ class TC_MultiArray < Test::Unit::TestCase
 
   def test_convolve
     f = M[ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 7, 8, 9 ] ]
+    s = S[ 1, 2, 3 ]
     assert_equal M[ [ 5, 6, 0 ], [ 8, 9, 0 ], [ 0, 0, 0 ] ],
                  M[ [ 1, 0, 0 ], [ 0, 0, 0 ], [ 0, 0, 0 ] ].convolve( f )
     assert_equal M[ [ 1, 2, 3 ], [ 4, 5, 6 ], [ 7, 8, 9 ] ],
                  M[ [ 0, 0, 0 ], [ 0, 1, 0 ], [ 0, 0, 0 ] ].convolve( f )
     assert_equal M[ [ 0, 0, 0 ], [ 1, 2, 3 ], [ 4, 5, 6 ] ],
                  M[ [ 0, 0, 0 ], [ 0, 0, 0 ], [ 0, 1, 0 ] ].convolve( f )
+    assert_equal M[ [ 0, 0, 0 ], [ 0, 0, 0 ], [ 1, 2, 3 ], [ 0, 0, 0 ], [ 0, 0, 0 ] ],
+                 M[ [ 0, 0, 0, 0, 0 ], [ 0, 0, 1, 0, 0 ], [ 0, 0, 0, 0, 0 ] ].
+                 convolve( s )
     assert_raise( RuntimeError ) { S[ 1, 2, 3 ].convolve f }
-    assert_raise( RuntimeError ) { M[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].convolve S[ 1, 2 ] }
   end
 
   def test_histogram

data/test/tc_sequence.rb

@@ -333,7 +333,6 @@ class TC_Sequence < Test::Unit::TestCase
                    S( t, 5 )[ 0, 0, 0, 0, 1 ].convolve( S( t, 3 )[ 1, 2, 3 ] )
       assert_equal S( t, 4 )[ 1, 2, 3, 0 ],
                    S( t, 4 )[ 0, 1, 0, 0 ].convolve( S( t, 3 )[ 1, 2, 3 ] )
-      assert_raise( RuntimeError ) { S[ 1, 2, 3 ].convolve 1 }
     end
     assert_equal S[ C( 1, 0, 0 ), C( 2, 1, 0 ), C( 3, 2, 1 ), C( 0, 3, 2 ),
                     C( 0, 0, 3 ) ],
@@ -367,6 +366,15 @@ class TC_Sequence < Test::Unit::TestCase
     assert_raise( RuntimeError ) { S[ 1, 2 ].lut S[ 0, 1 ] }
   end
 
+  #def test_warp
+  #  [ O, I ].each do |t1|
+  #    [ O, I ].each do |t2|
+  #      assert_equal S( t1, 3 )[ 1, 2, t1.default ],
+  #                   S( t1, 2 )[ 1, 2 ].warp( S( t2, 3 )[ 0, 1, 2 ] )
+  #    end
+  #  end
+  #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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 0
-  version: 0.14.0
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +00:00
+date: 2010-12-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency