multiarray 0.14.1 → 0.14.2

data/Rakefile

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

data/lib/multiarray.rb

@@ -539,6 +539,10 @@ class Array
 
 end
 
+begin
+  require 'continuation'
+rescue Exception
+end
 require 'complex'
 require 'malloc'
 require 'rbconfig'
@@ -644,7 +648,8 @@ module Hornetseye
     options = shape.last.is_a?( Hash ) ? shape.pop : {}
     arity = options[ :arity ] || [ action.arity, shape.size ].max
     if arity <= 0
-      action.call
+      term = action.call
+      term.is_a?( Node ) ? term.to_type( term.typecode.maxint ) : term
     else
       index = Variable.new shape.empty? ? Hornetseye::INDEX( nil ) :
                            Hornetseye::INDEX( shape.pop )

data/lib/multiarray/operations.rb

@@ -329,7 +329,7 @@ module Hornetseye
     #
     # @return [Object] Sum of array.
     def sum
-      inject { |a,b| a + b }
+      Hornetseye::lazy { to_type typecode.maxint }.inject { |a,b| a + b }
     end
 
     # Find range of values of array
@@ -502,11 +502,6 @@ module Hornetseye
     #
     # @return [Node] The result of the lookup operation.
     def warp( *field )
-
-      #elsif shape.first > lut.dimension or dimension == 1
-      #  reshape( *( [ 1 ] + shape ) ).map lut, options
-
-
       options = field.last.is_a?( Hash ) ? field.pop : {}
       options = { :safe => true, :default => typecode.default }.merge options
       if options[ :safe ]
@@ -538,6 +533,57 @@ module Hornetseye
       left
     end
 
+    # Mirror the array
+    #
+    # @param [Array<Integer>] dimensions The dimensions which should be flipped.
+    #
+    # @return [Node] The result of flipping the dimensions.
+    def flip( *dimensions )
+      field = ( 0 ... dimension ).collect do |i|
+        if dimensions.member? i
+          Hornetseye::lazy( *shape ) { |*args| shape[i] - 1 - args[i] }
+        else
+          Hornetseye::lazy( *shape ) { |*args| args[i] }
+        end
+      end
+      warp *field
+    end
+
+    def shift( *offset )
+      if offset.size != shape.size
+        raise "#{offset.size} offset(s) were given but array has " +
+              "#{shape.size} dimensions"
+      end
+      retval = array_type.new
+      target, source, open, close = [], [], [], []
+      ( shape.size - 1 ).step( 0, -1 ) do |i|
+        callcc do |pass|
+          delta = offset[i] % shape[i]
+          source[i] = 0 ... shape[i] - delta
+          target[i] = delta ... shape[i]
+          callcc do |c|
+            open[i] = c
+            pass.call
+          end
+          source[i] = shape[i] - delta ... shape[i]
+          target[i] = 0 ... delta
+          callcc do |c|
+            open[i] = c
+            pass.call
+          end
+          close[i].call
+        end
+      end
+      retval[ *target ] = self[ *source ]
+      for i in 0 ... shape.size
+        callcc do |c|
+          close[i] = c
+          open[i].call
+        end
+      end
+      retval
+    end
+
   end
 
   class Node

data/test/tc_multiarray.rb

@@ -479,6 +479,24 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_raise( RuntimeError ) { [ S[ 0, 1 ], S[ 0, 1 ] ].lut S[ 1, 2 ] }
   end
 
+  def test_flip
+    [ O, I ].each do |t|
+      assert_equal M( t, 3, 2 )[ [ 3, 2, 1 ], [ 6, 5, 4 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].flip( 0 )
+      assert_equal M( t, 3, 2 )[ [ 4, 5, 6 ], [ 1, 2, 3 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].flip( 1 )
+      assert_equal M( t, 3, 2 )[ [ 6, 5, 4 ], [ 3, 2, 1 ] ],
+                   M( t, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ].flip( 0, 1 )
+    end
+  end
+
+  def test_shift
+    [ O, I ].each do |t|
+      assert_equal M( t, 2, 2 )[ [ 4, 3 ], [ 2, 1 ] ],
+                   M( t, 2, 2 )[ [ 1, 2 ], [ 3, 4 ] ].shift( 1, 1 )
+    end
+  end
+
   def test_zero
     assert_equal M[ [ false, true ], [ true, false ] ],
                  M[ [ -1, 0 ], [ 0, 1 ] ].zero?

data/test/tc_sequence.rb

@@ -286,11 +286,16 @@ class TC_Sequence < Test::Unit::TestCase
 
   def test_sum
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
+      assert_equal 6, t[ 1, 2, 3 ].sum
       assert_equal 6, sum { |i| t[ 1, 2, 3 ][ i ] }
       assert_equal [ 1, 2, 3 ], sum { || t[ 1, 2, 3 ] }.to_a
     end
+    assert_equal C( 3, 5, 8 ), S[ C( 1, 2, 3 ), C( 2, 3, 5 ) ].sum
     assert_equal C( 3, 5, 8 ), sum { |i| S[ C( 1, 2, 3 ), C( 2, 3, 5 ) ][i] }
+    assert_equal X( 4, 6 ), S[ X( 1, 2 ), X( 3, 4 ) ].sum
     assert_equal X( 4, 6 ), sum { |i| S[ X( 1, 2 ), X( 3, 4 ) ][i] }
+    assert_equal 384, S[ 128, 128, 128 ].sum
+    assert_equal 384, sum { |i| S[ 128, 128, 128 ][i] }
   end
 
   def test_min
@@ -375,6 +380,12 @@ class TC_Sequence < Test::Unit::TestCase
   #  end
   #end
 
+  def test_flip
+    [ O, I ].each do |t|
+      assert_equal S( t, 3 )[ 3, 2, 1 ], S( t, 3 )[ 1, 2, 3 ].flip( 0 )
+    end
+  end
+
   def test_zero
     [ S( O, 3 ), S( I, 3 ) ].each do |t|
       assert_equal [ false, true, false ], t[ -1, 0, 1 ].zero?.to_a

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 1
-  version: 0.14.1
+  - 2
+  version: 0.14.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +00:00
+date: 2010-12-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency