flex_array 0.2.0 → 0.3.0

data/tests/flex_array_index_test.rb

@@ -3,20 +3,20 @@ require          'minitest/autorun'
 
 class FlexArrayIndexTester < MiniTest::Unit::TestCase
   $do_this_only_one_time = "" unless defined? $do_this_only_one_time
-  
+
   def initialize(*all)
     if $do_this_only_one_time != __FILE__
       puts
-      puts "Running test file: #{File.split(__FILE__)[1]}" 
+      puts "Running test file: #{File.split(__FILE__)[1]}"
       $do_this_only_one_time = __FILE__
     end
-    
+
     super(*all)
   end
 
   def test_that_it_indexes_correctly
     q1 = FlexArray.new([3, 3, 3]) {|i| i.dup}
-    
+
     (0...3).each do |x|
       (0...3).each do |y|
         (0...3).each do |z|
@@ -32,7 +32,7 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
         end
       end
     end
-    
+
     q = q1[0, 0, :all]
     a = [[0,0,0], [0,0,1], [0,0,2]]
     assert_equal(a, q)
@@ -40,13 +40,11 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, 0, -3..-1]
     assert_equal(a, q)
-    q = q1[0, 0, [0,2]]
-    assert_equal(a, q)
-    q = q1[0, 0, [0,-1]]
+    q = q1[0, 0, [0,1,2]]
     assert_equal(a, q)
-    q = q1[0, 0, [-3,-1]]
+    q = q1[0, 0, [0,1,-1]]
     assert_equal(a, q)
-    q = q1[0, 0, [-3,2]]
+    q = q1[0, 0, [-3,-2,-1]]
     assert_equal(a, q)
 
     q = q1[0, :all, 0]
@@ -56,15 +54,15 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, -3..-1, 0]
     assert_equal(a, q)
-    q = q1[0, [0,2], 0]
+    q = q1[0, [0,1,2], 0]
     assert_equal(a, q)
-    q = q1[0, [0,-1], 0]
+    q = q1[0, [0,1,-1], 0]
     assert_equal(a, q)
-    q = q1[0, [-3,-1], 0]
+    q = q1[0, [-3,-2,-1], 0]
     assert_equal(a, q)
-    q = q1[0, [-3,2], 0]
+    q = q1[0, [-3,1,2], 0]
     assert_equal(a, q)
-    
+
     q = q1[:all, 0, 0]
     a = [[0,0,0], [1,0,0], [2,0,0]]
     assert_equal(a, q)
@@ -72,15 +70,15 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[-3..-1, 0, 0]
     assert_equal(a, q)
-    q = q1[[0,2], 0, 0]
+    q = q1[[0,1,2], 0, 0]
     assert_equal(a, q)
-    q = q1[[0,-1], 0, 0]
+    q = q1[[0,1,-1], 0, 0]
     assert_equal(a, q)
-    q = q1[[-3,-1], 0, 0]
+    q = q1[[-3,-2,-1], 0, 0]
     assert_equal(a, q)
-    q = q1[[-3,2], 0, 0]
+    q = q1[[-3,1,2], 0, 0]
     assert_equal(a, q)
-    
+
     q = q1[0, 1, :all]
     a = [[0,1,0], [0,1,1], [0,1,2]]
     assert_equal(a, q)
@@ -88,15 +86,15 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, 1, -3..-1]
     assert_equal(a, q)
-    q = q1[0, 1, [0,2]]
+    q = q1[0, 1, [0,1,2]]
     assert_equal(a, q)
-    q = q1[0, 1, [0,-1]]
+    q = q1[0, 1, [0,1,-1]]
     assert_equal(a, q)
-    q = q1[0, 1, [-3,-1]]
+    q = q1[0, 1, [-3,-2,-1]]
     assert_equal(a, q)
-    q = q1[0, 1, [-3,2]]
+    q = q1[0, 1, [-3,1,2]]
     assert_equal(a, q)
-    
+
     q = q1[0, :all, 1]
     a = [[0,0,1], [0,1,1], [0,2,1]]
     assert_equal(a, q)
@@ -104,13 +102,13 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, -3..-1, 1]
     assert_equal(a, q)
-    q = q1[0, [0,2], 1]
+    q = q1[0, [0,1,2], 1]
     assert_equal(a, q)
-    q = q1[0, [0,-1], 1]
+    q = q1[0, [0,1,-1], 1]
     assert_equal(a, q)
-    q = q1[0, [-3,-1], 1]
+    q = q1[0, [-3,-2,-1], 1]
     assert_equal(a, q)
-    q = q1[0, [-3,2], 1]
+    q = q1[0, [-3,1,2], 1]
     assert_equal(a, q)
 
     q = q1[:all, 1, 0]
@@ -120,15 +118,15 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[-3..-1, 1, 0]
     assert_equal(a, q)
-    q = q1[[0,2], 1, 0]
+    q = q1[[0,1,2], 1, 0]
     assert_equal(a, q)
-    q = q1[[0,-1], 1, 0]
+    q = q1[[0,1,-1], 1, 0]
     assert_equal(a, q)
-    q = q1[[-3,-1], 1, 0]
+    q = q1[[-3,-2,-1], 1, 0]
     assert_equal(a, q)
-    q = q1[[-3,2], 1, 0]
+    q = q1[[-3,1,2], 1, 0]
     assert_equal(a, q)
-    
+
     q = q1[0, 2, :all]
     a = [[0,2,0], [0,2,1], [0,2,2]]
     assert_equal(a, q)
@@ -136,15 +134,15 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, 2, -3..-1]
     assert_equal(a, q)
-    q = q1[0, 2, [0,2]]
+    q = q1[0, 2, [0,1,2]]
     assert_equal(a, q)
-    q = q1[0, 2, [0,-1]]
+    q = q1[0, 2, [0,1,-1]]
     assert_equal(a, q)
-    q = q1[0, 2, [-3,-1]]
+    q = q1[0, 2, [-3,-2,-1]]
     assert_equal(a, q)
-    q = q1[0, 2, [-3,2]]
+    q = q1[0, 2, [-3,1,2]]
     assert_equal(a, q)
-    
+
     q = q1[0, :all, 2]
     a = [[0,0,2], [0,1,2], [0,2,2]]
     assert_equal(a, q)
@@ -152,13 +150,13 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[0, -3..-1, 2]
     assert_equal(a, q)
-    q = q1[0, [0,2], 2]
+    q = q1[0, [0,1,2], 2]
     assert_equal(a, q)
-    q = q1[0, [0,-1], 2]
+    q = q1[0, [0,1,-1], 2]
     assert_equal(a, q)
-    q = q1[0, [-3,-1], 2]
+    q = q1[0, [-3,-2,-1], 2]
     assert_equal(a, q)
-    q = q1[0, [-3,2], 2]
+    q = q1[0, [-3,1,2], 2]
     assert_equal(a, q)
 
     q = q1[:all, 2, 0]
@@ -168,31 +166,31 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
     assert_equal(a, q)
     q = q1[-3..-1, 2, 0]
     assert_equal(a, q)
-    q = q1[[0,2], 2, 0]
+    q = q1[[0,1,2], 2, 0]
     assert_equal(a, q)
-    q = q1[[0,-1], 2, 0]
+    q = q1[[0,1,-1], 2, 0]
     assert_equal(a, q)
-    q = q1[[-3,-1], 2, 0]
+    q = q1[[-3,-2,-1], 2, 0]
     assert_equal(a, q)
-    q = q1[[-3,2], 2, 0]
+    q = q1[[-3,1,2], 2, 0]
     assert_equal(a, q)
-    
+
     q = q1[0, :all, :all]
-    a = [[0,0,0], [0,0,1], [0,0,2], 
-         [0,1,0], [0,1,1], [0,1,2], 
+    a = [[0,0,0], [0,0,1], [0,0,2],
+         [0,1,0], [0,1,1], [0,1,2],
          [0,2,0], [0,2,1], [0,2,2]]
     assert_equal(a, q)
-    
+
     q = q1[0, 1..2, :all]
     a = [[0,1,0], [0,1,1], [0,1,2], [0,2,0], [0,2,1], [0,2,2]]
     assert_equal(a, q)
-    
+
     q = q1[0, 0..2, :all]
-    a = [[0,0,0], [0,0,1], [0,0,2], 
-         [0,1,0], [0,1,1], [0,1,2], 
+    a = [[0,0,0], [0,0,1], [0,0,2],
+         [0,1,0], [0,1,1], [0,1,2],
          [0,2,0], [0,2,1], [0,2,2]]
     assert_equal(a, q)
-    
+
     q = q1[0, :all, 0..2]
     a = [[0,0,0], [0,0,1], [0,0,2],
            [0,1,0], [0,1,1], [0,1,2],
@@ -204,8 +202,8 @@ class FlexArrayIndexTester < MiniTest::Unit::TestCase
            [0,1,0], [0,1,1], [0,1,2],
            [0,2,0], [0,2,1], [0,2,2]]
     assert_equal(a, q)
-    
-    assert_equal([2,2,2], q1[-1,-1,-1])    
+
+    assert_equal([2,2,2], q1[-1,-1,-1])
   end
 
   def test_that_it_rejects_bad_indexes

data/tests/flex_array_new_test.rb

@@ -3,14 +3,14 @@ require          'minitest/autorun'
 
 class FlexArrayNewTester < MiniTest::Unit::TestCase
   $do_this_only_one_time = "" unless defined? $do_this_only_one_time
-  
+
   def initialize(*all)
     if $do_this_only_one_time != __FILE__
       puts
-      puts "Running test file: #{File.split(__FILE__)[1]}" 
+      puts "Running test file: #{File.split(__FILE__)[1]}"
       $do_this_only_one_time = __FILE__
     end
-    
+
     super(*all)
   end
 
@@ -21,18 +21,18 @@ class FlexArrayNewTester < MiniTest::Unit::TestCase
     assert_equal(1, q1.dimensions)
     assert_equal([0...10], q1.limits)
     assert_equal(a1, q1.array_data)
-  
+
     q2 = FlexArray.new(1..10, 0)
     a2 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     assert_equal(10, q2.count)
     assert_equal(1, q2.dimensions)
     assert_equal([1..10], q2.limits)
     assert_equal(a2, q2.array_data)
-    
+
     q3 = FlexArray.new(10) {|i| i[0]}
     a3 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-    assert_equal(a3, q3.array_data) 
-  
+    assert_equal(a3, q3.array_data)
+
     q4 = FlexArray.new(1..10) {|i| i[0]}
     a4 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     assert_equal(a4, q4.array_data)
@@ -43,27 +43,27 @@ class FlexArrayNewTester < MiniTest::Unit::TestCase
     assert_equal(2, q5.dimensions)
     assert_equal([0...2, 0...2], q5.limits)
     assert_equal(a5, q5.array_data)
-    
+
     q6 = FlexArray.new([2, 2]) {|i| i.clone}
     a6 = [[0,0], [0,1], [1,0], [1,1]]
     assert_equal(a6, q6.array_data)
   end
-  
+
   def test_the_dup_method
     fa1 = FlexArray.new(10) {|idx| idx.clone}
     fa2 = fa1.dup
-    
+
     #Test that the array reference cells are independent.
     fa2[0] = 'Hello'
     assert_equal([0], fa1[0])
     assert_equal('Hello', fa2[0])
 
-    #Test that the array contents are still dependant.    
+    #Test that the array contents are still dependant.
     fa2[1][0] = 'Dolly'
     assert_equal(['Dolly'], fa1[1])
     assert_equal(['Dolly'], fa2[1])
   end
-  
+
   def test_the_new_from_method
     #Test new_from a regular array.
     ba1 = [1,2,3,4,5,6]
@@ -83,26 +83,26 @@ class FlexArrayNewTester < MiniTest::Unit::TestCase
     a3 = [1,2,3,4,5,6,1,2]
     assert_equal(a3, q3.array_data)
     assert_equal(q3.dimensions, 1)
-    
+
     #Test new_from with same size but different shape.
     q4 = FlexArray.new_from([3,2], q1)
     assert_equal(ba1, q4.array_data)
     assert_equal(q4.limits, [0...3, 0...2])
     assert_equal(q4.dimensions, 2)
   end
-  
+
   def test_the_new_from_selection_method
     #Create a new array from a row of data.
     fa1 = FlexArray.new([3,4]) {|idx| idx.clone}
     fa2 = FlexArray.new_from_selection(4, fa1, [0, :all])
     assert_equal([[0,0],[0,1],[0,2],[0,3]], fa2.array_data)
-    
+
     #Create a new array from a column of data.
     fa1 = FlexArray.new([3,4]) {|idx| idx.clone}
     fa2 = FlexArray.new_from_selection(3, fa1, [:all, 0])
     assert_equal([[0,0],[1,0],[2,0]], fa2.array_data)
   end
-  
+
   def test_the_new_from_array_method
     a = [0,1,2,3,4,5,6,7,8,9]
     f = FlexArray.new_from_array(a)
@@ -114,18 +114,18 @@ class FlexArrayNewTester < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) { FlexArray.new(10.5, 0) }
     assert_raises(ArgumentError) { FlexArray.new('Hello', 0) }
     assert_raises(ArgumentError) { FlexArray.new(:all, 0) }
-    
+
     assert_raises(ArgumentError) { FlexArray.new([10.5], 0) }
     assert_raises(ArgumentError) { FlexArray.new(['Hello'], 0) }
     assert_raises(ArgumentError) { FlexArray.new([:all], 0) }
-    
+
     assert_raises(ArgumentError) { FlexArray.new(1...1, 0) }
     assert_raises(ArgumentError) { FlexArray.new(-1..-5, 0) }
-    
+
     assert_raises(ArgumentError) { FlexArray.new([1...1], 0) }
     assert_raises(ArgumentError) { FlexArray.new([-1..-5], 0) }
-    
-    assert_raises(ArgumentError) { FlexArray.new('a'..'z', 0) }    
+
+    assert_raises(ArgumentError) { FlexArray.new('a'..'z', 0) }
     assert_raises(ArgumentError) { FlexArray.new(['a'..'z'], 0) }
   end
 end

data/tests/flex_array_reshape_test.rb

@@ -3,14 +3,14 @@ require          'minitest/autorun'
 
 class FlexArrayReshapeTester < MiniTest::Unit::TestCase
   $do_this_only_one_time = "" unless defined? $do_this_only_one_time
-  
+
   def initialize(*all)
     if $do_this_only_one_time != __FILE__
       puts
-      puts "Running test file: #{File.split(__FILE__)[1]}" 
+      puts "Running test file: #{File.split(__FILE__)[1]}"
       $do_this_only_one_time = __FILE__
     end
-    
+
     super(*all)
   end
 
@@ -18,7 +18,7 @@ class FlexArrayReshapeTester < MiniTest::Unit::TestCase
     ba1 = [[0,0], [0,1], [0,2], [0,3],
            [1,0], [1,1], [1,2], [1,3],
            [2,0], [2,1], [2,2], [2,3]]
-           
+
     fa1 = FlexArray.new([3,4]) {|idx| idx.clone}
     fa2 = fa1.reshape([2,6])
     assert_equal([0...3, 0...4], fa1.limits)
@@ -30,16 +30,16 @@ class FlexArrayReshapeTester < MiniTest::Unit::TestCase
            [1,0], [1,1], [1,2], [1,3],
            [2,0], [2,1], [2,2], [2,3],
            [0,0], [0,1], [0,2]]
-    
+
     fa3 = fa1.reshape([3,5])
     assert_equal(ba2, fa3.array_data)
   end
-  
+
   def test_the_reshape_e_m_method
     ba1 = [[0,0], [0,1], [0,2], [0,3],
            [1,0], [1,1], [1,2], [1,3],
            [2,0], [2,1], [2,2], [2,3]]
-           
+
     fa1 = FlexArray.new([3,4]) {|idx| idx.clone}
     fa1.reshape!([2,6])
     assert_equal([0...2, 0...6], fa1.limits)
@@ -50,23 +50,16 @@ class FlexArrayReshapeTester < MiniTest::Unit::TestCase
            [1,0], [1,1], [1,2], [1,3],
            [2,0], [2,1], [2,2], [2,3],
            [0,0], [0,1], [0,2]]
-    
+
     fa1.reshape!([3,5])
     assert_equal(ba2, fa1.array_data)
     assert_equal(2, fa1.dimensions)
-    
+
     fa1.reshape!(15)
     assert_equal([0...15], fa1.limits)
     assert_equal(1, fa1.dimensions)
   end
-  
-  def test_the_flatten_method
-    fa = FlexArray.new([2,3]) {|idx| idx.clone}
-    a = [0,0,0,1,0,2,1,0,1,1,1,2]
-    assert_equal(a, fa.flatten)
-    assert(fa.array_data.object_id != fa.flatten.object_id)
-  end
-  
+
   def test_the_to_a_method
     fa = FlexArray.new([2,3]) {|idx| idx.clone}
     a = [[0,0],[0,1],[0,2],[1,0],[1,1],[1,2]]

data/tests/flex_array_test.rb

@@ -3,21 +3,21 @@ require          'minitest/autorun'
 
 class FlexArrayTester < MiniTest::Unit::TestCase
   $do_this_only_one_time = "" unless defined? $do_this_only_one_time
-  
+
   def initialize(*all)
     if $do_this_only_one_time != __FILE__
       puts
-      puts "Running test file: #{File.split(__FILE__)[1]}" 
+      puts "Running test file: #{File.split(__FILE__)[1]}"
       $do_this_only_one_time = __FILE__
     end
-    
+
     super(*all)
   end
-  
+
   def test_version_reporting
-    version = '0.2.0'
+    version = '0.3.0'
     f = FlexArray.new([3,3], 'test')
-    
+
     assert_equal(version, FlexArray.version)
     assert_equal(version, f.version)
   end
@@ -26,20 +26,20 @@ class FlexArrayTester < MiniTest::Unit::TestCase
     f = FlexArray.new([3,3], 'test')
     assert_equal([0...3, 0...3], f.limits)
   end
-  
+
   def test_the_to_flex_array_method
     f = FlexArray.new([3,3], 'test')
     g = f.to_flex_array
-    
+
     assert_equal(f, g)
     assert_equal(f.object_id, g.object_id)
   end
-  
+
   def test_the_equal_method
     f = FlexArray.new([3,3], 'test')
     g = FlexArray.new([3,3], 'test')
     h = FlexArray.new([3,3], 'not')
-    
+
     assert(f == g)
     refute(f == h)
   end
@@ -49,10 +49,18 @@ class FlexArrayTester < MiniTest::Unit::TestCase
     g = FlexArray.new([3,3], 1)
     h = FlexArray.new([3,3], 2)
     i = FlexArray.new([3,3], 0)
-    
+
     assert_equal( 0, f <=> g)
     assert_equal(-1, f <=> h)
     assert_equal( 1, f <=> i)
   end
-  
+
+  def test_the_empty_method
+    f = FlexArray.new([3,3], 1)
+    refute(f.empty?)
+
+    g = FlexArray.new([0,3], 1)
+    assert(g.empty?)
+  end
+
 end