multiarray 0.10.1 → 0.10.2

data/Rakefile

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

data/lib/multiarray/gccvalue.rb

@@ -173,6 +173,28 @@ module Hornetseye
       GCCValue.new @function, "( #{self} ) ? ( #{a} ) : ( #{b} )"
     end
 
+    def conditional_with_rgb( a, b )
+      if a.is_a?( RGB ) or b.is_a?( RGB )
+        Hornetseye::RGB( conditional( a.r, b.r ), conditional( a.g, b.g ),
+                         conditional( a.b, b.b ) )
+      else
+        conditional_without_rgb a, b
+      end
+    end
+
+    alias_method_chain :conditional, :rgb
+
+    def conditional_with_complex( a, b )
+      if a.is_a?( InternalComplex ) or b.is_a?( InternalComplex )
+        InternalComplex.new conditional( a.real, b.real ),
+                            conditional( a.imag, b.imag )
+      else
+        conditional_without_complex a, b
+      end
+    end
+
+    alias_method_chain :conditional, :complex
+
     define_unary_op :not, '!'
     define_unary_op :~
     define_unary_op :-@, :-

data/lib/multiarray/operations.rb

@@ -423,9 +423,10 @@ module Hornetseye
             raise "#{i+1}th dimension of index must be in 0 ... #{table.shape[i]} " +
                   "(but was #{range.begin})"
           end
-          if range.end >= table.shape[ i ]
-            raise "#{i+1}th dimension of index must be in 0 ... #{table.shape[i]} " +
-                  "(but was #{range.end})"
+          offset = table.dimension - source.shape.first
+          if range.end >= table.shape[ i + offset ]
+            raise "#{i+1}th dimension of index must be in 0 ... " +
+                  "#{table.shape[ i + offset ]} (but was #{range.end})"
           end
         end
       end

data/lib/multiarray/rgb.rb

@@ -179,6 +179,10 @@ module Hornetseye
 
   end
 
+end
+
+module Hornetseye
+
   class RGB_ < Composite
 
     class << self

data/test/tc_multiarray.rb

@@ -442,11 +442,14 @@ class TC_MultiArray < Test::Unit::TestCase
                  M[ [ 0, 1 ], [ 2, 0 ] ].lut( S[ 1, 2, 3, 4 ] )
     assert_equal M[ 1, 3, 4 ],
                  M[ [ 0, 0 ], [ 0, 1 ], [ 1, 1 ] ].lut( M[ [ 1, 2 ], [ 3, 4 ] ] )
+    assert_equal M[ [ 3, 4 ], [ 1, 2 ] ],
+                 M[ [ 1 ], [ 0 ] ].lut( M[ [ 1, 2 ], [ 3, 4 ] ] )
     assert_raise( RuntimeError ) { S[ 0, 1, 2 ].lut M[ [ 1, 2 ], [ 3, 4 ] ] }
     assert_raise( RuntimeError ) { M[ [ -1, 0 ] ].lut M[ [ 1, 2 ] ] }
     assert_raise( RuntimeError ) { M[ [ 0, -1 ] ].lut M[ [ 1, 2 ] ] }
     assert_raise( RuntimeError ) { M[ [ 2, 0 ] ].lut M[ [ 1, 2 ] ] }
     assert_raise( RuntimeError ) { M[ [ 0, 1 ] ].lut M[ [ 1, 2 ] ] }
+    assert_raise( RuntimeError ) { M[ [ 1 ], [ 2 ] ].lut M[ [ 1, 2 ], [ 3, 4 ] ] }
   end
 
   def test_zero

data/test/tc_sequence.rb

@@ -580,6 +580,10 @@ class TC_Sequence < Test::Unit::TestCase
     assert_equal S[ -1, 2 ], S[ false, true ].conditional( S[ 1, 2 ], -1 )
     assert_equal S[ -1, 1 ], S[ false, true ].conditional( 1, S[ -1, -2 ] )
     assert_equal S[ -1, 2 ], S[ false, true ].conditional( S[ 1, 2 ], S[ -1, -2 ] )
+    assert_equal S[ C( 4, 5, 6 ), C( 1, 2, 3 ) ],
+                 S[ false, true ].conditional( C( 1, 2, 3 ), C( 4, 5, 6 ) )
+    assert_equal S[ X( 3, 4 ), X( 1, 2 ) ],
+                 S[ false, true ].conditional( X( 1, 2 ), X( 3, 4 ) )
     assert_raise( RuntimeError ) { S[ false, true ].conditional( S[ 1, 2 ], S[ 1 ] ) }
     assert_raise( RuntimeError ) { S[ false, true ].conditional( S[ 1 ], S[ 1, 2 ] ) }
     assert_raise( RuntimeError ) { S[ false ].conditional( S[ 1, 2 ], S[ 1, 2 ] ) }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +01:00
+date: 2010-10-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency