multiarray 0.15.0 → 0.15.1

data/Rakefile

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

data/lib/multiarray/operations.rb

@@ -152,6 +152,40 @@ module Hornetseye
 
     alias_method_chain :to_type, :rgb
 
+    # Skip type conversion if it has no effect
+    #
+    # This operation is a special case handling type conversions to the same type.
+    #
+    # @param [Class] dest Element type to convert to.
+    #
+    # @return [Node] Array based on the different element type.
+    def to_type_with_identity( dest )
+      if dest == typecode
+        self
+      else
+        to_type_without_identity dest
+      end
+    end
+
+    alias_method_chain :to_type, :identity
+
+    # Get array with same elements but different shape
+    #
+    # The method returns an array with the same elements but with a different shape.
+    # The desired shape must have the same number of elements.
+    #
+    # @param [Array<Integer>] ret_shape Desired shape of return value
+    #
+    # @return [Node] Array with desired shape.
+    def reshape( *ret_shape )
+      target = Hornetseye::MultiArray( typecode, *ret_shape )
+      if target.size != size
+        raise "#{target.size} is of size #{target.size} but should be of size " +
+          "#{size}"
+      end
+      target.new memorise.memory
+    end
+
     # Element-wise conditional selection of values
     #
     # @param [Node] a First array of values.

data/test/tc_multiarray.rb

@@ -674,6 +674,18 @@ class TC_MultiArray < Test::Unit::TestCase
                  M( I, 2, 2 )[ [ 1, 2 ], [ 3, 4 ] ].to_intrgb
   end
 
+  def test_reshape
+    [ O, I ].each do |t|
+      assert_equal M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ],
+                   S( t, 6 )[ 1, 2, 3, 4, 5, 6 ].reshape( 3, 2 )
+      assert_equal S( t, 6 )[ 1, 2, 3, 4, 5, 6 ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].reshape( 6 )
+      assert_equal M( t, 2, 3 )[ [ 1, 2 ], [ 3, 4 ], [ 5, 6 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].reshape( 2, 3 )
+      assert_raise( RuntimeError ) { M( t, 2, 2 )[ [ 1, 2 ], [ 3, 4 ] ].reshape 3 }
+    end
+  end
+
   def test_integral
     assert_equal M( O, 3, 2 )[ [ 1, 3, 6 ], [ 5, 12, 21 ] ],
                  M( O, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].integral

data/test/tc_sequence.rb

@@ -867,6 +867,14 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal S( C, 3 )[ 1, 2, 3 ], S( I, 3 )[ 1, 2, 3 ].to_intrgb
   end
 
+  def test_reshape
+    [ O, I ].each do |t|
+      assert_equal S( t, 3 )[ 1, 2, 3 ], S( t, 3 )[ 1, 2, 3 ].reshape( 3 )
+      assert_raise( RuntimeError ) { S( t, 3 )[ 1, 2, 3 ].reshape 2 }
+      assert_raise( RuntimeError ) { S( t, 3 )[ 1, 2, 3 ].reshape 4 }
+    end
+  end
+
   def test_integral
     assert_equal S( O, 3 )[ 1, 3, 6 ], S( O, 3 )[ 1, 2, 3 ].integral
     assert_equal S( I, 3 )[ 1, 3, 6 ], S( I, 3 )[ 1, 2, 3 ].integral

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 15
-  - 0
-  version: 0.15.0
+  - 1
+  version: 0.15.1
 platform: ruby
 authors: 
 - Jan Wedekind