combinatorics 0.4.3 → 0.5.0

data/lib/combinatorics/extensions/math.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # @author duper <super@manson.vistech.net>
 #

data/lib/combinatorics/extensions/range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Range
 
   #

data/lib/combinatorics/extensions.rb

@@ -1 +1,3 @@
-require 'combinatorics/extensions/range'
+# frozen_string_literal: true
+
+require_relative 'extensions/range'

data/lib/combinatorics/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'enumerator'
 require 'generator' if RUBY_VERSION < '1.9'
 
@@ -5,7 +7,7 @@ module Combinatorics
   # auto-detects the `Generator` class.
   Generator = if defined?(::Generator) # 1.8.7
                 ::Generator
-              elsif defined?(::Enumerator::Generator) # 1.9
+              elsif defined?(::Enumerator::Generator) # >= 1.9.1
                 ::Enumerator::Generator
               else
                 raise(NameError,"unable to find the Generator class")

data/lib/combinatorics/list_comprehension.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/enumerator'
+# frozen_string_literal: true
+
+require_relative 'enumerator'
 
 class Array
 

data/lib/combinatorics/permute/cardinality.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/extensions/math'
+# frozen_string_literal: true
+
+require_relative '../extensions/math'
 
 module Combinatorics
   #

data/lib/combinatorics/permute/extensions/array.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/permute/mixin'
+# frozen_string_literal: true
+
+require_relative '../mixin'
 
 class Array
 

data/lib/combinatorics/permute/extensions/set.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/permute/mixin'
+# frozen_string_literal: true
+
+require_relative '../mixin'
 
 require 'set'
 

data/lib/combinatorics/permute/extensions.rb

@@ -1,2 +1,4 @@
-require 'combinatorics/permute/extensions/array'
-require 'combinatorics/permute/extensions/set'
+# frozen_string_literal: true
+
+require_relative 'extensions/array'
+require_relative 'extensions/set'

data/lib/combinatorics/permute/mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Combinatorics
   module Permute
     #

data/lib/combinatorics/permute.rb

@@ -1,3 +1,5 @@
-require 'combinatorics/permute/cardinality'
-require 'combinatorics/permute/mixin'
-require 'combinatorics/permute/extensions'
+# frozen_string_literal: true
+
+require_relative 'permute/cardinality'
+require_relative 'permute/mixin'
+require_relative 'permute/extensions'

data/lib/combinatorics/power_set/cardinality.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/extensions/math'
+# frozen_string_literal: true
+
+require_relative '../extensions/math'
 
 module Combinatorics
   module PowerSet

data/lib/combinatorics/power_set/extensions/array.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/power_set/mixin'
+# frozen_string_literal: true
+
+require_relative '../mixin'
 
 class Array
 

data/lib/combinatorics/power_set/extensions/set.rb

@@ -1,4 +1,6 @@
-require 'combinatorics/power_set/mixin'
+# frozen_string_literal: true
+
+require_relative '../mixin'
 
 require 'set'
 

data/lib/combinatorics/power_set/extensions.rb

@@ -1,2 +1,4 @@
-require 'combinatorics/power_set/extensions/array'
-require 'combinatorics/power_set/extensions/set'
+# frozen_string_literal: true
+
+require_relative 'extensions/array'
+require_relative 'extensions/set'

data/lib/combinatorics/power_set/mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Combinatorics
   module PowerSet
     #

data/lib/combinatorics/power_set.rb

@@ -1,3 +1,5 @@
-require 'combinatorics/power_set/mixin'
-require 'combinatorics/power_set/extensions'
-require 'combinatorics/power_set/cardinality'
+# frozen_string_literal: true
+
+require_relative 'power_set/mixin'
+require_relative 'power_set/extensions'
+require_relative 'power_set/cardinality'

data/lib/combinatorics/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Combinatorics
   # Combinatorics module revision number
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/lib/combinatorics.rb

@@ -1,11 +1,13 @@
-require 'combinatorics/cartesian_product'
-require 'combinatorics/choose'
-require 'combinatorics/derange'
-require 'combinatorics/extensions'
-require 'combinatorics/list_comprehension'
-require 'combinatorics/power_set'
-require 'combinatorics/permute'
-require 'combinatorics/version'
+# frozen_string_literal: true
 
-# @todo inversions (permutation mutations)
-# @todo set families (approximate power set subsets)
+require_relative 'combinatorics/cartesian_product'
+require_relative 'combinatorics/choose'
+require_relative 'combinatorics/derange'
+require_relative 'combinatorics/extensions'
+require_relative 'combinatorics/list_comprehension'
+require_relative 'combinatorics/power_set'
+require_relative 'combinatorics/permute'
+require_relative 'combinatorics/version'
+
+# TODO: inversions (permutation mutations)
+# TODO: set families (approximate power set subsets)

data/spec/cartesian_product/cardinality_spec.rb

@@ -1,60 +1,58 @@
 require 'spec_helper'
 require 'combinatorics/cartesian_product'
 
-describe CartesianProduct do
-  subject { CartesianProduct } 
-
+describe Combinatorics::CartesianProduct do
   describe "cardinality" do
     it "should return 1 for cardinality(1, 1)" do 
-      subject.cardinality(1, 1).should == 1
+      expect(subject.cardinality(1, 1)).to eq(1)
     end
 
     it "should return 2 for cardinality(1, 2)" do
-      subject.cardinality(1, 2).should == 2
+      expect(subject.cardinality(1, 2)).to eq(2)
     end
 
     it "should return 2 for cardinality(2, 1)" do
-      subject.cardinality(2, 1).should == 2
+      expect(subject.cardinality(2, 1)).to eq(2)
     end
 
     it "should return 4 for cardinality(2, 2)" do
-      subject.cardinality(2, 2).should == 4
+      expect(subject.cardinality(2, 2)).to eq(4)
     end
 
     it "should return 3 for cardinality(3, 1)" do
-      subject.cardinality(3, 1).should == 3
+      expect(subject.cardinality(3, 1)).to eq(3)
     end
 
     it "should return 3 for cardinality(1, 3)" do
-      subject.cardinality(1, 3).should == 3
+      expect(subject.cardinality(1, 3)).to eq(3)
     end
 
     it "should return 6 for cardinality(2, 3)" do
-      subject.cardinality(2, 3).should == 6
+      expect(subject.cardinality(2, 3)).to eq(6)
     end
 
     it "should return 6 for cardinality(3, 2)" do
-      subject.cardinality(3, 2).should == 6
+      expect(subject.cardinality(3, 2)).to eq(6)
     end
     
     it "should return 9 for cardinality(3, 3)" do
-      subject.cardinality(3, 3).should == 9
+      expect(subject.cardinality(3, 3)).to eq(9)
     end
 
     it "should raise RangeError if c1 is negative" do
-      lambda { subject.cardinality(-1, 1) }.should raise_error(RangeError)
+      expect { subject.cardinality(-1, 1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if c2 is negative" do
-      lambda { subject.cardinality(1, -1) }.should raise_error(RangeError)
+      expect { subject.cardinality(1, -1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if c1 is zero" do
-      lambda { subject.cardinality(0, 1) }.should raise_error(RangeError)
+      expect { subject.cardinality(0, 1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if c2 is zero" do
-      lambda { subject.cardinality(1, 0) }.should raise_error(RangeError)
+      expect { subject.cardinality(1, 0) }.to raise_error(RangeError)
     end
   end
 

data/spec/cartesian_product/mixin_examples.rb

@@ -7,52 +7,52 @@ shared_examples_for "CartesianProduct::Mixin" do
     set     = subject[1]
     results = set.cartprod(set)
 
-    results.should be_kind_of(Enumerator)
+    expect(results).to be_kind_of(Enumerator)
   end
 
   it "the cartprod of two empty Set's should return an empty Set" do
     set     = subject[]
     results = set.cartprod([]).to_a
     
-    results.should be_empty
+    expect(results).to be_empty
   end
 
   it "the cartprod of a single empty set should return an empty Set" do
     set     = subject[1,2]
     results = set.cartprod([2,3],[]).to_a
     
-    results.should be_empty
+    expect(results).to be_empty
   end
 
   it "the cartprod of another empty set should also return an empty Set" do
     set     = subject[]
     results = set.cartprod([1]).to_a
     
-    results.should be_empty
+    expect(results).to be_empty
   end
 
   it "the cartprod of [1] and [1] should be [[1, 1]]" do
     set     = subject[1]
     results = set.cartprod([1]).to_a
     
-    results.should == [[1, 1]]
+    expect(results).to eq([[1, 1]])
   end
 
   it "the cartprod of [1, 2] and [3] should be [[1, 3], [2, 3]]" do
     set     = subject[1, 2]
     results = set.cartprod([3]).to_a
     
-    results.should =~ [[1, 3], [2, 3]]
+    expect(results).to match_array([[1, 3], [2, 3]])
   end
 
   it "the cartprod of [1, 2] and [3, 4] should be [[1, 3], [1, 4], [2, 3], [2, 4]]" do
     set     = subject[1, 2]
     results = set.cartprod([3, 4]).to_a
     
-    results.should =~ [
+    expect(results).to match_array([
       [1, 3], [1, 4],
       [2, 3], [2, 4]
-    ]
+    ])
   end
 
   it "the cartprod of ['a'].cartprod(['b', 'c', 'd']) should be [['a', 'b'], ['a', 'c'], ['a', 'd']]" do
@@ -60,7 +60,7 @@ shared_examples_for "CartesianProduct::Mixin" do
     set2    = subject['b', 'c', 'd']
     results = set1.cartprod(set2).to_a
     
-    results.should =~ [['a', 'b'], ['a', 'c'], ['a', 'd']]
+    expect(results).to match_array([['a', 'b'], ['a', 'c'], ['a', 'd']])
   end
 
   it "the cartprod of [0, 1] and [[2, 3], [4, 5]] should be [[0, 2, 4], [1, 2, 4], [0, 3, 4], [1, 3, 4], [0, 2, 5], [1, 2, 5], [0, 3, 5], [1, 3, 5]]" do
@@ -69,10 +69,10 @@ shared_examples_for "CartesianProduct::Mixin" do
     set3    = subject[4, 5]
     results = set1.cartprod(set2, set3).to_a
     
-    results.should =~ [
+    expect(results).to match_array([
       [0, 2, 4], [0, 2, 5], [0, 3, 4], [0, 3, 5],
       [1, 2, 4], [1, 2, 5], [1, 3, 4], [1, 3, 5],
-    ]
+    ])
   end
 
   it "should take an optional block argument" do
@@ -81,18 +81,18 @@ shared_examples_for "CartesianProduct::Mixin" do
 
     set.cartprod(set) { |result| results << result }
 
-    results.should == [[1, 1]]
+    expect(results).to eq([[1, 1]])
   end
 
   it "should alias cartprod to cartesian_product" do
     aset = subject[1]
 
-    aset.should respond_to(:cartesian_product)
+    expect(aset).to respond_to(:cartesian_product)
   end
 
   it "should alias cartprod to cartesian" do
     aset = subject[1]
 
-    aset.should respond_to(:cartesian)
+    expect(aset).to respond_to(:cartesian)
   end
 end

data/spec/choose/cardinality_spec.rb

@@ -1,128 +1,126 @@
 require 'spec_helper'
 require 'combinatorics/choose'
 
-describe Choose do
-  subject { Choose }
-
+describe Combinatorics::Choose do
   describe "cardinality" do
     it "should raise RangeError if n is negative" do
-      lambda { subject.cardinality(-1) }.should raise_error(RangeError)
+      expect { subject.cardinality(-1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if n is negative" do
-      lambda { subject.cardinality(-1, 1) }.should raise_error(RangeError)
+      expect { subject.cardinality(-1, 1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if r is negative" do
-      lambda { subject.cardinality(1, -1) }.should raise_error(RangeError)
+      expect { subject.cardinality(1, -1) }.to raise_error(RangeError)
     end
 
     it "should raise RangeError if r is greater than n" do
-      lambda { subject.cardinality(2, 3) }.should raise_error(RangeError)
+      expect { subject.cardinality(2, 3) }.to raise_error(RangeError)
     end
 
     it "should return 1 for subject.cardinality(0)" do
-      subject.cardinality(0).should == 1
+      expect(subject.cardinality(0)).to eq(1)
     end
 
     it "should return 1 for subject.cardinality(1)" do
-      subject.cardinality(1).should == 1
+      expect(subject.cardinality(1)).to eq(1)
     end
 
     it "should return 2 for subject.cardinality(2)" do
-      subject.cardinality(2).should == 2
+      expect(subject.cardinality(2)).to eq(2)
     end
 
     it "should return 6 for subject.cardinality(3)" do
-      subject.cardinality(3).should == 6
+      expect(subject.cardinality(3)).to eq(6)
     end
 
     it "should return 24 for subject.cardinality(4)" do
-      subject.cardinality(4).should == 24
+      expect(subject.cardinality(4)).to eq(24)
     end
 
-    it "should return 0 for subject.cardinality(1, 0)" do
-      subject.cardinality(1, 0).should == 0
+    it "should return 1 for subject.cardinality(1, 0)" do
+      expect(subject.cardinality(1, 0)).to eq(1)
     end
 
     it "should return 1 for subject.cardinality(1, 1)" do
-      subject.cardinality(1, 1).should == 1
+      expect(subject.cardinality(1, 1)).to eq(1)
     end
 
     it "should return 2 for subject.cardinality(2, 1)" do
-      subject.cardinality(2, 1).should == 2
+      expect(subject.cardinality(2, 1)).to eq(2)
     end
 
     it "should return 1 for subject.cardinality(2, 2)" do
-      subject.cardinality(2, 2).should == 1
+      expect(subject.cardinality(2, 2)).to eq(1)
     end
 
     it "should return 3 for subject.cardinality(3, 1)" do
-      subject.cardinality(3, 1).should == 3
+      expect(subject.cardinality(3, 1)).to eq(3)
     end
 
     it "should return 3 for subject.cardinality(3, 2)" do
-      subject.cardinality(3, 2).should == 3
+      expect(subject.cardinality(3, 2)).to eq(3)
     end
 
     it "should return 1 for subject.cardinality(3, 3)" do
-      subject.cardinality(3, 3).should == 1
+      expect(subject.cardinality(3, 3)).to eq(1)
     end
 
     it "should return 4 for subject.cardinality(4, 1)" do
-      subject.cardinality(4, 1).should == 4
+      expect(subject.cardinality(4, 1)).to eq(4)
     end
 
     it "should return 6 for subject.cardinality(4, 2)" do
-      subject.cardinality(4, 2).should == 6
+      expect(subject.cardinality(4, 2)).to eq(6)
     end
 
     it "should return 4 for subject.cardinality(4, 3)" do
-      subject.cardinality(4, 3).should == 4
+      expect(subject.cardinality(4, 3)).to eq(4)
     end
 
     it "should return 1 for subject.cardinality(4, 4)" do
-      subject.cardinality(4, 4).should == 1
+      expect(subject.cardinality(4, 4)).to eq(1)
     end
 
     it "should return 15 for subject.cardinality(6, 4)" do
-      subject.cardinality(6, 4).should == 15
+      expect(subject.cardinality(6, 4)).to eq(15)
     end
 
     it "should return 3628800 for subject.cardinality(10)" do
-      subject.cardinality(10).should == 3628800
+      expect(subject.cardinality(10)).to eq(3628800)
     end
   end
 
   describe "cardinality_all" do
     it "should return [] for subject.cardinality_all(0)" do
-      subject.cardinality_all(0).should be_empty
+      expect(subject.cardinality_all(0)).to be_empty
     end
 
     it "should return [1] for subject.cardinality_all(1)" do
-      subject.cardinality_all(1).should == [1]
+      expect(subject.cardinality_all(1)).to eq([1])
     end
 
     it "should return [2, 1] for subject.cardinality_all(2)" do
-      subject.cardinality_all(2).should == [2, 1]
+      expect(subject.cardinality_all(2)).to eq([2, 1])
     end
 
     it "should return [3, 3, 1] for subject.cardinality_all(3)" do
-      subject.cardinality_all(3).should == [3, 3, 1]
+      expect(subject.cardinality_all(3)).to eq([3, 3, 1])
     end
 
     it "should return [4, 6, 4, 1] for subject.cardinality_all(4)" do
-      subject.cardinality_all(4).should == [4, 6, 4, 1]
+      expect(subject.cardinality_all(4)).to eq([4, 6, 4, 1])
     end
 
     it "should allow specifying the range of `r` values" do
-      subject.cardinality_all(10,5..10).should == [
+      expect(subject.cardinality_all(10,5..10)).to eq([
         252, 210, 120, 45, 10, 1
-      ]
+      ])
     end
 
     it "should raise RangeError for subject.cardinality_all(-1)" do
-      lambda { subject.cardinality_all(-1) }.should raise_error(RangeError)
+      expect { subject.cardinality_all(-1) }.to raise_error(RangeError)
     end
 
     it "should wrap cardinality with Choose.C" do

data/spec/choose/mixin_examples.rb

@@ -8,41 +8,41 @@ shared_examples_for "Choose::Mixin" do
     set     = subject[]
     results = set.choose(0).to_a
 
-    results.should == [empty_set]
+    expect(results).to eq([empty_set])
   end
 
   it "should return [[]] for [1].choose(0).to_a" do
     set     = subject[1]
     results = set.choose(0).to_a
     
-    results.should == [empty_set]
+    expect(results).to eq([empty_set])
   end
 
   it "should return [[1]] for [1].choose(1).to_a" do
     set     = subject[1]
     results = set.choose(1).to_a
     
-    results.should == [Set[1]]
+    expect(results).to eq([Set[1]])
   end
 
   it "should return [[1], [2]] for [1, 2].choose(1).to_a" do
     set     = subject[1, 2]
     results = set.choose(1).to_a
     
-    results.should =~ [Set[1], Set[2]]
+    expect(results).to match_array([Set[1], Set[2]])
   end
 
   it "should return [[1, 2]] for [1, 2].choose(2).to_a" do
     set     = subject[1, 2]
     results = set.choose(2).to_a
     
-    results.should == [Set[1, 2]]
+    expect(results).to eq([Set[1, 2]])
   end
 
   it "should filter out repeated elements" do
     set1 = subject[1,1,2,3]
     set2 = subject[1,2,3]
 
-    set1.choose(2).to_a.should == set2.choose(2).to_a
+    expect(set1.choose(2).to_a).to eq(set2.choose(2).to_a)
   end
 end

data/spec/combinatorics_spec.rb

@@ -3,6 +3,6 @@ require 'combinatorics/version'
 
 describe Combinatorics do
   it "should have a VERSION constant" do
-    subject.const_get('VERSION').should_not be_empty
+    expect(subject.const_get('VERSION')).not_to be_empty
   end
 end

data/spec/derange/cardinality_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 require 'combinatorics/derange/cardinality'
 
-describe Derange do
-  subject { Derange }
-
+describe Combinatorics::Derange do
   it "should alias cardinality to subfactorial" do
     should respond_to(:cardinality)
   end

data/spec/derange/mixin_examples.rb

@@ -7,28 +7,28 @@ shared_examples_for "Derange::Mixin" do
     set     = subject[]
     results = set.derange.to_a
     
-    results.should == [[]]
+    expect(results).to eq([[]])
   end
 
   it "should return [[]] for [1].derange.to_a" do
     set     = subject[1]
     results = set.derange.to_a
 
-    results.should == [[]]
+    expect(results).to eq([[]])
   end
 
   it "should return [[2, 1]] for [1, 2].derange.to_a" do
     set     = subject[1, 2]
     results = set.derange.to_a
 
-    results.should == [[2, 1]]
+    expect(results).to eq([[2, 1]])
   end
 
   it "should return [[2, 1, 4, 3], [2, 3, 4, 1], [2, 4, 1, 3], [3, 1, 4, 2], [3, 4, 1, 2], [3, 4, 2, 1], [4, 1, 2, 3], [4, 3, 1, 2], [4, 3, 2, 1]] for [1, 2, 3, 4].derange.to_a" do
     set     = [1, 2, 3, 4]
     results = set.derange.to_a
     
-    results.should == [
+    expect(results).to eq([
       [2, 1, 4, 3],
       [2, 3, 4, 1],
       [2, 4, 1, 3],
@@ -38,7 +38,7 @@ shared_examples_for "Derange::Mixin" do
       [4, 1, 2, 3],
       [4, 3, 1, 2],
       [4, 3, 2, 1]
-    ]
+    ])
   end
 
   it "should take an optional block argument" do
@@ -47,6 +47,6 @@ shared_examples_for "Derange::Mixin" do
 
     set.derange { |deranged| results << deranged }
 
-    results.should == [[2, 3, 1], [3, 1, 2]]
+    expect(results).to eq([[2, 3, 1], [3, 1, 2]])
   end
 end

data/spec/enumerator_spec.rb

@@ -3,6 +3,6 @@ require 'combinatorics/enumerator'
 
 describe Combinatorics::Enumerator do
   it "should auto-detect the Enumerator class" do
-    Combinatorics::Enumerator.should_not be_nil
+    expect(Combinatorics::Enumerator).not_to be_nil
   end
 end