multiarray 0.18.0 → 0.18.1

data/Rakefile

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

data/lib/multiarray/operations.rb

@@ -408,6 +408,19 @@ module Hornetseye
       end
     end
 
+    # Clip values to specified range
+    #
+    # @param [Range] range Allowed range of values.
+    #
+    # @return [Node] Array with clipped values.
+    def clip( range = 0 .. 0xFF )
+      if range.exclude_end?
+        raise "Clipping does not support ranges with end value " +
+              "excluded (such as #{range})"
+      end
+      major( range.begin ).minor range.end
+    end
+
     # Fill array with a value
     #
     # @param [Object] value Value to fill array with.
@@ -478,15 +491,11 @@ module Hornetseye
         raise "Filter has #{filter.dimension} dimension(s) but should " +
               "not have more than #{dimension}"
       end
-      array = self
-      while filter.dimension < dimension
-        filter = Hornetseye::lazy( 1 ) { filter }
-        array = array.unroll
-      end
+      filter = Hornetseye::lazy( 1 ) { filter } while filter.dimension < dimension
       if filter.dimension == 0
-        array * filter
+        self * filter
       else
-        Hornetseye::lazy { |i,j| array[j].product filter[i] }
+        Hornetseye::lazy { |i,j| self[j].product filter[i] }
       end
     end
 
@@ -497,7 +506,22 @@ module Hornetseye
     # @return [Node] Result of convolution.
     def convolve( filter )
       filter = Node.match( filter, typecode ).new filter unless filter.is_a? Node
-      product( filter ).diagonal { |s,x| s + x }
+      array = self
+      ( dimension - filter.dimension ).times { array = array.roll }
+      array.product( filter ).diagonal { |s,x| s + x }
+    end
+
+    # Sobel operator
+    #
+    # @param [Integer] direction Orientation of Sobel filter.
+    #
+    # @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 ] :
+                                  Hornetseye::Sequence( SINT, 3 )[ 1, 2, 1 ]
+        Hornetseye::lazy { retval.convolve filter }
+      end.force
     end
 
     # Compute histogram of this array

data/test/tc_multiarray.rb

@@ -432,6 +432,14 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_raise( RuntimeError ) { S[ 1, 2, 3 ].convolve f }
   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 ] ],
+                 m.sobel( 0 ).to_a
+    assert_equal [ [ -1, -2, -1, 0 ], [ 0, 0, 0, 0 ], [ 1, 2, 1, 0 ] ],
+                 m.sobel( 1 ).to_a
+  end
+
   def test_histogram
     assert_equal [ 0, 1, 1, 2, 0 ],
                  M[ [ 1, 2 ], [ 3, 3 ] ].histogram( 5, :weight => 1 ).to_a

data/test/tc_sequence.rb

@@ -333,6 +333,11 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal [ C( 0.0, 85.0, 255.0 ) ], S[ C( 1, 2, 4 ) ].normalise.to_a
   end
 
+  def test_clip
+    assert_equal [ 0, 1, 3, 4 ], S[ -1, 1, 3, 5 ].clip( 0 .. 4 ).to_a
+    assert_equal [ C( 3, 4, 5 ) ], S[ C( 2, 4, 6 ) ].clip( 3 .. 5 ).to_a
+  end
+
   def test_sum
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal 9, t[ 4, 2, 3 ].sum
@@ -361,6 +366,10 @@ class TC_Sequence < Test::Unit::TestCase
                  convolve( S[ C( 1, 0, 0 ), C( 0, 1, 0 ), C( 0, 0, 1 ) ] )
   end
 
+  def test_sobel
+    assert_equal [ 0, -1, 0, 1, 0 ], S[ 0, 0, 1, 0, 0 ].sobel( 0 ).to_a
+  end
+
   def test_histogram
     [ O, I ].each do |t|
       assert_equal [ 0, 1, 2, 1, 1 ],

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 18
-  - 0
-  version: 0.18.0
+  - 1
+  version: 0.18.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency