facets 2.0.0 → 2.0.1

data/task/rdoc.yaml

@@ -4,6 +4,7 @@
 Core:
   chdir: lib/core
   files:
+    ../../README
     facets/1stclassmethod.rb facets/array facets/binding facets/boolean.rb facets/class
     facets/comparable facets/continuation facets/conversion.rb facets/dir facets/enumerable
     facets/file facets/filetest facets/float facets/functor.rb facets/hash

data/task/test

@@ -1,5 +1,7 @@
 #!/usr/bin/env ratch
 
+# Run unit tests
+
 live = ARGV.delete('--live')
 
 unless live
@@ -11,10 +13,10 @@ end
 main :test do
   if find = argv[0]
     unless file?(find)
-      find = File.join(find, '**', '*.rb')
+      find = File.join(find, '**', 'test_*.rb')
     end
   else
-    find = 'test/**/*.rb'
+    find = 'test/**/test_*.rb'
   end
 
   Dir.glob(find).each do |file|

data/test/unit/enumerable/test_collect.rb

@@ -1,52 +1,175 @@
-  #  _____         _
-  # |_   _|__  ___| |_
-  #   | |/ _ \/ __| __|
-  #   | |  __/\__ \ |
-  #   |_|\___||___/\__|
-  #
-  # for lib/facets/enumerable/collect.rb
-  #
-  # Extracted Mon Sep 03 16:23:07 -0700 2007
-  # w/ Test Extraction Ratchet
-  #
+#  _____         _
+# |_   _|__  ___| |_
+#   | |/ _ \/ __| __|
+#   | |  __/\__ \ |
+#   |_|\___||___/\__|
+#
+# for lib/facets/enumerable/partition.rb
+#
+# Extracted Mon Sep 03 16:23:07 -0700 2007
+# w/ Test Extraction Ratchet
+#
 
- require 'facets/enumerable/collect.rb'
+require 'facets/enumerable/collect.rb'
 
+require 'test/unit'
+require 'set'
 
+class TestEnumerable < Test::Unit::TestCase
 
-  require 'test/unit'
+  def test_filter_collect
+    e = [3,4]
+    a = [1,2,3,4].filter_collect { |n|
+      throw(:skip) if n < 3
+      n
+    }
+    assert_equal( e, a )
+  end
+
+  def test_compact_collect
+    a = [1,2,nil,4].compact_collect { |e| e }
+    assert_equal( [1,2,4], a )
+  end
+
+  def test_filter_collect
+    e = [3,4]
+    a = [1,2,3,4].filter_collect { |n|
+      throw(:skip) if n < 3
+      n
+    }
+    assert_equal( e, a )
+  end
+
+  def test_compact_collect
+    a = [1,2,nil,4].compact_collect { |e| e }
+    assert_equal( [1,2,4], a )
+  end
+
+#     def test_op_mod
+#       a = [:A,:B,:C]
+#       assert_equal( a[1], a/1 )
+#       assert_equal( :B, a/1 )
+#     end
+#
+#     def test_op_div
+#       a = [:A,:B,:C]
+#       assert_equal( a[1], a/1 )
+#       assert_equal( :B, a/1 )
+#     end
+
+  def test_group_by_for_array
+    a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    r = {0=>[0, 2, 4, 6, 8], 1=>[1, 3, 5, 7, 9]}
+    assert_equal(r, a.group_by{|e| e%2}.each{|k, v| v.sort!})
+
+    h = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9}
+    r = {0=>[[0, 0], [2, 2], [4, 4], [6, 6], [8, 8]], 1=>[[1, 1], [3, 3], [5, 5], [7, 7], [9, 9]]}
+    assert_equal(r, h.group_by{|k, v| v%2}.each{|k, v| v.sort!})
+
+    x = (1..5).group_by{ |n| n % 3 }
+    o = { 0 => [3], 1 => [1, 4], 2 => [2,5] }
+    assert_equal( o, x )
+
+    x = ["I had", 1, "dollar and", 50, "cents"].group_by{ |e| e.class }
+    o = { String => ["I had","dollar and","cents"], Fixnum => [1,50] }
+    assert_equal( o, x )
+  end
+
+  def test_cluster_by
+    a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    r = [[0, 2, 4, 6, 8], [1, 3, 5, 7, 9]]
+    assert_equal(r, a.cluster_by{|e| e%2}.each{|a| a.sort!})
+    h = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9}
+    r = [[[0, 0], [2, 2], [4, 4], [6, 6], [8, 8]], [[1, 1], [3, 3], [5, 5], [7, 7], [9, 9]]]
+    assert_equal(r, h.cluster_by{|k, v| v%2}.each{|a| a.sort!})
+  end
+
+  def test_each_by_01
+    x = []
+    [1,2,3,4].each_by{ |a,b| x << [a,b] }
+    o = [[1,2],[3,4]]
+    assert_equal( o, x )
+  end
+
+  def test_each_by_02
+    x = []
+    [1,2,3,4,5].each_by{ |a,b,c| x << [a,b,c] }
+    o = [[1,2,3],[4,5,nil]]
+    assert_equal( o, x )
+  end
+
+  def test_each_by_03
+    x = []
+    [1,2,3,4].each_by(2){ |a,b| x << [a,b] }
+    o = [[1,2],[3,4]]
+    assert_equal( o, x )
+  end
+
+  def test_each_by_04
+    x = []
+    [1,2,3,4,5,6,7,8].each_by(4){ |*a| x << a }
+    o = [ [[1,2,3,4]],[[5,6,7,8]] ]
+    assert_equal( o, x )
+  end
+
+  def test_each_by_05
+    x = []
+    [1,2,3,4,5,6].each_by(3){ |*a| x << a }
+    o = [ [[1,2,3]],[[4,5,6]] ]
+    assert_equal( o, x )
+  end
+
+  def test_each_by_06
+    a = [1,2,3,4,5,6]
+    r = []
+    a.each_by(2){ |x,y| r << [x,y] }
+    assert_equal( [[1,2],[3,4],[5,6]], r )
+  end
 
-  class TestEnumerableCollect < Test::Unit::TestCase
+  def test_each_by_07
+    a = [1,2,3,4,5,6]
+    r = []
+    a.each_by(3){ |*e| r << e }
+    assert_equal( [ [[1,2,3]], [[4,5,6]] ], r )
+  end
 
-    def test_filter_collect
-      e = [3,4]
-      a = [1,2,3,4].filter_collect { |n|
-        throw(:skip) if n < 3
-        n
-      }
-      assert_equal( e, a )
-    end
+  def test_each_pair
+    r = []
+    a = [1,2,3,4]
+    a.each_pair{ |a,b| r << [a,b] }
+    assert_equal( [[1,2],[3,4]], r )
+  end
 
-    def test_compact_collect
-      a = [1,2,nil,4].compact_collect { |e| e }
-      assert_equal( [1,2,4], a )
-    end
+  def test_each_unique_pair
+    r = []
+    a = [1,2,3,4]
+    a.each_unique_pair{ |a,b| r << [a,b] }
+    assert_equal( [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]], r )
+  end
 
-    def test_filter_collect
-      e = [3,4]
-      a = [1,2,3,4].filter_collect { |n|
-        throw(:skip) if n < 3
-        n
-      }
-      assert_equal( e, a )
-    end
+  def test_eachn
+    x = []
+    [1,2,3,4].eachn{ |a,b| x << [a,b] }
+    o = [[1,2],[3,4]]
+    assert_equal( o, x )
 
-    def test_compact_collect
-      a = [1,2,nil,4].compact_collect { |e| e }
-      assert_equal( [1,2,4], a )
-    end
+    x = []
+    [1,2,3,4,5].eachn{ |a,b,c| x << [a,b,c] }
+    o = [[1,2,3],[4,5,nil]]
+    assert_equal( o, x )
+  end
 
+  def test_each_combination
+    r = []
+    a = [1,2,3,4]
+    a.each_combination(2){ |a,b| r << [a,b] }
+    assert_equal( [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]], r )
   end
 
 
+  def test_collect_with_index
+    a = [1,2,3].collect_with_index{ |e,i| e*i }
+    assert_equal( [0,2,6], a )
+  end
 
+end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: facets
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
-date: 2007-10-03 00:00:00 -07:00
+  version: 2.0.1
+date: 2007-10-07 00:00:00 -07:00
 summary: Premium Core Extensions and Standard Additions
 require_paths: 
-- lib/core
-- lib/more
 - lib/methods
+- lib/more
+- lib/core
 email: facets-universal@rubyforge.org
 homepage: http://facets.rubyforge.org
 rubyforge_project: 
@@ -36,7 +36,11 @@ files:
 - README
 - demo
 - demo/bench
-- demo/bench/bench_factorial.rb
+- demo/bench/enumerable
+- demo/bench/enumerable/bench_collect.rb
+- demo/bench/enumerable/bench_count.rb
+- demo/bench/integer
+- demo/bench/integer/bench_factorial.rb
 - demo/sample
 - demo/sample/annotations
 - demo/sample/annotations/annotations1.rb
@@ -90,7 +94,6 @@ files:
 - lib/core/facets/enumerable/combination.rb
 - lib/core/facets/enumerable/count.rb
 - lib/core/facets/enumerable/instance_map.rb
-- lib/core/facets/enumerable/partition.rb
 - lib/core/facets/enumerable/permutation.rb
 - lib/core/facets/enumerable/probability.rb
 - lib/core/facets/file
@@ -319,6 +322,7 @@ files:
 - lib/methods/facets/enumerable/filter_map.rb
 - lib/methods/facets/enumerable/frequency.rb
 - lib/methods/facets/enumerable/graph.rb
+- lib/methods/facets/enumerable/group_by.rb
 - lib/methods/facets/enumerable/ideal_entropy.rb
 - lib/methods/facets/enumerable/injecting.rb
 - lib/methods/facets/enumerable/map_if.rb
@@ -847,7 +851,6 @@ files:
 - test/unit/enumerable/test_collect.rb
 - test/unit/enumerable/test_combination.rb
 - test/unit/enumerable/test_count.rb
-- test/unit/enumerable/test_partition.rb
 - test/unit/enumerable/test_permutation.rb
 - test/unit/enumerable/test_probability.rb
 - test/unit/file
@@ -1027,7 +1030,6 @@ test_files:
 - test/unit/enumerable/test_collect.rb
 - test/unit/enumerable/test_combination.rb
 - test/unit/enumerable/test_count.rb
-- test/unit/enumerable/test_partition.rb
 - test/unit/enumerable/test_permutation.rb
 - test/unit/enumerable/test_probability.rb
 - test/unit/file

data/lib/core/facets/enumerable/partition.rb

@@ -1,285 +0,0 @@
-# TITLE:
-#   Partition
-#
-# DESCRIPTION:
-#   Enumerble partitioning extensions.
-#
-# AUTHORS:
-#   - Thibaut Barrère
-#   - WhyTheLuckyStiff
-#   - Daniel Sheppard
-#   - Paul Battley
-#   - Paul Betts
-#   - Tom Moertel
-#
-# NOTES:
-#   - TODO Change name and/or move #partition_by?
-#   - TODO Suggest Enumerator's #each_slice use block arity
-#          if no parameter is given.
-
-require 'enumerator' # for each_slice
-
-#
-module Enumerable
-
-  # Partition an array into parts of given length.
-  #
-  # CREDIT WhyTheLuckyStiff
-
-  #   def / len
-  #     inject([]) do |ary, x|
-  #       ary << [] if [*ary.last].nitems % len == 0
-  #       ary.last << x
-  #       ary
-  #     end
-  #   end
-
-  # See Enumerable#partition for the background. #partition_by is best
-  # explained by example.
-  #
-  #   (1..5).partition_by { |n| n % 3 }
-  #        #=> { 0 => [3], 1 => [1, 4], 2 => [2,5] }
-  #
-  #   ["I had", 1, "dollar and", 50, "cents"].partition_by { |e| e.class }
-  #        #=> { String => ["I had","dollar and","cents"], Fixnum => [1,50] }
-  #
-  # #partition_by is used to group items in a collection by something they
-  # have in common.  The common factor is the key in the resulting hash, the
-  # array of like elements is the value.
-  #
-  # CREDIT Gavin Sinclair
-  # CREDIT Gregory of Laurel, Maryland
-
-  def partition_by #:yield:
-    r = Hash.new{ |h,k| h[k]=[] }
-    each do |e|
-      r[ yield(e) ] << e
-    end
-    return r
-  end
-
-  # Similar to oartition_by but returns an array of arrays.
-  #
-  #    %w{this is a test}.cluster_by {|x| x[0]}
-  #
-  # _produces_
-  #
-  #    [ ['a'], ['is'], ['this', 'test'] ]
-  #
-  # CREDIT Paul Betts
-  # CREDIT Tom Moertel
-
-  def cluster_by(&b)
-    h = {};  self.each { |x| (h[sig_fn[x]] ||= []) << x }
-    h.keys.sort!.map { |k| h[k] }
-  end
-
-  # Split on matching pattern.
-  #
-  # ['a1','b1','a2','b2'].divide(/^a/)
-  # => [['a1,'b1'],['a2','b2']]
-
-  def divide(pattern)
-    inject([]) do |memo,obj|
-      memo.push [] if pattern === obj
-      memo.last << obj
-      memo
-    end
-  end
-
-  # Iterate through slices. If slicing +step+ is not
-  # given, the the arity if the block is used.
-  #
-  #   x = []
-  #   [1,2,3,4].each_by{ |a,b| x << [a,b] }
-  #   x  #=> [ [1,2], [3,4] ]
-  #
-  #   x = []
-  #   [1,2,3,4,5,6].each_by(3){ |a| x << a }
-  #   x  #=> [ [1,2,3], [4,5,6] ]
-
-  def each_by(step=nil, &yld)
-    if step
-      each_slice(step,&yld)
-    else
-      step = yld.arity.abs
-      each_slice(step,&yld)
-    end
-  end
-
-  # Iterators over each element pairing.
-  #
-  #   [:a,:b,:c,:d].each_pair { |a,b|  puts "#{a} -> #{b}" }
-  #
-  # _produces_
-  #
-  #   a -> b
-  #   c -> d
-
-  def each_pair #:yield:
-    e1 = nil
-    each_with_index do |e,i|
-      if i % 2 == 0
-        e1 = e
-        next
-      else
-        yield(e1,e)
-      end
-    end
-  end
-
-  #
-  #
-  # CREDIT Martin DeMello
-
-  def eachn(&block)
-    n = block.arity.abs
-    each_slice(n) {|i| block.call(*i)}
-  end
-
-  #
-
-  def collect_if(&b)
-    a = map(&b)
-    # to get the same semantics as select{|e| e}
-    a.delete(false)
-    a.compact!
-    a
-  end
-
-  alias_method :map_if, :collect_if
-end
-
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-=begin test
-
-  require 'test/unit'
-  require 'set'
-
-  class TestEnumerable < Test::Unit::TestCase
-
-#     def test_op_mod
-#       a = [:A,:B,:C]
-#       assert_equal( a[1], a/1 )
-#       assert_equal( :B, a/1 )
-#     end
-#
-#     def test_op_div
-#       a = [:A,:B,:C]
-#       assert_equal( a[1], a/1 )
-#       assert_equal( :B, a/1 )
-#     end
-
-    def test_partition_by
-      x = (1..5).partition_by{ |n| n % 3 }
-      o = { 0 => [3], 1 => [1, 4], 2 => [2,5] }
-      assert_equal( o, x )
-      x = ["I had", 1, "dollar and", 50, "cents"].partition_by { |e| e.class }
-      o = { String => ["I had","dollar and","cents"], Fixnum => [1,50] }
-      assert_equal( o, x )
-    end
-
-    def test_cluster_by
-      assert_equal( [ ['a'], ['is'], ['this', 'test'] ], %w{this is a test}.cluster_by {|x| x[0]} )
-      assert_equal( [ ['an', 'is'], ['not'], ['this'], ['untest'] ], %w{this is not an untest}.cluster_by {|x| x.length} )
-    end
-
-    def test_each_by_01
-      x = []
-      [1,2,3,4].each_by{ |a,b| x << [a,b] }
-      o = [[1,2],[3,4]]
-      assert_equal( o, x )
-    end
-
-    def test_each_by_02
-      x = []
-      [1,2,3,4,5].each_by{ |a,b,c| x << [a,b,c] }
-      o = [[1,2,3],[4,5,nil]]
-      assert_equal( o, x )
-    end
-
-    def test_each_by_03
-      x = []
-      [1,2,3,4].each_by(2){ |a,b| x << [a,b] }
-      o = [[1,2],[3,4]]
-      assert_equal( o, x )
-    end
-
-    def test_each_by_04
-      x = []
-      [1,2,3,4,5,6,7,8].each_by(4){ |*a| x << a }
-      o = [ [[1,2,3,4]],[[5,6,7,8]] ]
-      assert_equal( o, x )
-    end
-
-    def test_each_by_05
-      x = []
-      [1,2,3,4,5,6].each_by(3){ |*a| x << a }
-      o = [ [[1,2,3]],[[4,5,6]] ]
-      assert_equal( o, x )
-    end
-
-    def test_each_by_06
-      a = [1,2,3,4,5,6]
-      r = []
-      a.each_by(2){ |x,y| r << [x,y] }
-      assert_equal( [[1,2],[3,4],[5,6]], r )
-    end
-
-    def test_each_by_07
-      a = [1,2,3,4,5,6]
-      r = []
-      a.each_by(3){ |*e| r << e }
-      assert_equal( [ [[1,2,3]], [[4,5,6]] ], r )
-    end
-
-    def test_each_pair
-      r = []
-      a = [1,2,3,4]
-      a.each_pair{ |a,b| r << [a,b] }
-      assert_equal( [[1,2],[3,4]], r )
-    end
-
-    def test_each_unique_pair
-      r = []
-      a = [1,2,3,4]
-      a.each_unique_pair{ |a,b| r << [a,b] }
-      assert_equal( [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]], r )
-    end
-
-    def test_eachn
-      x = []
-      [1,2,3,4].eachn{ |a,b| x << [a,b] }
-      o = [[1,2],[3,4]]
-      assert_equal( o, x )
-
-      x = []
-      [1,2,3,4,5].eachn{ |a,b,c| x << [a,b,c] }
-      o = [[1,2,3],[4,5,nil]]
-      assert_equal( o, x )
-    end
-
-    def test_each_combination
-      r = []
-      a = [1,2,3,4]
-      a.each_combination(2){ |a,b| r << [a,b] }
-      assert_equal( [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]], r )
-    end
-
-
-    def test_collect_with_index
-      a = [1,2,3].collect_with_index{ |e,i| e*i }
-      assert_equal( [0,2,6], a )
-    end
-
-  end
-
-=end