array_pair 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/array_pair.rb

@@ -25,13 +25,13 @@ class Array
     pairs = []
     
     if another_array #between this array and the next
-      (0..length-1).each do |index1|
-        (0..another_array.length-1).each do |index2|
+     (0..length-1).each do |index1|
+     (0..another_array.length-1).each do |index2|
           pairs.push [self[index1], another_array[index2]]
         end
       end       
     else # within this array only
-      (0..length-1).each do |index1|
+     (0..length-1).each do |index1|
         index2 = index1+1
         while index2 < length
           pairs.push [self[index1], self[index2]]
@@ -39,7 +39,7 @@ class Array
         end
       end      
     end
-
+    
     return pairs
   end
   
@@ -134,7 +134,7 @@ class Array
         if columns_to_normalise.nil? or columns_to_normalise.include?(index)
           minima = column_minima[index]
           maxima = column_maxima[index]
-      
+          
           if col.nil?
             new_row.push nil
           elsif minima == maxima
@@ -170,15 +170,15 @@ class Array
     return '()' if empty?
     return "('#{join("','")}')"
   end
-
+  
   # For SQL conditions. In [] brackets, single quotes don't work.
   # ['a','bc'] => "(a,bc)"
   def to_sql_in_string_no_quotes
     return '()' if empty?
     return "(#{join(",")})"
   end
-
-
+  
+  
   def median
     return nil unless length>0
     a = sort
@@ -188,12 +188,12 @@ class Array
       return a[length/2]
     end
   end
-
+  
   def standard_deviation
     return nil if empty?
     RSRuby.instance.sd(self)
   end
-
+  
   # Similar to pairs(another_array) iterator, in that you iterate over 2
   # pairs of elements. However, here only the one array (the 'this' Enumerable)
   # and the names of these are from the names
@@ -206,7 +206,21 @@ class Array
       end
     end
   end
-
+  
+  # Like each_lower_triangular_matrix, except iterate over 3 items at once, not 2.
+  # So for [1,2,3,4] you should get (in succession), 123, 124, 134, 234
+  def each_lower_triangular_3d_matrix
+    each_with_index do |e1, i1|
+      each_with_index do |e2, i2|
+        next unless i2 > i1
+        each_with_index do |e3, i3|
+          next unless i3 > i2
+          yield e1, e2, e3
+        end
+      end      
+    end
+  end
+  
   # like uniq -c for unix
   def uniq_count
     hash = {}
@@ -216,7 +230,7 @@ class Array
     end
     hash
   end
-
+  
   def no_nils
     reject do |element|
       element.nil?

data/test/test_array_pair.rb

@@ -1,7 +1,7 @@
 # 
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
- 
+
 
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
@@ -63,28 +63,28 @@ class ArrayPairTest < Test::Unit::TestCase
     assert_equal '()', [].to_sql_in_string
     assert_equal "('a','bc')", ['a','bc'].to_sql_in_string
   end
-
+  
   def test_median
     assert_equal nil, [].median
     assert_equal 1, [1].median
     assert_equal 1.5, [0,3,2,1].median
     assert_equal 2, [1,2,3].median
   end
-
+  
   def test_each_lower_triangle_iterator
     gained = []
     [].each_lower_triangular_matrix() { |i,j| gained.push([i,j]) }
     assert_equal [], gained
-
+    
     gained = []
     [1].each_lower_triangular_matrix() { |i,j| gained.push([i,j]) }
     assert_equal [], gained
-
+    
     gained = []
     [1,2].each_lower_triangular_matrix() { |i,j| gained.push([i,j]) }
     assert_equal [1,2], gained[0]
     assert_equal 1, gained.length
-
+    
     gained = []
     [1,2,3].each_lower_triangular_matrix() { |i,j| gained.push([i,j]) }
     assert_equal [1,2], gained[0]
@@ -92,13 +92,31 @@ class ArrayPairTest < Test::Unit::TestCase
     assert_equal [2,3], gained[2]
     assert_equal 3, gained.length
   end
-
+  
+  def test_each_lower_triangular_3d_matrix
+    gained = []
+    [].each_lower_triangular_3d_matrix { |i,j,k| gained.push([i,j,k]) }
+    assert_equal [], gained
+    
+    gained = []
+    [1,2,3].each_lower_triangular_3d_matrix { |i,j,k| gained.push([i,j,k]) }
+    assert_equal [[1,2,3]], gained
+    
+    gained = []
+    [1,2,3,4].each_lower_triangular_3d_matrix { |i,j,k| gained.push([i,j,k]) }
+    assert_equal [1,2,3], gained[0]
+    assert_equal [1,2,4], gained[1]
+    assert_equal [1,3,4], gained[2]
+    assert_equal [2,3,4], gained[3]
+    assert_equal 4, gained.length
+  end
+  
   def test_standard_deviation
     assert_nil [].standard_deviation
     assert_equal 1.0, [1,2,3].standard_deviation
     assert_equal 129, ([1,2,3,4].standard_deviation*100).round
   end
-
+  
   def test_uniq_count
     assert_equal({}, [].uniq_count)
     assert_equal({'a' => 1}, ['a'].uniq_count)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: array_pair
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ben J Woodcroft
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +11:00
+date: 2010-02-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency