multiarray 0.6.1 → 0.8.0

data/README.md

@@ -1,3 +1,3 @@
-MultiArray
+multiarray
 ==========
 This Ruby-extension defines the class {Hornetseye::MultiArray} and other native datatypes. {Hornetseye::MultiArray} provides multi-dimensional Ruby arrays with elements of same type. The extension is designed to be mostly compatible with Masahiro Tanaka's NArray. However it allows the definition of custom element types and operations on them. This work was also inspired by Ronald Garcia's boost::multi_array and by Todd Veldhuizen's Blitz++.

data/Rakefile

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

data/lib/multiarray/multiarray.rb

@@ -44,6 +44,13 @@ module Hornetseye
         end
       end
 
+      def import( typecode, string, *shape )
+        t = Hornetseye::MultiArray typecode, *shape
+        memory = Malloc.new t.storage_size
+        memory.write string
+        t.new memory
+      end
+
       # Convert Ruby array to uniform multi-dimensional array
       #
       # Type matching is used to find a common element type. Furthermore the required

data/lib/multiarray/node.rb

@@ -358,6 +358,10 @@ module Hornetseye
       array_type.size
     end
 
+    def memory
+      nil
+    end
+
     # Check whether this object is an empty array.
     #
     # @return [Boolean] Returns whether this object is an empty array.

data/lib/multiarray/sequence.rb

@@ -32,6 +32,13 @@ module Hornetseye
         MultiArray.new typecode, size
       end
 
+      def import( typecode, string, size )
+        t = Hornetseye::Sequence typecode, size
+        memory = Malloc.new t.storage_size
+        memory.write string
+        t.new memory
+      end
+
       # Convert array to uniform array
       #
       # A native type which fits all elements is determined and used to create

data/lib/multiarray/shortcuts.rb

@@ -17,7 +17,7 @@
 # Namespace of Hornetseye computer vision library
 module Hornetseye
 
-  module ConstructorShortcuts
+  module MultiArrayConstructor
 
     def method_missing( name, *args )
       if name.to_s =~ /^[a-z]+$/
@@ -39,11 +39,11 @@ module Hornetseye
 
   end
 
-  Sequence.extend ConstructorShortcuts
+  Sequence.extend MultiArrayConstructor
 
-  MultiArray.extend ConstructorShortcuts
+  MultiArray.extend MultiArrayConstructor
 
-  module ConversionShortcuts
+  module MultiArrayConversion
 
     def method_missing( name, *args )
       if name.to_s =~ /^to_[a-z]+$/
@@ -65,7 +65,7 @@ module Hornetseye
 
   end
 
-  Node.class_eval { include ConversionShortcuts }
+  Node.class_eval { include MultiArrayConversion }
 
 end
 

data/test/tc_multiarray.rb

@@ -166,6 +166,13 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_equal 6, M( O, 3, 2 ).new.size
   end
 
+  def test_import
+    assert_equal [ [ 1, 2, 3 ], [ 4, 5, 6 ] ],
+                 M.import( I, "\001\000\000\000\002\000\000\000\003\000\000\000" +
+                           "\004\000\000\000\005\000\000\000\006\000\000\000",
+                           3, 2 ).to_a
+  end
+
   def test_at_assign
     [ M( O, 3, 2 ), M( I, 3, 2 ) ].each do |t|
       m = t.new
@@ -331,11 +338,21 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_equal M[ [ 1, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].r
     assert_equal M[ [ 2, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].g
     assert_equal M[ [ 3, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].b
+    #assert_equal M[ [ 1, 4 ], [ 5, 6 ] ],
+    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.r }
+    #assert_equal M[ [ 2, 4 ], [ 5, 6 ] ],
+    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.g }
+    #assert_equal M[ [ 3, 4 ], [ 5, 6 ] ],
+    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.b }
   end
 
   def test_real_imag
     assert_equal M[ [ 1, 3 ], [ 4, 5 ] ], M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].real
     assert_equal M[ [ 2, 0 ], [ 0, 0 ] ], M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].imag
+    #assert_equal M[ [ 1, 3 ], [ 4, 5 ] ],
+    #             M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.real }
+    #assert_equal M[ [ 2, 0 ], [ 0, 0 ] ],
+    #             M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.imag }
   end
 
   def test_inject

data/test/tc_sequence.rb

@@ -144,6 +144,12 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal 3, S[ 1, 2, 3 ].size
   end
 
+  def test_import
+    assert_equal [ 1, 2, 3 ],
+                 S.import( I, "\001\000\000\000\002\000\000\000\003\000\000\000", 3 ).
+                 to_a
+  end
+
   def test_at_assign
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       s = t.new
@@ -214,6 +220,9 @@ class TC_Sequence < Test::Unit::TestCase
       assert_equal [ 1, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].r.to_a
       assert_equal [ 2, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].g.to_a
       assert_equal [ 3, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].b.to_a
+      #assert_equal [ 1, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.r }.to_a
+      #assert_equal [ 2, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.g }.to_a
+      #assert_equal [ 3, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.b }.to_a
       s = t[ 0, 0, 0 ]
       assert_equal 1, s.r = 1
       assert_equal S[ 1, 2, 3 ], s.g = S[ 1, 2, 3 ]
@@ -233,6 +242,8 @@ class TC_Sequence < Test::Unit::TestCase
     [ S( O, 2 ), S( X, 2 ) ].each do |t|
       assert_equal [ 1, 3 ], t[ X( 1, 2 ), 3 ].real.to_a
       assert_equal [ 2, 0 ], t[ X( 1, 2 ), 3 ].imag.to_a
+      #assert_equal [ 1, 3 ], t[ X( 1, 2 ), 3 ].collect { |x| x.real }.to_a
+      #assert_equal [ 2, 0 ], t[ X( 1, 2 ), 3 ].collect { |x| x.imag }.to_a
       s = t[ 0, 0 ]
       assert_equal 1, s.real = 1
       assert_equal S[ 2, 3 ], s.imag = S[ 2, 3 ]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +01:00
+date: 2010-10-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency