factorial-cached 0.0.1 → 0.0.2

data/README.md

@@ -3,6 +3,8 @@ ruby-factorial-cached
 
 factorial-cached is a gem which aims to fasten your consecutively made factorial operations with caching. This gem was half-way done because of a little Project Euler adventure of mine. Please make any pull requests that you think will fasten the operations and i will check it out and update the gem on rubygems asap.
 
+Gem also hosted at: [Ruby Gems](https://rubygems.org/gems/factorial-cached)
+
 Usage
 =====
 
@@ -12,6 +14,14 @@ Usage
 gem install factorial-cached
 ```
 
+or after cloning / downloading this Github project,
+
+```
+cd path/to/project
+gem build factorial-cached.gemspec
+gem install factorial-cached-0.0.1.gem
+```
+
 ### Options
 
 You can pass some parameters to factorial method to your needs. Above are the options and their default values.
@@ -60,9 +70,9 @@ Factorial::toggle(:cache, :cache_none) # Toggles default of caching to none, fur
 Factorial::toggle(:algorithm, :iterative) # Togglest default algorithm to iterative algorithm.
 Factorial::toggle(:closest, :value) # Closest now returns value of the factorial default.
 
-5.factorial => Returns 5, caches nothing.
-5.factorial(:cache_one) => Calculates 5!, caches 5! only. (This is the default behaviour of this gem)
-5.factorial => Returns 5! from cache.
+5.factorial #=> Returns 5, caches nothing.
+5.factorial(:cache_one) #=> Calculates and returns 5!, caches 5! only. (This is the default behaviour of this gem)
+5.factorial #=> Returns 5! from cache.
 
 ```
 

data/lib/factorial-cached/Factorial.rb

@@ -1,9 +1,10 @@
 class Factorial
 	
 	@@cache = { 
-		0 => 1, 1 => 1, 2 => 2, 3 => 6, 4 => 24, 5 => 120, 6 => 720, 7 => 5040, 8 => 40320, 9 => 3628800, 10 => 36288000, 11 => 39916800, 12 => 479001600, # Below 32 bit
+		0 => 1, 1 => 1, 2 => 2, 3 => 6, 4 => 24, 5 => 120, 6 => 720, 7 => 5040, 8 => 40320, 9 => 362880, 10 => 3628800, 11 => 39916800, 12 => 479001600, # Below 32 bit
 		14 => 87178291200, 20 => 2432902008176640000, 30 => 265252859812191058636308480000000, 50 => 30414093201713378043612608166064768844377641568960512000000000000, # Milestones for 1-100!
 		70 => 11978571669969891796072783721689098736458938142546425857555362864628009582789845319680000000000000000,
+		85 => 281710411438055027694947944226061159480056634330574206405101912752560026159795933451040286452340924018275123200000000000000000000,
 		100 => 93326215443944152681699238856266700490715968264381621468592963895217599993229915608941463976156518286253697920827223758251185210916864000000000000000000000000 
 	};
 

data/lib/factorial-cached/Factorial.rb~

@@ -0,0 +1,94 @@
+class Factorial
+	
+	@@cache = { 
+		0 => 1, 1 => 1, 2 => 2, 3 => 6, 4 => 24, 5 => 120, 6 => 720, 7 => 5040, 8 => 40320, 9 => 362880, 10 => 3628800, 11 => 39916800, 12 => 479001600, # Below 32 bit
+		14 => 87178291200, 20 => 2432902008176640000, 30 => 265252859812191058636308480000000, 50 => 30414093201713378043612608166064768844377641568960512000000000000, # Milestones for 1-100!
+		70 => 11978571669969891796072783721689098736458938142546425857555362864628009582789845319680000000000000000,
+		85 => 281710411438055027694947944226061159480056634330574206405101912752560026159795933451040286452340924018275123200000000000000000000,
+		100 => 93326215443944152681699238856266700490715968264381621468592963895217599993229915608941463976156518286253697920827223758251185210916864000000000000000000000000 
+	};
+
+	@@default = { :cache => :cache_one, :algorithm => :recursive, :closest => :factorial };
+	
+	class << self
+		
+		def empty_cache( range = nil )
+			if range != nil then
+				range.each{ |key| @@cache.delete(key); };
+				@@cache[0] = 1;
+			else @@cache = {0 => 1};  end
+		end
+
+		def get_cache()
+			return @@cache;
+		end
+
+		def toggle(setting, default)
+			if setting == :cache then
+				@@default[:cache] = default;
+			elsif setting == :algorithm then
+				@@default[:algorithm] = default;
+			elsif setting == :closest then
+				@@default[:closest] = default;
+			end
+		end
+	
+		def closest(number, option = @@default[:closest])
+			close = (@@cache.keys.sort{ |x, y| (x - number).abs <=> (y - number).abs })[0];
+			return option == :value	? @@cache[close] : close;
+		end
+
+		def recursive_factorial(number, cache = @@default[:cache], close = -1)
+	
+			return @@cache[number] if close == number;
+
+			if close == -1 then
+				close = self.closest(number, :factorial);
+			end
+
+			result = close < number ? number * recursive_factorial(number - 1, cache, close) : recursive_factorial(number + 1, cache, close) / (number + 1);
+			
+			@@cache[number] = result if cache == :cache_all;
+
+			return result;
+		end
+
+		def iterative_factorial(number, cache = @@default[:cache])
+
+			closest = self.closest(number, :factorial);
+			loopThrough = closest < number ? ((closest + 1)..number) : ((number + 1)..closest);
+			result = @@cache[closest];			
+
+			for i in loopThrough do
+				
+				if closest < number then result *= i; else result /= i; end
+				@@cache[i] = result if cache == :cache_all;
+
+			end
+			
+			return result;
+		end
+
+		def factorial(number, *options)
+				
+			return @@cache[number] if @@cache.has_key?(number);
+			return 1 if (number = number.to_i) <= 0 || !number.is_a?(Integer);			
+				
+			factorial = method(options.include?(:iterative) ? :iterative_factorial : 
+								options.include?(:recursive) ? :recursive_factorial :
+									options.include?(:auto) ? (number > 100000 ? :iterative_factorial : :recursive_factorial) : 
+										@@default[:algorithm] == :recursive ? :recursive_factorial : 
+												@@default[:algorithm] == :auto ? (number > 100000 ? :iterative_factorial : recursive_factorial) : :iterative_factorial);
+			cache = options.include?(:cache_none) ? :cache_none : options.include?(:cache_all) ? :cache_all : options.include?(:cache_one) ? :cache_one : @@default[:cache];	
+			
+			result = factorial.call(number, cache);
+
+			@@cache[number] = result if cache != :cache_none;
+			
+			return result;
+
+		end
+
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factorial-cached
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -21,12 +21,9 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/factorial-cached.rb~
-- lib/Factorial.rb~
 - lib/factorial-cached/Integer.rb
 - lib/factorial-cached/Factorial.rb
-- lib/factorial-cached/Integer.rb~
-- lib/Integer.rb~
+- lib/factorial-cached/Factorial.rb~
 - lib/factorial-cached.rb
 homepage: http://rubygems.org/gems/factorial-cached
 licenses:

data/lib/Factorial.rb~

@@ -1,69 +0,0 @@
-class Factorial
-	
-	@@cache = { 
-		0 => 1, 1 => 1, 2 => 2, 3 => 6, 4 => 24, 5 => 120, 6 => 720, 7 => 5040, 8 => 40320, 9 => 3628800, 10 => 36288000, 11 => 39916800, 12 => 479001600, # Below 32 bit
-		14 => 87178291200, 20 => 2432902008176640000, 30 => 265252859812191058636308480000000, 50 => 30414093201713378043612608166064768844377641568960512000000000000, # Below are milestones for 1-100!
-		70 => 11978571669969891796072783721689098736458938142546425857555362864628009582789845319680000000000000000,
-		100 => 93326215443944152681699238856266700490715968264381621468592963895217599993229915608941463976156518286253697920827223758251185210916864000000000000000000000000 
-	};
-	
-	class << self
-		
-		def closest(number, option = :factorial)
-			close = (@@cache.keys.sort{ |x, y| (x - number).abs <=> (y - number).abs })[0];
-			return option == :value	? @@cache[close] : close;
-		end
-
-		def recursive_factorial(number, cache = :cache, close = -1)
-
-			return @@cache[number] if number == close;
-			
-			if close == -1 then
-				close = self.closest(number);
-				puts "Using Cache: " + close.to_s
-			end		
-
-			result = close < number ? number * recursive_factorial(number - 1, cache, close) : recursive_factorial(number + 1, cache, close) / (number + 1);
-			
-			@@cache[number] = result if cache == :cache_all;
-
-			return result;
-
-		end
-
-		def iterative_factorial(number, cache = :cache)	
-
-			closest = self.closest(number);
-			puts "Using Cache: " + close.to_s
-			loopThrough = closest < number ? ((closest + 1)..number) : ((number + 1)..closest);
-			result = @@cache[closest];			
-
-			for i in loopThrough do
-				
-				if closest < number then result *= i; else result /= i; end
-				@@cache[i] = result if cache == :cache_all;
-
-			end
-			
-			return result;
-		end
-
-		def factorial(number, *options)
-				
-			return @@cache[number] if @@cache.has_key?(number);
-			return 1 if number <= 0;			
-
-			factorial = method(options.include?(:iterative) || number > 100000 ? :iterative_factorial : :recursive_factorial);
-			cache = options.include?(:cache_none) ? :cache_none : options.include?(:cache_all) ? :cache_all : :cache;	
-
-			result = factorial.call(number, cache);
-
-			@@cache[number] = result if cache != :cache_none;
-			
-			return factorial;
-
-		end
-
-	end
-
-end

data/lib/Integer.rb~

@@ -1,7 +0,0 @@
-load(File.dirname(__FILE__) + '/Factorial.rb');
-
-class Integer
-	def factorial(*options)
-		return Factorial::factorial(self, *options); 
-	end
-end

data/lib/factorial-cached/Integer.rb~

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/Factorial.rb'
-
-class Integer
-	def factorial(*options)
-		return Factorial::factorial(self, *options); 
-	end
-end