multiarray 0.12.0 → 0.13.0

data/Rakefile

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

data/lib/multiarray/histogram.rb

@@ -36,11 +36,12 @@ module Hornetseye
     # Constructor
     #
     # @param [Node] dest Target array to write histogram to.
+    # @param [Node] weight The weight(s) for the histogram elements.
     # @param [Array<Node>] sources Arrays with elements to compute histogram of.
     #
     # @private
-    def initialize( dest, *sources )
-      @dest, @sources = dest, sources
+    def initialize( dest, weight, *sources )
+      @dest, @weight, @sources = dest, weight, sources
     end
 
     # Get unique descriptor of this object
@@ -52,6 +53,7 @@ module Hornetseye
     # @private
     def descriptor( hash )
       "Histogram(#{@dest.descriptor( hash )}," +
+        "#{@weight.descriptor( hash )}," +
         "#{@sources.collect { |source| source.descriptor( hash ) }.join ','})"
     end
 
@@ -78,20 +80,21 @@ module Hornetseye
     def demand
       if variables.empty?
         if @sources.any? { |source| source.dimension > 0 }
-          source_type = @sources.collect { |source| source.array_type }.
-            inject { |a,b| a.coercion b }
+          source_type = @sources.
+            collect { |source| source.array_type }.inject { |a,b| a.coercion b }
           source_type.shape.last.times do |i|
             sources = @sources.collect do |source|
               source.dimension > 0 ? source.element( INT.new( i ) ) : source
             end
-            Histogram.new( @dest, *sources ).demand
+            weight = @weight.dimension > 0 ? @weight.element( INT.new( i ) ) : @weight
+            Histogram.new( @dest, weight, *sources ).demand
           end
         else
           dest = @dest
           ( @dest.dimension - 1 ).downto( 0 ) do |i|
             dest = dest.element @sources[ i ].demand
           end
-          dest.store dest + 1
+          dest.store dest + @weight
         end
         @dest
       else
@@ -109,7 +112,7 @@ module Hornetseye
     #
     # @private
     def subst( hash )
-      self.class.new @dest.subst( hash ),
+      self.class.new @dest.subst( hash ), @weight.subst( hash ),
                      *@sources.collect { |source| source.subst hash }
     end
 
@@ -119,7 +122,7 @@ module Hornetseye
     #
     # @private
     def variables
-      @sources.inject( @dest.variables ) { |a,b| a + b.variables }
+      @sources.inject( @dest.variables + @weight.variables ) { |a,b| a + b.variables }
     end
 
     # Strip of all values
@@ -132,7 +135,7 @@ module Hornetseye
     #
     # @private
     def strip
-      stripped = ( [ @dest ] + @sources ).collect { |source| source.strip }
+      stripped = ( [ @dest, @weight ] + @sources ).collect { |source| source.strip }
       return stripped.inject( [] ) { |vars,elem| vars + elem[ 0 ] },
            stripped.inject( [] ) { |values,elem| values + elem[ 1 ] },
            self.class.new( *stripped.collect { |elem| elem[ 2 ] } )
@@ -144,7 +147,8 @@ module Hornetseye
     #
     # @private
     def compilable?
-      @dest.compilable? and @sources.all? { |source| source.compilable? }
+      @dest.compilable? and @weight.compilable? and
+        @sources.all? { |source| source.compilable? }
     end
 
   end

data/lib/multiarray/operations.rb

@@ -456,14 +456,14 @@ module Hornetseye
     #
     # @overload histogram( *ret_shape, options = {} )
     #   @param [Array<Integer>] ret_shape Dimensions of resulting histogram.
-    #   @option options [Class] :target (UINT) Element-type of resulting histogram.
+    #   @option options [Node] :weight (UINT(1)) Weights for computing the histogram.
     #   @option options [Boolean] :safe (true) Do a boundary check before creating the
     #           histogram.
     #
     # @return [Node] The histogram.
     def histogram( *ret_shape )
       options = ret_shape.last.is_a?( Hash ) ? ret_shape.pop : {}
-      options = { :target => UINT, :safe => true }.merge options
+      options = { :weight => UINT.new( 1 ), :safe => true }.merge options
       if shape.first != 1 and ret_shape.size == 1
         [ self ].histogram *( ret_shape + [ options ] )
       else
@@ -518,7 +518,7 @@ class Array
   #
   # @overload histogram( *ret_shape, options = {} )
   #   @param [Array<Integer>] ret_shape Dimensions of resulting histogram.
-  #   @option options [Class] :target (Hornetseye::UINT) Element-type of resulting
+  #   @option options [Node] :weight (Hornetseye::UINT(1)) Weights for computing the
   #           histogram.
   #   @option options [Boolean] :safe (true) Do a boundary check before creating the
   #           histogram.
@@ -526,7 +526,8 @@ class Array
   # @return [Node] The histogram.
   def histogram( *ret_shape )
     options = ret_shape.last.is_a?( Hash ) ? ret_shape.pop : {}
-    options = { :target => Hornetseye::UINT, :safe => true }.merge options
+    options = { :weight => Hornetseye::UINT.new( 1 ), :safe => true }.merge options
+    weight = options[ :weight ]
     if options[ :safe ]
       if size != ret_shape.size
         raise "Number of arrays for histogram (#{size}) differs from number of " +
@@ -535,6 +536,7 @@ class Array
       array_types = collect { |source| source.array_type }
       source_type = array_types.inject { |a,b| a.coercion b }
       source_type.check_shape *array_types
+      source_type.check_shape options[ :weight ]
       for i in 0 ... size
         range = self[ i ].range
         if range.begin < 0
@@ -547,9 +549,9 @@ class Array
         end
       end
     end
-    left = Hornetseye::MultiArray.new options[ :target ], *ret_shape
+    left = Hornetseye::MultiArray.new weight.typecode, *ret_shape
     left[] = 0
-    block = Hornetseye::Histogram.new left, *self
+    block = Hornetseye::Histogram.new left, weight, *self
     if block.compilable?
       Hornetseye::GCCFunction.run block
     else

data/test/tc_multiarray.rb

@@ -429,13 +429,16 @@ class TC_MultiArray < Test::Unit::TestCase
 
   def test_histogram
     assert_equal S( I, 5 )[ 0, 1, 1, 2, 0 ],
-                 M[ [ 1, 2 ], [ 3, 3 ] ].histogram( 5, :target => I )
+                 M[ [ 1, 2 ], [ 3, 3 ] ].histogram( 5, :weight => I.new( 1 ) )
     assert_equal M( I, 2, 2 )[ [ 1, 0 ], [ 1, 1 ] ],
-                 M[ [ 0, 0 ], [ 0, 1 ], [ 1, 1 ] ].histogram( 2, 2, :target => I )
+                 M[ [ 0, 0 ], [ 0, 1 ], [ 1, 1 ] ].
+                 histogram( 2, 2, :weight => I.new( 1 ) )
     assert_equal M( I, 2, 2 )[ [ 1, 0 ], [ 1, 1 ] ],
-                 [ S[ 0, 0, 1 ], S[ 0, 1, 1 ] ].histogram( 2, 2, :target => I )
+                 [ S[ 0, 0, 1 ], S[ 0, 1, 1 ] ].
+                 histogram( 2, 2, :weight => I.new( 1 ) )
     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 )
+                 S[ C( 1, 0, 0 ), C( 0, 1, 0 ) ].
+                 histogram( 2, 2, 1, :weight => I.new( 1 ) )
     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_sequence.rb

@@ -344,13 +344,16 @@ class TC_Sequence < Test::Unit::TestCase
   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 )
+                   S( t, 5 )[ 1, 2, 2, 3, 4 ].histogram( 5, :weight => t.new( 1 ) )
+      assert_equal S( t, 5 )[ 0, 1, 2, 3, 0 ],
+                   S( t, 3 )[ 1, 3, 2 ].histogram( 5, :weight => S( t, 3 )[ 1, 3, 2 ] )
       assert_equal S( t, 4 )[ 0, 1, 1, 0 ],
-                   S( t, 2 )[ 1.0, 2.0 ].histogram( 4, :target => t )
+                   S( t, 2 )[ 1.0, 2.0 ].histogram( 4, :weight => t.new( 1 ) )
     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 }
+    assert_raise( RuntimeError ) { S[ 0, 1 ].histogram 3, :weight => S[ 0 ] }
   end
 
   def test_lut

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +00:00
+date: 2010-12-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency