dice_stats 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 550a73cd3da532b999d2a750d855834f2d8309c7
-  data.tar.gz: 4f44f0e15ed3119b4e9d2041d76c243dbbe1d20f
+  metadata.gz: d2585fee905bf91f1d0b97de506e244c6a12b552
+  data.tar.gz: 990f862e6ffe00adba7941fc08c6b2fd2af88de5
 SHA512:
-  metadata.gz: 3d4255a6609b5011f719d8a3a23591f70645c5f155af1f5c03010aa79e9015c6083a737dffb2d5978e077293f9a2603ee127ce60cd3ade3e7bd31732bdc229aa
-  data.tar.gz: cfcaec8afea73f1df4519f7eb8f6b66e6cbee9b16a461b222e3fde4db66968ec2db9ba86e59f1a41853845edee4b85b9c251a5457cb9309a66b6e5ada3e4c98c
+  metadata.gz: 1042285361fee86176d87b58ecacd339e563f083dbea7cfbf8493d1f5dd710e70105672c5afaa19cff1747243e3c911ebb915d6b7dc3f03fc27cab5c2622c84f
+  data.tar.gz: 21829b5c09f5f28532a397b9ec54b350f1fa0c68e235eb59a09e56585a04bae603467ce0f090f513961fc55525c95ea11fb379704533a4524cbb0a348faae8b3

data/lib/Dice.rb

@@ -19,7 +19,7 @@ module Dice_Stats
 		##
 		# Creates a new Dice instance of a number of dice (+dice_count+) with +dice_sides+ faces.
 		# All dice are assumed to go from 1 to +dice_sides+.
-		def initialize(dice_count, dice_sides)
+		def initialize(dice_count, dice_sides, do_calculation=true)
 			@count = dice_count
 			@sides = dice_sides
 			@probability_distribution = {}
@@ -27,7 +27,11 @@ module Dice_Stats
 			if (@count < 0 || @sides < 0)
 				#error
 			else
-				@probability_distribution = calculate_probability_distribution
+				if do_calculation
+					@probability_distribution = calculate_probability_distribution
+				else
+					@probability_distribution = {}
+				end
 			end
 		end
 

data/lib/Dice_Set.rb

@@ -17,6 +17,42 @@ module Dice_Stats
 		# The constituent separate dice
 		attr_accessor :dice
 
+		##
+		# Returns the "clean string" for a dice pattern without actually instantiating the class, calculating the probability, etc.
+		# Good to use to check a cache hit if results are being cached
+		def self.Get_Clean_String(dice_string, with_constant=true)
+			dice = []
+			constant = 0
+
+
+			split_string = dice_string.split('+')
+
+			split_string.map!{|i| i.strip }
+
+			split_string.count.times { |i|
+				if /\d+[dD]\d+/.match(split_string[i])
+					sub_string_split = split_string[i].downcase.split('d')
+					dice << Dice.new(sub_string_split[0].to_i, sub_string_split[1].to_i, false)
+				elsif (split_string[i].to_i > 0)
+					constant += split_string[i].to_i
+				else
+					puts "Unexpected paramter: #{split_string[0]}"
+				end
+			}
+
+			dice.sort! { |d1,d2| d2.sides <=> d1.sides }
+
+			formatted_string = ""
+			dice.each { |d| 
+				formatted_string += d.count.to_s + "d" + d.sides.to_s + " + "
+			}
+			if with_constant && constant > 0
+				return (formatted_string + constant.to_s)
+			else
+				return (formatted_string[0..formatted_string.length-4])
+			end
+		end
+
 		##
 		# Instantiates a new Dice_Set with the specified +dice_string+ pattern.
 		# Examples:
@@ -24,7 +60,15 @@ module Dice_Stats
 		# "2d6 + 5"
 		# "1d8"
 		# "5d4 + 3d10"
-		def initialize(dice_string)
+		# If +probability_distribution+ is set, no distributions will be calculated and the provided distribution will be used.
+		def initialize(dice_string, probability_distribution=nil)
+			
+			# Reject any predefined probability distributions that don't sum to 1.0.
+			# Perhaps in the future I should add slightly better checks, but this is adequate for now.
+			if probability_distribution != nil && (probability_distribution.inject(0) { |memo,(k,v)| memo + v }.round(3).to_f != 1.0)
+				probability_distribution = nil
+			end
+
 			@dice = []
 			@constant = 0
 			@input_string = dice_string
@@ -37,7 +81,9 @@ module Dice_Stats
 			split_string.count.times { |i|
 				if /\d+[dD]\d+/.match(split_string[i])
 					sub_string_split = split_string[i].downcase.split('d')
-					@dice << Dice.new(sub_string_split[0].to_i, sub_string_split[1].to_i)
+
+					# Skip calculating the sub-die distribution if the total one is already cached
+					@dice << Dice.new(sub_string_split[0].to_i, sub_string_split[1].to_i, (probability_distribution == nil))
 				elsif (split_string[i].to_i > 0)
 					@constant += split_string[i].to_i
 				else
@@ -45,17 +91,16 @@ module Dice_Stats
 				end
 			}
 
-			if @dice.inject(1) { |memo,d| memo * d.probability_distribution.length } > 10_000_000
-				# if the n-ary cartesian product has to process more than 10,000,000 combinations it can take quite a while to finish...
-				@aborted_probability_distribution = true
-			else
-				@dice.sort! { |d1,d2| d2.sides <=> d1.sides }
+			@dice.sort! { |d1,d2| d2.sides <=> d1.sides }
 
-				@probability_distribution = combine_probability_distributions
+			if probability_distribution != nil
+				@probability_distribution = probability_distribution
+			else
+				@probability_distribution = combine_probability_distributions 
+			end
 				
-				if (@probability_distribution.inject(0) { |memo,(k,v)| memo + v }.round(3).to_f != 1.0)
-					#puts "Error in probability distrubtion."
-				end
+			if (@probability_distribution.inject(0) { |memo,(k,v)| memo + v }.round(3).to_f != 1.0)
+				#puts "Error in probability distrubtion."
 			end
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_stats
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Foy
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Dice statistics utility.