multiarray 0.10.3 → 0.10.4

data/Rakefile

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

data/lib/multiarray/complex.rb

@@ -695,10 +695,10 @@ module Hornetseye
     define_unary_op :imag, :scalar
 
     def real_with_decompose
-      if typecode < COMPLEX_
-        decompose 0
-      elsif typecode == OBJECT
+      if typecode == OBJECT or is_a?( Variable )
         real_without_decompose
+      elsif typecode < COMPLEX_
+        decompose 0
       else
         self
       end
@@ -719,10 +719,10 @@ module Hornetseye
     end
 
     def imag_with_decompose
-      if typecode < COMPLEX_
-        decompose 1
-      elsif typecode == OBJECT
+      if typecode == OBJECT or is_a?( Variable )
         imag_without_decompose
+      elsif typecode < COMPLEX_
+        decompose 1
       else
         Hornetseye::lazy( *shape ) { typecode.new( 0 ) }
       end

data/test/tc_multiarray.rb

@@ -338,21 +338,21 @@ class TC_MultiArray < Test::Unit::TestCase
     assert_equal M[ [ 1, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].r
     assert_equal M[ [ 2, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].g
     assert_equal M[ [ 3, 4 ], [ 5, 6 ] ], M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].b
-    #assert_equal M[ [ 1, 4 ], [ 5, 6 ] ],
-    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.r }
-    #assert_equal M[ [ 2, 4 ], [ 5, 6 ] ],
-    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.g }
-    #assert_equal M[ [ 3, 4 ], [ 5, 6 ] ],
-    #             M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.b }
+    assert_equal M[ [ 1, 4 ], [ 5, 6 ] ],
+                 M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.r }
+    assert_equal M[ [ 2, 4 ], [ 5, 6 ] ],
+                 M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.g }
+    assert_equal M[ [ 3, 4 ], [ 5, 6 ] ],
+                 M[ [ C( 1, 2, 3 ), 4 ], [ 5, 6 ] ].collect { |x| x.b }
   end
 
   def test_real_imag
     assert_equal M[ [ 1, 3 ], [ 4, 5 ] ], M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].real
     assert_equal M[ [ 2, 0 ], [ 0, 0 ] ], M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].imag
-    #assert_equal M[ [ 1, 3 ], [ 4, 5 ] ],
-    #             M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.real }
-    #assert_equal M[ [ 2, 0 ], [ 0, 0 ] ],
-    #             M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.imag }
+    assert_equal M[ [ 1, 3 ], [ 4, 5 ] ],
+                 M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.real }
+    assert_equal M[ [ 2, 0 ], [ 0, 0 ] ],
+                 M[ [ X( 1, 2 ), 3 ], [ 4, 5 ] ].collect { |x| x.imag }
   end
 
   def test_inject

data/test/tc_sequence.rb

@@ -220,9 +220,9 @@ class TC_Sequence < Test::Unit::TestCase
       assert_equal [ 1, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].r.to_a
       assert_equal [ 2, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].g.to_a
       assert_equal [ 3, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].b.to_a
-      #assert_equal [ 1, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.r }.to_a
-      #assert_equal [ 2, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.g }.to_a
-      #assert_equal [ 3, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.b }.to_a
+      assert_equal [ 1, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.r }.to_a
+      assert_equal [ 2, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.g }.to_a
+      assert_equal [ 3, 4, 5 ], t[ C( 1, 2, 3 ), 4, 5 ].collect { |x| x.b }.to_a
       s = t[ 0, 0, 0 ]
       assert_equal 1, s.r = 1
       assert_equal S[ 1, 2, 3 ], s.g = S[ 1, 2, 3 ]
@@ -242,8 +242,8 @@ class TC_Sequence < Test::Unit::TestCase
     [ S( O, 2 ), S( X, 2 ) ].each do |t|
       assert_equal [ 1, 3 ], t[ X( 1, 2 ), 3 ].real.to_a
       assert_equal [ 2, 0 ], t[ X( 1, 2 ), 3 ].imag.to_a
-      #assert_equal [ 1, 3 ], t[ X( 1, 2 ), 3 ].collect { |x| x.real }.to_a
-      #assert_equal [ 2, 0 ], t[ X( 1, 2 ), 3 ].collect { |x| x.imag }.to_a
+      assert_equal [ 1, 3 ], t[ X( 1, 2 ), 3 ].collect { |x| x.real }.to_a
+      assert_equal [ 2, 0 ], t[ X( 1, 2 ), 3 ].collect { |x| x.imag }.to_a
       s = t[ 0, 0 ]
       assert_equal 1, s.real = 1
       assert_equal S[ 2, 3 ], s.imag = S[ 2, 3 ]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Jan Wedekind