multiarray 0.21.0 → 0.22.0

data/Rakefile

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

data/lib/multiarray.rb

@@ -621,8 +621,8 @@ class Array
         size2 = 0.5 * ( retVal.size + 2 )
         nIntegral = erf( +size2, sigma ) - erf( -size2, sigma )
         value = 0.5 * ( nIntegral - integral )
-        retVal.unshift( value )
-        retVal.push( value )
+        retVal.unshift value
+        retVal.push value
         integral = nIntegral
       end
       # Normalise result.
@@ -653,8 +653,8 @@ class Array
         size2 = 0.5 * ( retVal.size + 2 )
         nIntegral = gauss( size2, sigma )
         value = integral - nIntegral
-        retVal.unshift( -value )
-        retVal.push( +value )
+        retVal.unshift +value
+        retVal.push -value
         sumX += value * ( retVal.size - 1 )
         integral = nIntegral
       end

data/lib/multiarray/components.rb

@@ -84,7 +84,7 @@ module Hornetseye
       @dest
     end
 
-    # Recursive function to perform connected component labelling
+    # Recursive function to perform connected component labeling
     #
     # @param [Array<Proc>] args Array with functions for locating neighbouring elements.
     # @param [Array<Proc>] comp Array with functions for locating neighbouring labels.

data/lib/multiarray/diagonal.rb

@@ -105,7 +105,7 @@ module Hornetseye
       end
       j0.upto( ( @index2.size - 1 ).minor( @index0 + s1 ) ) do |j|
         i = @index0.get + s1.get - j
-        sub = @value.subst @index1 => INT.new( i ), @index2 => INT.new( j ) 
+        sub = @value.subst @index1 => INT.new( i ), @index2 => INT.new( j )
         retval.assign @block.subst( @var1 => retval, @var2 => sub )
       end
       retval

data/lib/multiarray/gccvalue.rb

@@ -279,6 +279,15 @@ module Hornetseye
       0
     end
 
+    def fmod( other )
+      if GCCValue.generic? other
+        GCCValue.new @function, "fmod( #{self}, #{other} )"
+      else
+        x, y = other.coerce self
+        x.send op, y
+      end
+    end
+
     # Create code for conditional selection of value
     #
     # @param [GCCValue,Object] a First value.

data/lib/multiarray/operations.rb

@@ -87,6 +87,7 @@ module Hornetseye
     define_binary_op :**, :coercion_maxint
     define_binary_op :/
     define_binary_op :%
+    define_binary_op :fmod
     define_binary_op :and, :coercion_bool
     define_binary_op :or, :coercion_bool
     define_binary_op :&
@@ -113,6 +114,25 @@ module Hornetseye
       self
     end
 
+    # Modulo operation for floating point numbers
+    #
+    # This operation takes account of the problem that '%' does not work with
+    # floating-point numbers in C.
+    #
+    # @return [Node] Array with result of operation.
+    def fmod_with_float( other )
+      unless other.is_a? Node
+        other = Node.match( other, typecode ).new other
+      end
+      if typecode < FLOAT_ or other.typecode < FLOAT_
+        fmod other
+      else
+        fmod_without_float other
+      end
+    end
+
+    alias_method_chain :%, :float, :fmod
+
     # Convert array elements to different element type
     #
     # @param [Class] dest Element type to convert to.
@@ -517,18 +537,19 @@ module Hornetseye
       end
     end
 
-    # Compute product table from two arrays
+    # Compute table from two arrays
     #
-    # Used internally to implement convolutions.
+    # Used internally to implement convolutions and other operations.
     #
-    # @param [Node] filter Filter to form product table with.
+    # @param [Node] filter Filter to form table with.
+    # @param [Proc] action Operation to make table for.
     #
     # @return [Node] Result of operation.
     #
     # @see #convolve
     #
     # @private
-    def product( filter )
+    def table( filter, &action )
       filter = Node.match( filter, typecode ).new filter unless filter.is_a? Node
       if filter.dimension > dimension
         raise "Filter has #{filter.dimension} dimension(s) but should " +
@@ -536,9 +557,9 @@ module Hornetseye
       end
       filter = Hornetseye::lazy( 1 ) { filter } while filter.dimension < dimension
       if filter.dimension == 0
-        self * filter
+        action.call self, filter
       else
-        Hornetseye::lazy { |i,j| self[j].product filter[i] }
+        Hornetseye::lazy { |i,j| self[j].table filter[i], &action }
       end
     end
 
@@ -551,27 +572,7 @@ module Hornetseye
       filter = Node.match( filter, typecode ).new filter unless filter.is_a? Node
       array = self
       ( dimension - filter.dimension ).times { array = array.roll }
-      array.product( filter ).diagonal { |s,x| s + x }
-    end
-
-    # Create spread array similar to product array
-    #
-    # Used internally to implement erosion and dilation.
-    #
-    # @param [Integer] n Size of spread.
-    #
-    # @return [Node] Result of operation.
-    #
-    # @see #erode
-    # @see #dilate
-    #
-    # @private
-    def spread( n = 3 )
-      if dimension > 0
-        Hornetseye::lazy( n, shape.last ) { |i,j| self[j].spread n }
-      else
-        self
-      end
+      array.table( filter ) { |a,b| a* b }.diagonal { |s,x| s + x }
     end
 
     # Erosion
@@ -582,7 +583,8 @@ module Hornetseye
     #
     # @return [Node] Result of operation.
     def erode( n = 3 )
-      spread( n ).diagonal { |m,x| m.minor x }
+      filter = Hornetseye::lazy( *( [ n ] * dimension ) ) { 0 }
+      table( filter ) { |a,b| a }.diagonal { |m,x| m.minor x }
     end
 
     # Dilation
@@ -593,7 +595,8 @@ module Hornetseye
     #
     # @return [Node] Result of operation.
     def dilate( n = 3 )
-      spread( n ).diagonal { |m,x| m.major x }
+      filter = Hornetseye::lazy( *( [ n ] * dimension ) ) { 0 }
+      table( filter ) { |a,b| a }.diagonal { |m,x| m.major x }
     end
 
     # Sobel operator
@@ -603,7 +606,7 @@ module Hornetseye
     # @return [Node] Result of Sobel operator.
     def sobel( direction )
       ( dimension - 1 ).downto( 0 ).inject self do |retval,i|
-        filter = i == direction ? Hornetseye::Sequence( SINT, 3 )[ -1, 0, 1 ] :
+        filter = i == direction ? Hornetseye::Sequence( SINT, 3 )[ 1, 0, -1 ] :
                                   Hornetseye::Sequence( SINT, 3 )[ 1, 2, 1 ]
         Hornetseye::lazy { retval.convolve filter }
       end.force
@@ -725,7 +728,7 @@ module Hornetseye
       left
     end
 
-    # Perform connected component labelling
+    # Perform connected component labeling
     #
     # @option options [Object] :default (typecode.default) Value of background elements.
     # @option options [Class] :target (UINT) Typecode of labels.

data/test/tc_multiarray.rb

@@ -450,9 +450,9 @@ class TC_MultiArray < Test::Unit::TestCase
 
   def test_sobel
     m = M[ [ 0, 0, 0, 0 ], [ 0, 1, 0, 0 ], [ 0, 0, 0, 0 ] ]
-    assert_equal [ [ -1, 0, 1, 0 ], [ -2, 0, 2, 0 ], [ -1, 0, 1, 0 ] ],
+    assert_equal [ [ 1, 0, -1, 0 ], [ 2, 0, -2, 0 ], [ 1, 0, -1, 0 ] ],
                  m.sobel( 0 ).to_a
-    assert_equal [ [ -1, -2, -1, 0 ], [ 0, 0, 0, 0 ], [ 1, 2, 1, 0 ] ],
+    assert_equal [ [ 1, 2, 1, 0 ], [ 0, 0, 0, 0 ], [ -1, -2, -1, 0 ] ],
                  m.sobel( 1 ).to_a
   end
 

data/test/tc_sequence.rb

@@ -393,7 +393,7 @@ class TC_Sequence < Test::Unit::TestCase
   end
 
   def test_sobel
-    assert_equal [ 0, -1, 0, 1, 0 ], S[ 0, 0, 1, 0, 0 ].sobel( 0 ).to_a
+    assert_equal [ 0, 1, 0, -1, 0 ], S[ 0, 0, 1, 0, 0 ].sobel( 0 ).to_a
   end
 
   def test_histogram
@@ -621,6 +621,9 @@ class TC_Sequence < Test::Unit::TestCase
 
   def test_mod
     assert_equal S[ 2, 0, 1 ], S[ 2, 3, 4 ] % 3
+    assert_equal S[ 1, 0, 3 ], 3 % S[ 2, 3, 4 ]
+    assert_equal S[ 2, 0.5, 1.5 ], S[ 2, 3, 4 ] % 2.5
+    assert_equal S[ 0.5, 2.5, 2.5 ], 2.5 % S[ 2, 3, 4 ]
   end
 
   def test_pow

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 21
+  - 22
   - 0
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +00:00
+date: 2011-04-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency