epitools 0.5.58 → 0.5.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f476bb597f8724e520b4d9c8dda3a051c4e3bb77
-  data.tar.gz: 3974e9c35019dc899060337650af381aac362c83
+  metadata.gz: e9003ca555f667ebc3547afdcbe332b0718cb3e0
+  data.tar.gz: 83d00e82dc95355773c1f34744c6a1f24290f808
 SHA512:
-  metadata.gz: ef2db918b34d5ecfc0ad79f3709947fd26c194488aa2371502cf69fffcf28c83c9a5949f8cba8230816abf38a31522bdd4e54f805e9f9e91f987304a6232af71
-  data.tar.gz: f02ee7dacfdb34acfefd48bde5112dd097d18470963fbbfa5a7aba8a6761e373ace0ed98e9896923ace059d1145bd82491ec12990c88b1ab6c877700bad67627
+  metadata.gz: 776eca2bf207c715ef1ec9a0fa213e216bc640b152b356841b6873a8ecf66c2e0d0d5ca7a786f38c4b16edca14676f29a73644b7b82d38df31145938623e8071
+  data.tar.gz: 5400b2ad213c76e4e297838143af5c43010bd8c485aee789479b530b89781d73303b21ed784ec4cae2e1c67c7937c818f11057dda6ab44129465e9aaf794f2d7

data/VERSION

@@ -1 +1 @@
-0.5.58
+0.5.59

data/lib/epitools/core_ext/enumerable.rb

@@ -289,6 +289,21 @@ module Enumerable
     result
   end
 
+
+  #
+  # See: Array#permutation
+  #
+  def permutation(*args, &block)
+    to_a.permutation(*args, &block)
+  end
+
+  #
+  # See: See Array#combination
+  #
+  def combination(*args, &block)
+    to_a.combination(*args, &block)
+  end
+
   #
   # Returns the powerset of the Enumerable
   #

data/lib/epitools/core_ext/numbers.rb

@@ -123,6 +123,46 @@ class Numeric
   end
 
 
+  #
+  # Combinations: compute "n choose r" (self.choose(r))
+  #
+  # This represents number of ways to pick "r" items from a collection of "self"
+  # items (where the order of the items doesn't matter, and items can't be repeated.)
+  #
+  # eg: 49.choose(6) is how many ways can we pick 6 lottery numbers from a set of 49.
+  #
+  # Formula: n! / (r! * (n-r)!) == n * n-1 * ... * n-r / r * r-1 * ... * 2
+  #
+  def choose(r)
+    (self-r+1..self).reduce(:*) / (2..r).reduce(:*)
+  end
+  alias_method :combinations, :choose
+
+  #
+  # Permutations: compute "n P r"
+  #
+  # This represents number of ways to pick "r" items from a collection of "self"
+  # items (where the order of the items DOES matter, and items can't be repeated.)
+  #
+  # eg: 23.perm(3) is how many ways 23 people can win 1st, 2nd and 3rd place in a race.
+  #
+  # Formula: n! / (n - r)!
+  #
+  def perms(r)
+    (self-r+1..self).reduce(:*)
+  end
+  alias_method :permutations, :perms
+
+  #
+  # Multiply self by n, returning the integer product and the floating point remainder.
+  #
+  def mulmod(n)
+    prod    = self * n
+    intprod = prod.to_i
+
+    [intprod, prod % intprod]
+  end
+
   # Math.log is different in 1.8
   if RUBY_VERSION["1.8"]
 
@@ -281,9 +321,7 @@ class Integer
   # Factorial (iterated style)
   #
   def fact
-    total = 1
-    self.downto(2) { |x| total *= x }
-    total
+    (2..self).reduce(:*)
   end
   alias_method :factorial, :fact
 

data/lib/epitools/core_ext/string.rb

@@ -147,15 +147,16 @@ class String
   end
 
   #
-  # Indent all the lines in the string by "amount" of spaces.
+  # Indent all the lines, if "prefix" is a string, prepend that string
+  # to each lien. If it's an integer, prepend that many spaces.
   #
-  def indent(prefix="  ", strip_ansi=true)
+  def indent(prefix="  ")
     prefix = (" " * prefix) if prefix.is_an? Integer
 
     if block_given?
       lines.each { |line| yield prefix + line }
     else
-      lines.each { |line| prefix + line }.join ''
+      lines.map { |line| prefix + line }.join('')
     end
   end
 

data/spec/core_ext_spec.rb

@@ -67,8 +67,8 @@ describe Object do
   end
   
   it "nots" do
-    10.should be_even
-    10.not.should_not be_even
+    10.even?.should == true
+    10.not.even?.should == false
   end
   
   it "alias_class_methods" do
@@ -234,8 +234,10 @@ describe String do
   end
 
   it "indents" do
-    s = "Some things\nNeed indenting\nSo, you indent them!\n"
-    s.indent(2).should == "  Some things\n  Need indenting\n  So, you indent them!\n"
+    s                  = "Some things\nNeed indenting\nSo, you indent them!\n"
+    indented_2         = "  Some things\n  Need indenting\n  So, you indent them!\n"
+
+    s.indent(2).should == indented_2
   end
 
   it "titlecases" do
@@ -302,6 +304,25 @@ describe String do
     e.to_a.should == %w[he ll ot he re !]
   end
 
+  it "n choose r" do
+    n = 49
+    r = 6
+    
+    n.choose(r).should == n.fact / (r.fact * (n-r).fact)
+  end
+
+  it "n perms r" do
+    n = 23
+    r = 3
+
+    n.perms(r).should == (n.fact / (n-r).fact)
+  end
+
+  it "mulmods" do
+    1.25.mulmod(2).should == [2, 0.5]
+    5.mulmod(2).should == [10, 0]
+  end
+
 end
 
 
@@ -510,6 +531,15 @@ describe Enumerable do
     [:a, :b, :c].to_enum.includes?(5).should == false
   end
   
+  it "permutatitons and combinations" do
+    10.times.permutation(2).to_a.should == 10.times.to_a.permutation(2).to_a
+    10.times.combination(2).to_a.should == 10.times.to_a.combination(2).to_a
+
+    result = []
+    10.times.permutation(2) { |perm| result << perm }
+    result.should == 10.times.permutation(2).to_a
+  end
+
 end
 
 describe Enumerator do

data/spec/term_spec.rb

@@ -26,20 +26,20 @@ describe Term do
     table.by_columns.should_not be_nil
     table.by_rows.should_not be_nil
 
-    Term::Table do |table|
-      100.times do |n|
-        table.row do
-          col "#{n}."
-          col "A" * rand(10)
-          col "B" * rand(10)
-        end
-      end
-    end
-
-    Term::Table[
-      [1,2,3], 
-      [4,5,6] 
-    ]
+    # Term::Table do |table|
+    #   100.times do |n|
+    #     table.row do
+    #       col "#{n}."
+    #       col "A" * rand(10)
+    #       col "B" * rand(10)
+    #     end
+    #   end
+    # end
+
+    # Term::Table[
+    #   [1,2,3], 
+    #   [4,5,6] 
+    # ]
     
     table = Term::Table.new
     table.rows = [ [1,2,3], [4,5,6] ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.58
+  version: 0.5.59
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec