bet 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e7c97a52bb4e4ba5a5dcb2a98f6467225a6718
-  data.tar.gz: 9b38ee0ad8f170b0bbc0189c4d7f8a2ebefd0141
+  metadata.gz: 98a33134f1f23b9347eb046690cc6f2692c6452b
+  data.tar.gz: e8a3390c0910bca81f24b078ac295c99c12a0521
 SHA512:
-  metadata.gz: 200218acceb2434ecd5c1618e5ad14a12725ed38188855cfae3b20a28b1dde7cb2a7d28547a49cf4a9d04aea574c5e2d394d9251d928c135f1e368bd4ef56596
-  data.tar.gz: bf770179e639fbe4aa05007f478ac36d150cd83c38a88cea5e422af439dd5dabbcf87430754f7bb01d66e5a9e967a5239ef3d3486d06ad9e21cd17b16a283ddd
+  metadata.gz: e32a4970b3ad3570f0cc0121a5d7c316052640feb649fa8b45c49dbcc907e9d606ce4edd319544e17cd1ab417030d2803ab7eb30a06fbd18aa9c719af3d34269
+  data.tar.gz: 87c053a6cb75605c10422fb29145c00df682d39ac263398e31de4a38c6e31cb5824531737a9ae7be482381076bb91b6bfd8aac238a221f59918b9415df3d2859

data/lib/bet/bet_calculations/combinatorial.rb

@@ -11,8 +11,8 @@ module Bet
         block: 9
       }.each do |ord, n|
         define_method(ord) do |opts|
-          prices = extract_prices(opts)
-          raise ArgumentError, "Wrong number of prices (#{prices.size} for #{n})" if prices.size != n
+          results = extract_prices(opts)
+          raise ArgumentError, "Wrong number of results (#{results.size} for #{n})" if results.size != n
           opts[:min_size] = 2
           full_cover(opts)
         end
@@ -28,8 +28,8 @@ module Bet
         block_with_singles: 9
       }.each do |ord, n|
         define_method(ord) do |opts|
-          prices = extract_prices(opts)
-          raise ArgumentError, "Wrong number of prices (#{prices.size} for #{n})" if prices.size != n
+          results = extract_prices(opts)
+          raise ArgumentError, "Wrong number of results (#{results.size} for #{n})" if results.size != n
           full_cover(opts)
         end
       end 
@@ -39,18 +39,30 @@ module Bet
         opts   = parse_opts(opts)
         opts   = { min_size: 1 }.merge(opts)
 
-        num_bets = 0
-        returns = (opts[:min_size]..opts[:prices].length).to_a.map do |n|
-          win_prices.combination(n).map do |multis|
-            num_bets += 1
-            acca(stake: opts[:stake], prices: multis)
+        num_bets = (opts[:min_size]..prices.length).to_a.map do |n|
+          (1..prices.length).to_a.combination(n).to_a.length
+        end.reduce(:+)
+
+        winning_prices = if prices.is_a?(Hash)
+            prices.select{ |_,v| win_place_lose?(v) == :win }.keys
+          else
+            prices
+          end
+
+        returns = (opts[:min_size]..winning_prices.length).to_a.map do |n|
+          winning_prices.combination(n).map do |multis|
+            acca(stake: opts[:stake], prices: multis)[:returns]
           end.reduce(:+)
         end.reduce(:+)
 
-        total_stake = num_bets * stake
-        profit = returns - total_stake
+        outlay = num_bets * opts[:stake]
+        profit = returns - outlay
 
-        [returns, profit, total_stake]
+        {
+          returns: returns,
+          profit: profit,
+          outlay: outlay
+        }
       end
     end
   end

data/lib/bet/bet_calculations/core.rb

@@ -15,13 +15,17 @@ module Bet
         
         return send("ew_#{__method__}") if opts[:ew]
 
-        returns = c(opts[:stake], opts[:prices].reduce(:*))
+        returns = c(opts[:stake], prices.reduce(:*))
         profit  = returns - opts[:stake]
 
-        [returns, profit, opts[:stake]]
+        {
+          returns: returns,
+          profit: profit,
+          outlay: opts[:stake]
+        }
       end
-      alias :acca, :accumulator
-      alias :parlay, :accumulator
+      alias_method :acca, :accumulator
+      alias_method :parlay, :accumulator
     end
   end
 end

data/lib/bet/calc.rb

@@ -12,34 +12,36 @@ module Bet
     DEFAULT_OPTS = { stake: 1, ew: false }
     WIN_PLACE_LOSS_INTEGER = { -1 => :loss, 0 => :place, 1 => :win }
 
-    attr_accessor :returns, :profit
+    attr_accessor :returns, :profit, :outlay
 
     def initialize(bet_type, opts)
-      @returns, @profit, @stake = send(bet_type, opts)
+      @returns, @profit, @outlay = send(bet_type, opts).values
     end
 
-    private
-      def win_place_lose?(v)
-        v.is_a?(Fixnum) ? WIN_PLACE_LOSS_INTEGER[v] : v
-      end
-
-      def c(stake, price)
-        stake * price
-      end
-
-      def extract_prices(opts_or_prices)
-        case opts_or_prices
-        when Hash
-          opts_or_prices[:prices]
-        when Numeric
-          [opts_or_prices]
-        else
-          opts_or_prices
+    class << self
+      private
+        def win_place_lose?(v)
+          v.is_a?(Fixnum) ? WIN_PLACE_LOSS_INTEGER[v] : v
         end
-      end
 
-      def parse_opts(opts_or_prices)
-        opts_or_prices.is_a?(Hash) ? DEFAULT_OPTS.merge(opts_or_prices) : DEFAULT_OPTS
-      end
+        def c(stake, price)
+          stake * price
+        end
+
+        def extract_prices(opts_or_prices)
+          case opts_or_prices
+          when Hash
+            opts_or_prices[:prices] ? extract_prices(opts_or_prices[:prices]) : opts_or_prices
+          when Numeric
+            [opts_or_prices]
+          else
+            opts_or_prices
+          end
+        end
+
+        def parse_opts(opts_or_prices)
+          opts_or_prices.is_a?(Hash) ? DEFAULT_OPTS.merge(opts_or_prices) : DEFAULT_OPTS
+        end
+    end
   end
 end

data/lib/bet/version.rb

@@ -1,3 +1,3 @@
 module Bet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mike Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler