dice_stats 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7086bffbd719c8eee013b15b67695a448dbd6d2
-  data.tar.gz: d4eb3dbf7782a16674b9b71fb4eae0da8df263f0
+  metadata.gz: b91a68b4ea5dfe5d5f1cd908ec80f27860198e25
+  data.tar.gz: 0a9edddebaec43166a0681b2635ea3cac151eee8
 SHA512:
-  metadata.gz: 425c4bb5208588c105c22003dce0fe6d845a4c8ae80f00009623c73b35e1fd5bc4ce9fcbab0eb98b81e25bda47282f517bdfb0a80527cb96f22a63764e0f70be
-  data.tar.gz: 9bf601977f33c8ad2430732ca58b396b16655d8287d4446e142437069e76b5811634ab60aa6cce96567eae4e98e8c40774073447fd0faf22289121143eaeac55
+  metadata.gz: 2977a7f1c1f4070932cfb529bb753f3437e4e398040262ce8faa5021087706cc2b33da85715bc1e8c2dc610edcba9b4db423a2fb781b2b1c9eba28992cf7c920
+  data.tar.gz: 3773d2cab87fbe70f29bdd1086b3c2a2d4027c6dd4ca5c7f1305956d21801b8410aa155a8e069e812aaebf4f0a296909a9cbe3eee5a1276a73655ac490e63ad8

data/lib/Dice.rb

@@ -1,6 +1,5 @@
 require 'bigdecimal'
 require 'Internal_Utilities/Math_Utilities'
-require 'Internal_Utilities/probability_cache_db'
 
 module Dice_Stats
 
@@ -28,15 +27,7 @@ module Dice_Stats
 			if (@count < 0 || @sides < 0)
 				#error
 			else
-				t1 = Time.now
-				if Cache.checkDice(@count.to_s + "d" + @sides.to_s)
-					@probability_distribution = Cache.getDice(@count.to_s + "d" + @sides.to_s)
-				else
-					@probability_distribution = calculate_probability_distribution
-					Cache.addDice(@count.to_s + "d" + @sides.to_s, @probability_distribution, (Time.now - t1).round(5))
-				end
-				#t2 = Time.now
-				#puts "Probabilities determined in #{(t2-t1).round(5)}"
+				@probability_distribution = calculate_probability_distribution
 			end
 		end
 

data/lib/Dice_Set.rb

@@ -1,7 +1,6 @@
 require 'Dice'
 require 'Internal_Utilities/Math_Utilities'
 require 'Internal_Utilities/Filtered_distribution'
-require 'Internal_Utilities/probability_cache_db'
 
 module Dice_Stats
 
@@ -52,16 +51,8 @@ module Dice_Stats
 			else
 				@dice.sort! { |d1,d2| d2.sides <=> d1.sides }
 
-				t1 = Time.now
-				if Cache.checkDice(self.clean_string(false))
-					@probability_distribution = Cache.getDice(self.clean_string(false))
-				else
-					@probability_distribution = combine_probability_distributions
-					Cache.addDice(self.clean_string(false), @probability_distribution, (Time.now - t1).round(5))
-				end
-				#t2 = Time.now
-				#puts "Probabilities determined in #{(t2-t1).round(5)}"
-
+				@probability_distribution = combine_probability_distributions
+				
 				if (@probability_distribution.inject(0) { |memo,(k,v)| memo + v }.round(3).to_f != 1.0)
 					#puts "Error in probability distrubtion."
 				end

data/lib/Internal_Utilities/Math_Utilities.rb

@@ -111,57 +111,5 @@ module Dice_Stats::Internal_Utilities
 			result
 		end
 
-		##
-		# Deprecated / incomplete.
-		# This method runs some quick tests on the basic math helper functions 
-		# to make sure that the Factorial and Choose methods are working as expected.
-		def self.Test_Suite
-			#Choose
-			puts "Testing Choose edge cases..."
-			Test_Choose(6, 10, 1)
-			Test_Choose(6, 6, 1)
-			Test_Choose(5, 0, 1)
-			Test_Choose(-1, 5, 1)
-			Test_Choose(5, -1, 1)
-			puts
-			puts "Testing Choose basic math..."
-			Test_Choose(5, 3, 10)
-			Test_Choose(6, 2, 15)
-			Test_Choose(14, 7, 3432)
-			Test_Choose(7, 2, 21)
-			Test_Choose(7, 5, 21)
-			Test_Choose(7, 5, 21)
-			Test_Choose(6, 3, 20)
-
-			#Factorial
-			puts
-			puts "Testing Factorial edge cases..."
-			Test_Factorial(0, 0)
-			Test_Factorial(-2, 0)
-			puts
-			puts "Testing Factorial basic math..."
-			Test_Factorial(6, 720)
-			Test_Factorial(5, 120)
-			Test_Factorial(4, 24)
-			Test_Factorial(3, 6)
-			Test_Factorial(2, 2)
-		end
-
-		##
-		# Helper function for testing the Choose method.
-		def self.Test_Choose(a, b, expected)
-			puts "(#{a} #{b}) => #{expected} (Actual: " + self.Choose(a, b).to_s + ")"
-			if (self.Choose(a, b) != expected) 
-				puts "`--> ERROR. FAILING CASE."
-			end
-		end
-
-		## Helper function for testing the Factorial method.
-		def self.Test_Factorial(a, expected)
-			puts "#{a}! => #{expected} (Actual: " + self.Factorial(a).to_s + ")"
-			if (self.Factorial(a) != expected) 
-				puts "`--> ERROR. FAILING CASE."
-			end
-		end
 	end
 end

data/lib/dice_stats.rb

@@ -13,10 +13,4 @@ end
 module Dice_Stats::Internal_Utilities
 end
 
-require 'Dice_Set'
-
-##
-# Instantiates the cache.
-# The cache is an instance of a DB_cache_connection in the Internal_Utilities module.
-# It is used to cache past results.
-Dice_Stats::Cache = Dice_Stats::Internal_Utilities::DB_cache_connection.new
+require 'Dice_Set'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_stats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matthew Foy
@@ -41,7 +41,6 @@ files:
 - lib/Internal_Utilities/Arbitrary_base_counter.rb
 - lib/Internal_Utilities/Filtered_distribution.rb
 - lib/Internal_Utilities/Math_Utilities.rb
-- lib/Internal_Utilities/probability_cache_db.rb
 - lib/dice_stats.rb
 homepage: http://matthewfoy.ca
 licenses:

data/lib/Internal_Utilities/probability_cache_db.rb

@@ -1,188 +0,0 @@
-require 'sqlite3'
-require 'bigdecimal'
-
-module Dice_Stats
-
-end
-
-module Dice_Stats::Internal_Utilities
-
-	##
-	# This class represents the cache. The cache is used for storing previously calculated results.
-	# Some dice sets can take quite a while to calculate. 
-	# Storing them drastically increases performance when a cache hit is found.
-	class DB_cache_connection
-		##
-		# The version of the gem. If this is updated, the DB_cache_connection#initialize method will drop and recreate the tables
-		@@Version = [0, 1, 0]
-
-		##
-		# The path of the sqlite3 db file.
-		@@Path = '/srv/Dice_Stats/'
-
-		##
-		# The name of the sqlite3 db file.
-		@@DB_name = 'probability_cache.db'
-
-		##
-		# For internal use only. Checks the database version and schema on startup.
-		def initialize
-			checkSchema
-		end
-
-		##
-		# Checks the database version and schema and creates the table structures.
-		def checkSchema
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)
-				db.execute "CREATE TABLE IF NOT EXISTS DiceConfig(Key TEXT PRIMARY KEY, Val TEXT);"
-				statement = db.prepare "SELECT Val FROM DiceConfig WHERE Key = 'Version';"
-				row = statement.execute.next
-
-				if !row
-					db.execute "INSERT INTO DiceConfig (Key, Val) VALUES ('Version', '#{@@Version.join('.')}');"
-					createSchema(db, true)
-				else
-					version = row[0]
-					version = version.split('.')
-					version.map! { |i| i.to_i }
-					if (@@Version[0] != version[0] || @@Version[1] != version[1] || @@Version[2] != version[2])
-						# Version of database is different, drop and recreate!
-						createSchema(db, true)
-						db.execute "UPDATE DiceConfig SET Version = '#{@@Version.join('.')}' WHERE Key = 'Version'"
-					end
-
-				end
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				statement.close if statement
-				db.close if db
-			end
-
-		end
-
-		##
-		# Creates the tables if they don't already exist.
-		# If +drop+ is set to true, the tables will be dropped first.
-		def createSchema(db, drop=false)
-			db.execute "DROP TABLE IF EXISTS DiceSet;" if drop
-			db.execute "CREATE TABLE IF NOT EXISTS DiceSet (Id INTEGER PRIMARY KEY AUTOINCREMENT, Name TEXT UNIQUE, TimeElapsed DECIMAL)"
-
-			db.execute "DROP TABLE IF EXISTS RollProbability;" if drop
-			db.execute "CREATE TABLE IF NOT EXISTS RollProbability (Id INTEGER PRIMARY KEY AUTOINCREMENT, DiceSetId INT, Value INTEGER, Probability DECIMAL)"
-		end
-
-		##
-		# Drops and recreates the schema for the purpose of clearing the cache.
-		def purge
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)
-				puts "Purging cache..."
-				createSchema(db, true)
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				db.close if db
-			end
-		end
-
-		##
-		# Checks the cache to see if the pattern has been previously calculated.
-		def checkDice(dice_pattern)
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)
-				
-				statement = db.prepare "SELECT Id FROM DiceSet WHERE Name = '#{dice_pattern}'"
-
-				return statement.execute.count >= 1
-
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				statement.close if statement
-				db.close if db
-			end
-		end
-
-		##
-		# Caches a dice pattern for future retrieval.
-		def addDice(dice_pattern, probability_distribution, timeElapsed=0.0)
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)				
-				db.execute "INSERT INTO DiceSet (Name) VALUES ('#{dice_pattern}')"
-				diceset_id = db.last_insert_row_id
-				
-				values = []
-				probability_distribution.each { |k,v|  
-					values << "(#{diceset_id}, #{k}, #{v})"
-				}
-				#puts "Values:"
-				#puts values
-
-				insert = "INSERT INTO RollProbability (DiceSetId, Value, Probability) VALUES " + values.join(", ")
-
-				db.execute insert
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				db.close if db
-			end
-		end
-
-		##
-		# Retrieves the probability distribution for a dice pattern from the cache.
-		def getDice(dice_pattern)
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)
-				
-				statement1 = db.prepare "SELECT Id FROM DiceSet WHERE Name = '#{dice_pattern}'"
-				diceset_id = statement1.execute.first[0]
-
-				statement2 = db.prepare "SELECT Value, Probability FROM RollProbability WHERE DiceSetId = #{diceset_id}"
-
-				rs = statement2.execute
-				result = {}
-				rs.each { |row|
-					result[row[0]] = BigDecimal.new(row[1], 15)
-				}
-
-				return result
-
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				statement1.close if statement1
-				statement2.close if statement2
-				db.close if db
-			end
-		end
-
-		##
-		# Retrieves how long a cached result originally took to calculate.
-		def getElapsed(dice_pattern)
-			begin
-				db = SQLite3::Database.open(@@Path + @@DB_name)
-				statement = db.prepare "SELECT TimeElapsed FROM DiceSet WHERE Name = '#{dice_pattern}'"
-
-				rs = statement.execute				
-				result = nil
-				rs.each { |row| 
-					result = row[0]
-				}
-
-				if (result == nil)
-					return 0.0
-				else 
-					return result
-				end
-
-			rescue SQLite3::Exception => e 
-				puts e
-			ensure
-				statement.close if statement
-				db.close if db
-			end
-		end
-	end	
-end