rodders 3.1.0 → 3.1.1

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/mutually_exclusive_collection.rb

@@ -2,34 +2,40 @@
 # Includes methods for sports betting arbitrage. Due to the discrete nature
 # of real-world monetary amounts, there may be small rounding errors.
 class MutuallyExclusiveCollection
+  include Enumerable
+
   # create a new collection with the given odds
   # @param [Array<FixedOdds>] mutually_exclusive_outcome_odds the odds for all the mutually exclusive outcomes
   def initialize mutually_exclusive_outcome_odds
-    @mutually_exclusive_outcome_odds = mutually_exclusive_outcome_odds.sort
+    @mutually_exclusive_outcome_odds = mutually_exclusive_outcome_odds
+  end
+
+  def each
+    @mutually_exclusive_outcome_odds.each {|outcome| yield outcome }
   end
 
   # the least likely of the odds to occur
   # @return [FixedOdds] the least likely odd
   def least_likely
-    @mutually_exclusive_outcome_odds.first
+    min
   end
 
   # the most likely of the odds to occur
   # @return [FixedOdds] the most likely odd
   def most_likely
-    @mutually_exclusive_outcome_odds.last
+    max
   end  
 
   # the odds in ascending order of probability
   # @return [Array<FixedOdds>] odds in ascending probability
   def in_ascending_probability
-    @mutually_exclusive_outcome_odds
+    sort
   end
 
   # the odds in descending order of probability
   # @return [Array<FixedOdds>] odds in descending probability
   def in_descending_probability
-    @mutually_exclusive_outcome_odds.reverse
+    sort.reverse
   end
 
   # tells if arbitrage is possible for a collection of odds

data/rodders.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rodders"
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2012-11-11"
+  s.date = "2013-08-15"
   s.description = "Converts between fractional, decimal and moneyline odds for betting and gambling. Calculates how much can be won on a given stake."
   s.email = "nigel-lowry@ultra.eclipse.co.uk"
   s.extra_rdoc_files = [

data/spec/mutually_exclusive_collection_spec.rb

@@ -4,138 +4,125 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "MutuallyExclusiveCollection" do
 
   context "non-arbitrage methods" do
-    before(:each) do    
-      @good_team = FixedOdds.from_s '-275'
-      @draw = FixedOdds.from_s '+429'
-      @bad_team = FixedOdds.from_s '+915'
+    let(:good_team) { FixedOdds.from_s '-275' }
+    let(:draw) { FixedOdds.from_s '+429' }
+    let(:bad_team) { FixedOdds.from_s '+915' }
+    let(:events) { MutuallyExclusiveCollection.new [draw, bad_team, good_team] }
 
-      @events = MutuallyExclusiveCollection.new [@draw, @bad_team, @good_team]
-    end
-
-    subject { @events }
+    subject { events }
 
-    its(:most_likely) { should == @good_team }
-    its(:least_likely) { should == @bad_team }
-    its(:in_descending_probability) { should == [@good_team, @draw, @bad_team] }
-    its(:in_ascending_probability) { should == [@bad_team, @draw, @good_team] }
+    its(:most_likely) { should == good_team }
+    its(:least_likely) { should == bad_team }
+    its(:in_descending_probability) { should == [good_team, draw, bad_team] }
+    its(:in_ascending_probability) { should == [bad_team, draw, good_team] }
   end
 
   context "empty array" do
-    before(:each) do
-      @bookmaker = MutuallyExclusiveCollection.new []
-    end
+    subject { MutuallyExclusiveCollection.new [] }
 
-    specify { @bookmaker.bookmakers_return_rate.should be_nil }
+    its(:bookmakers_return_rate) { should be_nil }
   end
 
   context "decimal odds arbitrage" do
-    before(:each) do
-      @bookmaker1outcome1 = FixedOdds.from_s '2.25'
-      @bookmaker1outcome2 = FixedOdds.from_s '4.9'
-      @bookmaker2outcome1 = FixedOdds.from_s '2.43'
-      @bookmaker2outcome2 = FixedOdds.from_s '3.85'
+    let(:bookmaker1outcome1) { FixedOdds.from_s '2.25' }
+    let(:bookmaker1outcome2) { FixedOdds.from_s '4.9' }
+    let(:bookmaker2outcome1) { FixedOdds.from_s '2.43' }
+    let(:bookmaker2outcome2) { FixedOdds.from_s '3.85' }
 
-      @bookmaker1 = MutuallyExclusiveCollection.new [@bookmaker1outcome1, @bookmaker1outcome2]
-      @bookmaker2 = MutuallyExclusiveCollection.new [@bookmaker2outcome1, @bookmaker2outcome2]
+    let(:bookmaker1) { MutuallyExclusiveCollection.new [bookmaker1outcome1, bookmaker1outcome2] }
+    let(:bookmaker2) { MutuallyExclusiveCollection.new [bookmaker2outcome1, bookmaker2outcome2] }
 
-      @bookmaker_vulnerable_to_arbitrage = MutuallyExclusiveCollection.new [@bookmaker2outcome1, @bookmaker1outcome2]
-    end
+    let(:bookmaker_vulnerable_to_arbitrage) { MutuallyExclusiveCollection.new [bookmaker2outcome1, bookmaker1outcome2] }
 
-    specify { @bookmaker1.should_not be_arbitrageable }
-    specify { @bookmaker2.should_not be_arbitrageable } 
-    specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
+    specify { bookmaker1.should_not be_arbitrageable }
+    specify { bookmaker2.should_not be_arbitrageable }
+    specify { bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
 
-    specify { @bookmaker1.bookmakers_return_rate.should be_within(0.0001).of(0.0534) }
-    specify { @bookmaker2.bookmakers_return_rate.should be_within(0.0001).of(0.0478) }
+    specify { bookmaker1.bookmakers_return_rate.should be_within(0.0001).of(0.0534) }
+    specify { bookmaker2.bookmakers_return_rate.should be_within(0.0001).of(0.0478) }
 
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£4.63'.to_money }
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_percentage.should be_within(0.001).of(0.046) }
+    specify { bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£4.63'.to_money }
+    specify { bookmaker_vulnerable_to_arbitrage.profit_percentage.should be_within(0.001).of(0.046) }
   end
 
   context "fractional odds arbitrage" do
-    before(:each) do
-      @odds1 = FixedOdds.from_s '2/1'
-      @odds2 = FixedOdds.from_s '3/1'
+    let(:odds1) { FixedOdds.from_s '2/1' }
+    let(:odds2) { FixedOdds.from_s '3/1' }
 
-      @bookmaker_vulnerable_to_arbitrage = MutuallyExclusiveCollection.new [@odds1, @odds2]
-    end
+    let(:bookmaker_vulnerable_to_arbitrage) { MutuallyExclusiveCollection.new [odds1, odds2] }
 
-    subject { @bookmaker_vulnerable_to_arbitrage }
+    subject { bookmaker_vulnerable_to_arbitrage }
 
-    specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
+    specify { bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
     its(:profit_percentage) { should be_within(0.001).of(0.2) }
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£100'.to_money }
+    specify { bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£100'.to_money }
   end
 
   context "more than two mutually exclusive events" do
-    before(:each) do
-      @odds1 = FixedOdds.from_s '2.3'
-      @odds2 = FixedOdds.from_s '8.0'
-      @odds3 = FixedOdds.from_s '18.0'
+    let(:odds1) { FixedOdds.from_s '2.3' }
+    let(:odds2) { FixedOdds.from_s '8.0' }
+    let(:odds3) { FixedOdds.from_s '18.0' }
 
-      @bookmaker_vulnerable_to_arbitrage = MutuallyExclusiveCollection.new [@odds1, @odds2, @odds3]
-    end
+    let(:bookmaker_vulnerable_to_arbitrage) { MutuallyExclusiveCollection.new [odds1, odds2, odds3] }
 
-    subject { @bookmaker_vulnerable_to_arbitrage }
+    subject { bookmaker_vulnerable_to_arbitrage }
 
-    specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
+    it { should be_arbitrageable }
     its(:profit_percentage) { should be_within(0.0000001).of(0.02996) }
 
     describe "#percentages" do
       it "gives the percentages to put on each bet" do
-        percentages = @bookmaker_vulnerable_to_arbitrage.percentages
+        percentages = bookmaker_vulnerable_to_arbitrage.percentages
         percentages.should have(3).items
-        percentages[@odds1].should be_within(0.0001).of(0.7922)
-        percentages[@odds2].should be_within(0.0001).of(0.1472)
-        percentages[@odds3].should be_within(0.0001).of(0.0606)
+        percentages[odds1].should be_within(0.0001).of(0.7922)
+        percentages[odds2].should be_within(0.0001).of(0.1472)
+        percentages[odds3].should be_within(0.0001).of(0.0606)
       end
     end
 
     describe "#stakes_for_total_stake" do
       it "gives the right amounts" do
         total = Money.parse '£500'
-        amounts = @bookmaker_vulnerable_to_arbitrage.stakes_for_total_stake total
+        amounts = bookmaker_vulnerable_to_arbitrage.stakes_for_total_stake total
         amounts.should have(3).items
-        amounts[@odds1].should == '£396.14'.to_money
-        amounts[@odds2].should == '£73.57'.to_money
-        amounts[@odds3].should == '£30.29'.to_money
+        amounts[odds1].should == '£396.14'.to_money
+        amounts[odds2].should == '£73.57'.to_money
+        amounts[odds3].should == '£30.29'.to_money
         amounts.values.reduce(:+).should == total
       end
     end
 
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£14.98'.to_money }
+    specify { bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£14.98'.to_money }
 
     describe "#stakes_for_profit" do
       it "gives the right amounts" do
-        amounts = @bookmaker_vulnerable_to_arbitrage.stakes_for_profit '£750'.to_money
+        amounts = bookmaker_vulnerable_to_arbitrage.stakes_for_profit '£750'.to_money
         amounts.should have(3).items
-        amounts[@odds1].should == '£19833.33'.to_money
-        amounts[@odds2].should == '£3683.33'.to_money
-        amounts[@odds3].should == '£1516.67'.to_money
+        amounts[odds1].should == '£19833.33'.to_money
+        amounts[odds2].should == '£3683.33'.to_money
+        amounts[odds3].should == '£1516.67'.to_money
         amounts.values.reduce(:+).should == '£25033.33'.to_money
       end
     end
 
-    specify { @bookmaker_vulnerable_to_arbitrage.stake_to_profit('£750'.to_money).should == '£25033.33'.to_money }
+    specify { bookmaker_vulnerable_to_arbitrage.stake_to_profit('£750'.to_money).should == '£25033.33'.to_money }
   end
 
   context "different events with same odds" do
-    before(:each) do
-      @odds1 = FixedOdds.from_s '15/1'
-      @odds2 = FixedOdds.from_s '15/1'
+    let(:odds1) { FixedOdds.from_s '15/1' }
+    let(:odds2) { FixedOdds.from_s '15/1' }
 
-      @bookmaker_vulnerable_to_arbitrage = MutuallyExclusiveCollection.new [@odds1, @odds2]
-    end
+    let(:bookmaker_vulnerable_to_arbitrage) { MutuallyExclusiveCollection.new [odds1, odds2] }
 
-    specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£650'.to_money }
+    specify { bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
+    specify { bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£650'.to_money }
 
     describe "#percentages" do
       it "gives the percentages to put on each bet" do
-        percentages = @bookmaker_vulnerable_to_arbitrage.percentages
+        percentages = bookmaker_vulnerable_to_arbitrage.percentages
         percentages.should have(2).items
-        percentages[@odds1].should be_within(0.0001).of(0.5)
-        percentages[@odds2].should be_within(0.0001).of(0.5)
+        percentages[odds1].should be_within(0.0001).of(0.5)
+        percentages[odds2].should be_within(0.0001).of(0.5)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodders
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 437333735277840555
+      hash: -1412755025322987782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: