multiarray 0.6.0 → 0.6.1

data/Rakefile

@@ -6,11 +6,11 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.6.0'
+PKG_VERSION = '0.6.1'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]
-PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', 'TODO', '.document' ] +
+PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
             RB_FILES + TS_FILES + TC_FILES
 BIN_FILES = [ 'README.md', 'COPYING', '.document' ] +
             RB_FILES + TS_FILES + TC_FILES
@@ -20,7 +20,7 @@ AUTHOR = %q{Jan Wedekind}
 EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/multiarray/}
 
-$SITELIBDIR = Config::CONFIG[ 'sitelibdir' ]
+$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
 
 task :default => :all
 
@@ -68,6 +68,7 @@ Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
 end
 
 begin
+  require 'rubygems'
   require 'rubygems/builder'
   $SPEC = Gem::Specification.new do |s|
     s.name = PKG_NAME

data/lib/multiarray/malloc.rb

@@ -41,13 +41,6 @@ module Hornetseye
       value
     end
 
-    # Display information about this object.
-    #
-    # @return [String] String with information about this object.
-    def to_s
-      inspect
-    end
-
   end
 
 end

data/lib/multiarray/operations.rb

@@ -102,6 +102,22 @@ module Hornetseye
       end
     end
 
+    def to_type_with_rgb( dest )
+      if typecode < RGB_
+        if dest < FLOAT_
+          lazy { r * 0.299 + g * 0.587 + b * 0.114 }.to_type dest
+        elsif dest < INT_
+          lazy { ( r * 0.299 + g * 0.587 + b * 0.114 ).round }.to_type dest
+        else
+          to_type_without_rgb dest
+        end
+      else
+        to_type_without_rgb dest
+      end
+    end
+
+    alias_method_chain :to_type, :rgb
+
     def conditional( a, b )
       unless a.is_a? Node
         a = Node.match( a, b.is_a?( Node ) ? b : nil ).new a

data/lib/multiarray/rgb.rb

@@ -133,9 +133,13 @@ module Hornetseye
 
     define_unary_op  :~
     define_unary_op  :-@
+    define_unary_op  :floor
+    define_unary_op  :ceil
+    define_unary_op  :round
     define_binary_op :+
     define_binary_op :-
     define_binary_op :*
+    define_binary_op :**
     define_binary_op :/
     define_binary_op :%
     define_binary_op :&

data/lib/multiarray/sequence.rb

@@ -295,7 +295,7 @@ module Hornetseye
       end
 
       def new( memory = nil )
-        MultiArray.new typecode, *shape, :memory => memory
+        MultiArray.new typecode, *( shape + [ :memory => memory ] )
       end
 
       def compilable?

data/test/tc_sequence.rb

@@ -509,6 +509,7 @@ class TC_Sequence < Test::Unit::TestCase
 
   def test_pow
     assert_equal [ 1, 4, 9 ], ( S[ 1, 2, 3 ] ** 2 ).to_a
+    assert_equal [ C( 2, 4, 8 ) ], ( 2 ** S[ C( 1, 2, 3 ) ] ).to_a
     assert_in_delta 0.0, ( ( S( X, 1 )[ X( 1, 2 ) ] ** 2 )[ 0 ] - X( -3, 4 ) ).abs,
                     1.0e-5
     assert_in_delta 0.0, ( Math::E ** S( X, 1 )[ X( 0, Math::PI ) ][ 0 ] + 1 ).abs,
@@ -545,14 +546,17 @@ class TC_Sequence < Test::Unit::TestCase
 
   def test_floor
     assert_equal S[ 0.0, 0.0, 1.0 ], S[ 0.3, 0.7, 1.3 ].floor
+    assert_equal S[ C( 0.0, 0.0, 1.0 ) ], S[ C( 0.3, 0.7, 1.3 ) ].floor
   end
 
   def test_ceil
     assert_equal S[ 1.0, 1.0, 2.0 ], S[ 0.3, 0.7, 1.3 ].ceil
+    assert_equal S[ C( 1.0, 1.0, 2.0 ) ], S[ C( 0.3, 0.7, 1.3 ) ].ceil
   end
 
   def test_round
     assert_equal S[ 0.0, 1.0, 1.0 ], S[ 0.3, 0.7, 1.3 ].round
+    assert_equal S[ C( 0.0, 1.0, 1.0 ) ], S[ C( 0.3, 0.7, 1.3 ) ].round
   end
 
   def test_cond

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +01:00
+date: 2010-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ files:
 - Rakefile
 - README.md
 - COPYING
-- TODO
 - .document
 - lib/multiarray/object.rb
 - lib/multiarray/operations.rb

data/TODO

@@ -1,32 +0,0 @@
-# weighted histograms
-# lut/warp, histogram: clipping, masks?
-# lut, histogram with x and y coming from different tables?
-# pointer-increments for better efficiency, optimize Node#diagonal
-# random numbers
-# Geometric Hashing? Bounded Hough Transform!!! RANSAC?
-# each, each_with_index, multi_each, collect, multi_collect, zip?
-
-# downsampling after correlation?
-# YARD documentation with pictures, demo video, @group ..., @endgroup
-# CK_Thesis.pdf: tensor voting
-# maxint -> native_int
-
-# downsampling after correlation?
-
-a = lazy( 16, 32 ) { |i,j| Sequence[ i, j ] } # ???
-a = lazy( 8, 8 ) { |i,j| Sequence[ i, a[j] * sin( i + b[j] ) ] }.hist 8, 8
-parallel { ... }
-
-lines:
-[ i, a[j] * sin( i + b[j] ) ].hist
-
-lines:
-lazy { |i,j| i.zip( a[j] * sin( i + b[j] ) ) }.histogram 32, 20
-
-lines:
-lazy { |i,j| Sequence[ i, a[j] * sin( i + b[j] ) ] }.histogram 32, 20
-combined histograms?
-
-circle:
-[ sin( i ) * r, cos( i ) * r ].hist
-