multiarray 0.10.5 → 0.11.0

data/Rakefile

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

data/lib/multiarray/multiarray.rb

@@ -46,8 +46,12 @@ module Hornetseye
 
       def import( typecode, string, *shape )
         t = Hornetseye::MultiArray typecode, *shape
-        memory = Malloc.new t.storage_size
-        memory.write string
+        if string.is_a? Malloc
+          memory = string
+        else
+          memory = Malloc.new t.storage_size
+          memory.write string
+        end
         t.new memory
       end
 

data/lib/multiarray/sequence.rb

@@ -34,8 +34,12 @@ module Hornetseye
 
       def import( typecode, string, size )
         t = Hornetseye::Sequence typecode, size
-        memory = Malloc.new t.storage_size
-        memory.write string
+        if string.is_a? Malloc
+          memory = string
+        else
+          memory = Malloc.new t.storage_size
+          memory.write string
+        end
         t.new memory
       end
 

data/test/tc_multiarray.rb

@@ -30,6 +30,7 @@ class TC_MultiArray < Test::Unit::TestCase
   X = Hornetseye::DCOMPLEX
   S = Hornetseye::Sequence
   M = Hornetseye::MultiArray
+  Malloc = Hornetseye::Malloc
 
   def C( *args )
     Hornetseye::RGB *args
@@ -167,10 +168,12 @@ class TC_MultiArray < Test::Unit::TestCase
   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
+    str = "\001\000\000\000\002\000\000\000\003\000\000\000" +
+          "\004\000\000\000\005\000\000\000\006\000\000\000"
+    assert_equal [ [ 1, 2, 3 ], [ 4, 5, 6 ] ], M.import( I, str, 3, 2 ).to_a
+    m = Malloc.new str.bytesize
+    m.write str
+    assert_equal [ [ 1, 2, 3 ], [ 4, 5, 6 ] ], M.import( I, m, 3, 2 ).to_a
   end
 
   def test_at_assign

data/test/tc_sequence.rb

@@ -29,6 +29,7 @@ class TC_Sequence < Test::Unit::TestCase
   S = Hornetseye::Sequence
   C = Hornetseye::INTRGB
   X = Hornetseye::DCOMPLEX
+  Malloc = Hornetseye::Malloc
 
   def S( *args )
     Hornetseye::Sequence *args
@@ -145,9 +146,12 @@ class TC_Sequence < Test::Unit::TestCase
   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 ).
+    str = "\001\000\000\000\002\000\000\000\003\000\000\000"
+    assert_equal [ 1, 2, 3 ], S.import( I, str, 3 ).
                  to_a
+    m = Malloc.new str.bytesize
+    m.write str
+    assert_equal [ 1, 2, 3 ], S.import( I, m, 3 ).to_a
   end
 
   def test_at_assign

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 5
-  version: 0.10.5
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +01:00
+date: 2010-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency