multiarray 0.15.1 → 0.15.2

data/Rakefile

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

data/lib/multiarray.rb

@@ -173,7 +173,7 @@ class Object
   # @see FalseClass#conditional
   # @see NilClass#conditional
   def conditional( a, b )
-    a
+    a.is_a?( Proc ) ? a.call : a
   end
 
 end
@@ -232,7 +232,7 @@ class NilClass
   # @see Object#conditional
   # @see FalseClass#conditional
   def conditional( a, b )
-    b
+    b.is_a?( Proc ) ? b.call : b
   end
 
   # Check whether this term is compilable
@@ -302,7 +302,7 @@ class FalseClass
   # @see Object#conditional
   # @see NilClass#conditional
   def conditional( a, b )
-    b
+    b.is_a?( Proc ) ? b.call : b
   end
 
 end

data/lib/multiarray/gccvalue.rb

@@ -288,7 +288,11 @@ module Hornetseye
     #
     # @private
     def conditional( a, b )
-      GCCValue.new @function, "( #{self} ) ? ( #{a} ) : ( #{b} )"
+      if a.is_a?( Proc ) and b.is_a?( Proc )
+        conditional a.call, b.call
+      else
+        GCCValue.new @function, "( #{self} ) ? ( #{a} ) : ( #{b} )"
+      end
     end
 
     # Create code for conditional selection of RGB value

data/lib/multiarray/operations.rb

@@ -203,7 +203,9 @@ module Hornetseye
         a.dimension == 0 and a.variables.empty? and
         b.dimension == 0 and b.variables.empty?
         target = array_type.cond a.array_type, b.array_type
-        target.new simplify.get.conditional( a.simplify.get, b.simplify.get )
+        #target.new simplify.get.conditional( a.simplify.get, b.simplify.get )
+        target.new simplify.get.conditional( proc { a.simplify.get },
+                                             proc { b.simplify.get } )
       else
         Hornetseye::ElementWise( lambda { |x,y,z| x.conditional y, z }, :conditional,
                                  lambda { |t,u,v| t.cond u, v } ).
@@ -580,7 +582,7 @@ module Hornetseye
           Hornetseye::lazy( *shape ) { |*args| args[i] }
         end
       end
-      warp *field
+      warp *field, :safe => false
     end
 
     def shift( *offset )
@@ -636,9 +638,18 @@ module Hornetseye
       field = ( 0 ... dimension ).collect do |i|
         Hornetseye::lazy( *ret_shape ) { |*args| args[i] * rate[i] + offset[i] }
       end
-      warp *field
+      warp *field, :safe => false
     end
 
+    #def scale( *ret_shape )
+    #  field = ( 0 ... dimension ).collect do |i|
+    #    Hornetseye::lazy( *ret_shape ) do |*args|
+    #      ( args[i] * shape[i].to_f / ret_shape[i] ).to_type INT
+    #    end
+    #  end
+    #  Hornetseye::lazy { to_type typecode.float }.integral
+    #end
+
   end
 
   class Node

data/test/tc_multiarray.rb

@@ -479,6 +479,18 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_raise( RuntimeError ) { [ S[ 0, 1 ], S[ 0, 1 ] ].lut S[ 1, 2 ] }
   end
 
+  def test_warp
+    [ O, I ].each do |t1|
+      [ O, I ].each do |t2|
+        z = t1.default
+        assert_equal M( t1, 3, 3 )[ [ 1, 2, z ], [ 3, 4, z ], [ z, z, z ] ],
+                     M( t1, 2, 2 )[ [ 1, 2 ], [ 3, 4 ] ].
+                     warp( M( t2, 3, 3 )[ [ 0, 1, 2 ], [ 0, 1, 2 ], [ 0, 1, 2 ] ],
+                           M( t2, 3, 3 )[ [ 0, 0, 0 ], [ 1, 1, 1 ], [ 2, 2, 2 ] ] )
+      end
+    end
+  end
+
   def test_flip
     [ O, I ].each do |t|
       assert_equal M( t, 3, 2 )[ [ 3, 2, 1 ], [ 6, 5, 4 ] ],

data/test/tc_sequence.rb

@@ -371,14 +371,14 @@ class TC_Sequence < Test::Unit::TestCase
     assert_raise( RuntimeError ) { S[ 1, 2 ].lut S[ 0, 1 ] }
   end
 
-  #def test_warp
-  #  [ O, I ].each do |t1|
-  #    [ O, I ].each do |t2|
-  #      assert_equal S( t1, 3 )[ 1, 2, t1.default ],
-  #                   S( t1, 2 )[ 1, 2 ].warp( S( t2, 3 )[ 0, 1, 2 ] )
-  #    end
-  #  end
-  #end
+  def test_warp
+    [ O, I ].each do |t1|
+      [ O, I ].each do |t2|
+        assert_equal S( t1, 3 )[ 1, 2, t1.default ],
+                     S( t1, 2 )[ 1, 2 ].warp( S( t2, 3 )[ 0, 1, 2 ] )
+      end
+    end
+  end
 
   def test_flip
     [ O, I ].each do |t|

metadata

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