multiarray 0.18.1 → 0.19.0

data/Rakefile

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

data/lib/multiarray.rb

@@ -585,6 +585,72 @@ end
 # The +Array+ class is extended with a few methods
 class Array
 
+  class << self
+
+    # Compute Gauss blur filter
+    #
+    # Compute a filter for approximating a Gaussian blur. The size of the
+    # filter is determined by the given error bound.
+    #
+    # @param [Float] sigma Spread of blur filter.
+    # @param [Float] max_error Upper bound for filter error.
+    # 
+    # @return [Array] An array with the filter elements.
+    def gauss_blur_filter( sigma, max_error = 1.0 / 0x100 )
+      def erf( x, sigma )
+        0.5 * Math.erf( x / ( Math.sqrt( 2.0 ) * sigma.abs ) )
+      end
+      raise 'Sigma must be greater than zero.' if sigma <= 0
+      # Integral of Gauss-bell from -0.5 to +0.5.
+      integral = erf( +0.5, sigma ) - erf( -0.5, sigma )
+      retVal = [ integral ]
+      while 1.0 - integral > max_error
+        # Integral of Gauss-bell from -size2 to +size2.
+        size2 = 0.5 * ( retVal.size + 2 )
+        nIntegral = erf( +size2, sigma ) - erf( -size2, sigma )
+        value = 0.5 * ( nIntegral - integral )
+        retVal.unshift( value )
+        retVal.push( value )
+        integral = nIntegral
+      end
+      # Normalise result.
+      retVal.collect { |element| element / integral }
+    end
+
+    # Compute Gauss gradient filter
+    #
+    # Compute a filter for approximating a Gaussian gradient. The size of the
+    # filter is determined by the given error bound.
+    #
+    # @param [Float] sigma Spread of blur filter.
+    # @param [Float] max_error Upper bound for filter error.
+    # 
+    # @return [Array] An array with the filter elements.
+    def gauss_gradient_filter( sigma, max_error = 1.0 / 0x100 )
+      def gauss( x, sigma )
+        1.0 / ( Math.sqrt( 2.0 * Math::PI ) * sigma.abs ) *
+          Math.exp( -x**2 / ( 2.0 * sigma**2 ) )
+      end
+      raise 'Sigma must be greater than zero.' if sigma <= 0
+      # Integral of Gauss-gradient from -0.5 to +0.5.
+      retVal = [ gauss( +0.5, sigma ) - gauss( -0.5, sigma ) ]
+      # Absolute integral of Gauss-gradient from 0.5 to infinity.
+      integral = gauss( 0.5, sigma )
+      sumX = 0
+      while 2.0 * integral > max_error
+        size2 = 0.5 * ( retVal.size + 2 )
+        nIntegral = gauss( size2, sigma )
+        value = integral - nIntegral
+        retVal.unshift( -value )
+        retVal.push( +value )
+        sumX += value * ( retVal.size - 1 )
+        integral = nIntegral
+      end
+      retVal.collect { |element| element / sumX }
+    end
+
+  end
+
   # Element-wise operation based on element and its index
   #
   # Same as +Array#collect+ but with index.

data/lib/multiarray/multiarray.rb

@@ -74,7 +74,7 @@ module Hornetseye
       # shape of the array is determined. Finally the elements are coopied to the
       # resulting array.
       #
-      # @param [Array<Object>] *args
+      # @param [Array<Object>] *args The array elements.
       #
       # @return [Node] Uniform multi-dimensional array.
       def []( *args )
@@ -82,6 +82,38 @@ module Hornetseye
         target[ *args ]
       end
 
+      # Compute Laplacian of Gaussian filter
+      #
+      # @param [Float] sigma Spread of filter.
+      # @param [Integer] size Size of filter (*e.g.* 9 for 9x9 filter)
+      #
+      # @return[Node] The filter.
+      def laplacian_of_gaussian( sigma = 1.4, size = 9 )
+        def erf( x, sigma )
+          0.5 * Math.erf( x / ( Math.sqrt( 2.0 ) * sigma.abs ) )
+        end
+        def gauss_gradient( x, sigma )
+          -x / ( Math.sqrt( 2.0 * Math::PI * sigma.abs**5 ) ) *
+            Math.exp( -x**2 / ( 2.0 * sigma**2 ) )
+        end
+        retval = new DFLOAT, size, size
+        sum = 0
+        for y in 0 .. size - 1
+          y0 = y - 0.5 * size
+          y1 = y0 + 1
+          y_grad_diff = gauss_gradient( y1, sigma ) - gauss_gradient( y0, sigma )
+          y_erf_diff = erf( y1, sigma ) - erf( y0, sigma )
+          for x in 0..size-1
+            x0 = x - 0.5 * size
+            x1 = x0 + 1
+            x_grad_diff = gauss_gradient( x1, sigma ) - gauss_gradient( x0, sigma )
+            x_erf_diff = erf( x1, sigma ) - erf( x0, sigma )
+            retval[ y, x ] = y_grad_diff * x_erf_diff + y_erf_diff * x_grad_diff
+          end
+        end
+        retval
+      end
+
     end
 
   end

data/lib/multiarray/operations.rb

@@ -329,6 +329,14 @@ module Hornetseye
       end
     end
 
+    def each( &action )
+      if dimension > 0
+        shape.last.times { |i| element( INT.new( i ) ).each &action }
+      else
+        action.call demand.get
+      end
+    end
+
     # Equality operator
     #
     # @return [Boolean] Returns result of comparison.
@@ -402,7 +410,7 @@ module Hornetseye
       if current.last != current.first
         factor =
           ( range.last - range.first ).to_f / ( current.last - current.first )
-        self * factor + ( range.first - current.first * factor )
+        collect { |x| x * factor + ( range.first - current.first * factor ) }
       else
         self + ( range.first - current.first )
       end
@@ -418,7 +426,7 @@ module Hornetseye
         raise "Clipping does not support ranges with end value " +
               "excluded (such as #{range})"
       end
-      major( range.begin ).minor range.end
+      collect { |x| x.major( range.begin ).minor range.end }
     end
 
     # Fill array with a value
@@ -511,6 +519,48 @@ module Hornetseye
       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
+    end
+
+    # Erosion
+    #
+    # The erosion operation works on boolean as well as scalar values.
+    #
+    # @param [Integer] n Size of erosion operator.
+    #
+    # @return [Node] Result of operation.
+    def erode( n = 3 )
+      spread( n ).diagonal { |m,x| m.minor x }
+    end
+
+    # Dilation
+    #
+    # The dilation operation works on boolean as well as scalar values.
+    #
+    # @param [Integer] n Size of dilation operator.
+    #
+    # @return [Node] Result of operation.
+    def dilate( n = 3 )
+      spread( n ).diagonal { |m,x| m.major x }
+    end
+
     # Sobel operator
     #
     # @param [Integer] direction Orientation of Sobel filter.
@@ -524,6 +574,42 @@ module Hornetseye
       end.force
     end
 
+    # Gaussian blur
+    #
+    # @param [Float] sigma Spread of Gauss bell.
+    # @param [Float] max_error Error of approximated filter.
+    #
+    # @return [Node] Result of filter operation.
+    def gauss_blur( sigma, max_error = 1.0 / 0x100 )
+      filter_type = DFLOAT.align typecode
+      filter = Sequence[ *Array.gauss_blur_filter( sigma, max_error / dimension ) ].
+        to_type filter_type
+      ( dimension - 1 ).downto( 0 ).inject self do |retval,i|
+        retval.convolve filter
+      end
+    end
+
+    # Gauss gradient
+    #
+    # @param [Float] sigma Spread of Gauss gradient.
+    # @param [Integer] direction Orientation of Gauss gradient.
+    # @param [Float] max_error Error of approximated filter.
+    #
+    # @return [Node] Result of filter operation.
+    def gauss_gradient( sigma, direction, max_error = 1.0 / 0x100 )
+      filter_type = DFLOAT.align typecode
+      gradient =
+        Sequence[ *Array.gauss_gradient_filter( sigma, max_error / dimension ) ].
+        to_type filter_type
+      blur =
+        Sequence[ *Array.gauss_blur_filter( sigma, max_error / dimension ) ].
+        to_type filter_type
+      ( dimension - 1 ).downto( 0 ).inject self do |retval,i|
+        filter = i == direction ? gradient : blur
+        retval.convolve filter
+      end.force
+    end
+
     # Compute histogram of this array
     #
     # @overload histogram( *ret_shape, options = {} )
@@ -586,7 +672,7 @@ module Hornetseye
             inject { |a,b| a.and b }
         end.conditional Lut.new( *( field + [ self ] ) ), options[ :default ]
       else
-        field.lut self
+        field.lut self, :safe => false
       end
     end
 

data/test/tc_multiarray.rb

@@ -371,6 +371,12 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_equal M[ [ 6 ] ], M[ [ C( 1, 2, 3 ) ] ].collect { |x| x.r + x.g + x.b }
   end
 
+  def test_each
+    a = []
+    M[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].each { |x| a << x }
+    assert_equal [ 1, 2, 3, 4, 5, 6 ], a
+  end
+
   def test_sum
     m = M[ [ 1, 2, 3 ], [ 4, 5, 6 ] ]
     assert_equal 21, sum { |i,j| m[ i, j ] }
@@ -432,6 +438,16 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_raise( RuntimeError ) { S[ 1, 2, 3 ].convolve f }
   end
 
+  def test_erode
+    assert_equal [ [ 0, 0, 0 ], [ 0, -1, -1 ], [ 0, -1, -1 ] ],
+                 M[ [ 1, 0, 0 ], [ 0, 0, 0 ], [ 0, 0, -1 ] ].erode.to_a
+  end
+
+  def test_dilate
+    assert_equal [ [ 1, 1, 0 ], [ 1, 1, 0 ], [ 0, 0, 0 ] ],
+                 M[ [ 1, 0, 0 ], [ 0, 0, 0 ], [ 0, 0, -1 ] ].dilate.to_a
+  end
+
   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 ] ],

data/test/tc_sequence.rb

@@ -300,6 +300,12 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal S[ 6 ], S[ C( 1, 2, 3 ) ].collect { |x| x.r + x.g + x.b }
   end
 
+  def test_each
+    a = []
+    S[ 1, 2, 3 ].each { |x| a << x }
+    assert_equal [ 1, 2, 3 ], a
+  end
+
   def test_sum
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal 6, t[ 1, 2, 3 ].sum
@@ -366,6 +372,22 @@ class TC_Sequence < Test::Unit::TestCase
                  convolve( S[ C( 1, 0, 0 ), C( 0, 1, 0 ), C( 0, 0, 1 ) ] )
   end
 
+  def test_erode
+    [ O, I ].each do |t|
+      assert_equal [ 1, 1, 1, 2, 2, 2 ], S( t, 6 )[ 1, 1, 2, 3, 2, 2 ].erode.to_a
+    end
+    assert_equal S[ false, false, true, false, false ],
+                 S[ false, true, true, true, false ].erode
+  end
+
+  def test_dilate
+    [ O, I ].each do |t|
+      assert_equal [ 1, 2, 3, 3, 3, 2 ], S( t, 6 )[ 1, 1, 2, 3, 2, 2 ].dilate.to_a
+    end
+    assert_equal S[ false, true, true, true, false ],
+                 S[ false, false, true, false, false ].dilate
+  end
+
   def test_sobel
     assert_equal [ 0, -1, 0, 1, 0 ], S[ 0, 0, 1, 0, 0 ].sobel( 0 ).to_a
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 18
-  - 1
-  version: 0.18.1
+  - 19
+  - 0
+  version: 0.19.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +00:00
+date: 2011-01-25 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,52 +57,52 @@ files:
 - README.md
 - COPYING
 - .document
-- lib/multiarray/object.rb
-- lib/multiarray/operations.rb
-- lib/multiarray/variable.rb
-- lib/multiarray/gcctype.rb
 - lib/multiarray/bool.rb
-- lib/multiarray/element.rb
-- 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
-- lib/multiarray/list.rb
-- lib/multiarray/pointer.rb
-- lib/multiarray/lambda.rb
-- lib/multiarray/sequence.rb
-- lib/multiarray/methods.rb
-- lib/multiarray/integral.rb
 - lib/multiarray/multiarray.rb
-- lib/multiarray/unmask.rb
 - lib/multiarray/node.rb
-- lib/multiarray/histogram.rb
-- lib/multiarray/mask.rb
-- lib/multiarray/malloc.rb
-- lib/multiarray/index.rb
+- lib/multiarray/gccvalue.rb
 - lib/multiarray/rgb.rb
+- lib/multiarray/object.rb
 - lib/multiarray/gcccontext.rb
-- lib/multiarray/composite.rb
-- lib/multiarray/store.rb
+- lib/multiarray/unmask.rb
 - lib/multiarray/elementwise.rb
+- lib/multiarray/diagonal.rb
+- lib/multiarray/index.rb
+- lib/multiarray/variable.rb
+- lib/multiarray/lambda.rb
+- lib/multiarray/integral.rb
+- lib/multiarray/pointer.rb
+- lib/multiarray/element.rb
+- lib/multiarray/composite.rb
 - lib/multiarray/lookup.rb
-- lib/multiarray/gccvalue.rb
+- lib/multiarray/sequence.rb
+- lib/multiarray/gcctype.rb
+- lib/multiarray/shortcuts.rb
 - lib/multiarray/complex.rb
-- lib/multiarray/random.rb
+- lib/multiarray/mask.rb
+- lib/multiarray/malloc.rb
 - lib/multiarray/lut.rb
+- lib/multiarray/int.rb
+- lib/multiarray/gcccache.rb
+- lib/multiarray/inject.rb
+- lib/multiarray/list.rb
+- lib/multiarray/gccfunction.rb
+- lib/multiarray/histogram.rb
+- lib/multiarray/float.rb
+- lib/multiarray/random.rb
+- lib/multiarray/operations.rb
+- lib/multiarray/store.rb
+- lib/multiarray/methods.rb
 - lib/multiarray.rb
 - test/ts_multiarray.rb
+- test/tc_int.rb
+- test/tc_object.rb
 - test/tc_float.rb
-- test/tc_sequence.rb
-- test/tc_rgb.rb
+- test/tc_lazy.rb
 - test/tc_multiarray.rb
 - test/tc_bool.rb
-- test/tc_object.rb
-- test/tc_int.rb
-- test/tc_lazy.rb
+- test/tc_rgb.rb
+- test/tc_sequence.rb
 has_rdoc: yard
 homepage: http://wedesoft.github.com/multiarray/
 licenses: []
@@ -136,11 +136,11 @@ signing_key:
 specification_version: 3
 summary: Multi-dimensional and uniform Ruby arrays
 test_files: 
+- test/tc_int.rb
+- test/tc_object.rb
 - test/tc_float.rb
-- test/tc_sequence.rb
-- test/tc_rgb.rb
+- test/tc_lazy.rb
 - test/tc_multiarray.rb
 - test/tc_bool.rb
-- test/tc_object.rb
-- test/tc_int.rb
-- test/tc_lazy.rb
+- test/tc_rgb.rb
+- test/tc_sequence.rb