missing-math 0.1.2 → 0.1.3

data/lib/missing_math.rb

@@ -138,8 +138,8 @@ module MissingMath
     end
 
     # Returns an array of an integer's factors
-    # @param boolean include_one To exclude the number 1 from the output, set to false
-    def factors(include_one=true)
+    # @param boolean include_one Default is to exclude the number 1 from the output; to include set to false
+    def factors(include_one=false)
       throw "Not an Integer" if !self.is_i?
       last = self
       i = include_one ? 1 : 2
@@ -156,11 +156,12 @@ module MissingMath
     end
 
     # Returns an array of the integer's prime factors
-    def prime_factors
-      ceil = (self / 2).floor
-      primes = MissingMath.esieve(ceil)
-      factors = primes.collect { |i| self % i == 0 }
-      return factors
+    # @param boolean force_new Force new module variable @esieve generation.  Default uses module variable @esieve if it hasn't been set
+    def prime_factors(force_new=false)
+      ceil = (self / 2).ceil
+      primes = MissingMath.esieve(ceil, force_new)
+      factors = primes.collect { |i| i if self % i == 0 && i <= ceil }
+      return factors.compact.uniq
     end
   end
 
@@ -170,17 +171,21 @@ module MissingMath
 
   # Generates a prime sieve with max value n
   # @param integer n Max value of sieve
+  # @param boolean force_new Force new module variable @esieve generation.  Default uses module variable @esieve if it hasn't been set
   # Example: MissingMath.esieve(1000) => [2, 3, 5, ...]
-  def self.esieve(n)
-    a = (0..n).to_a
-    a[0] = nil
-    a[1] = nil
-    a.each do |i|
-      next unless i
-      break if i * i > n
-      (i * i).step(n, i) { |m| a[m] = nil}
+  def self.esieve(n, force_new=false)
+    if !@esieve || force_new
+      a = (0..n).to_a
+      a[0] = nil
+      a[1] = nil
+      a.each do |i|
+        next unless i
+        break if i * i > n
+        (i * i).step(n, i) { |m| a[m] = nil}
+      end
+      @esieve = a.compact
     end
-    return a.compact
+    return @esieve
   end
 
 end

data/lib/missing_math/version.rb

@@ -1,3 +1,3 @@
 module MissingMath
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing-math
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A library of missing math functions.
 email: mail@enorganik.com