primes-utils 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc5495497089b070f595b0456a1b0c00da065d8
-  data.tar.gz: fd32d881956306de64948f69171909bb4f65843c
+  metadata.gz: 43371077c9ef9173d24033c811151c290b8ae381
+  data.tar.gz: 6c1f1e13987dfe96194589646bd0923f563de871
 SHA512:
-  metadata.gz: 12b152e50667e3646c92104e22f61cfb5e2f028d452a1fc6dc9c6eeb638dbdbe044aaab23086aa17cedd18d27188063a4293efcff1520be7ec363272c1bb06b4
-  data.tar.gz: faa16320abef1a7f78e3c5c4fa4e76a90b784ee8a3b66c9597e89dd8bab5d15dbbd1bb588f3ba88205688cd7007202a7167fd57001b0ec7c6f47debc23df4e0e
+  metadata.gz: e2e56490823fa11298cbffd0249286405b9df64474786f8789cdb1ae3792be4b4228f29ad260e537b669710a1f1947728e73a8c709cd6d2954839ef55175228a
+  data.tar.gz: 406d1c0bf6ed02fa0baa6a58eca6db05de476d8ff450c8c027782f0489ebd87a8921a26e57c81042eaab9f0d11ee3be1ac374710c5b547c4ef91b8848a9a93fc

data/README.md

@@ -135,9 +135,9 @@ n=10**8; (25*n).primescnt => 121443371
 **primenth(p=7) or nthprime(p=7)**
 
 Return the value of the (absolute value of) nth prime.
-Default Strictly Prime (SP) Prime Generator (PG) used here is P7.
+Default Strictly Prime (SP) Prime Generator (PG) is adaptively selected.
 Can change SP PG used on input. Acceptable primes range: [3 - 13].
-Indexed nth primes now upto 1.6 billionth.
+Indexed nth primes now upto 2.01 billionth.
 Also see `Error Handling`.
 
 ```
@@ -157,7 +157,7 @@ Displays a list of all the `primes-utils` methods available for your system.
 Use as `n.primes_utils` where n is any `class Integer` value.
 
 ```
-0.primes_utils => "prime? primemr? primes primesf primesmr primescnt primescntf primescntmr primenth|nthprime factors|prime_division"
+0.primes_utils => "prime? primemr? primes primesf primesmr primescnt primescntf primescntmr primenth|nthprime factors|prime_division primes_utils"
 ```
 
 ## Error Handling
@@ -193,6 +193,7 @@ All the `primes-utils` methods are `instance_methods` for `class Integer`.
 
 ## History
 ```
+2.6.0 – much, much better adaptive pg selection algorithm used in select_pg
 2.5.1 – corrected minor error in select_pg
 2.5.0 – 9 more index primes under the 110-millionth in nths; fixed Ruby 1.8 incompatibility in primes;
         better|simpler technique for select_pg, significant speed increases for large ranges; used now

data/lib/primes/utils.rb

@@ -359,7 +359,7 @@ module Primes
         end
       end
       # determine prms array parameters and starting location value m for start_num
-      split_arrays ? (prms = prms_range; maxprms = max_range; m=0) : m=pcs2start
+      split_arrays ? (prms = prms_range; maxprms = max_range; m=0) : m = pcs2start
       [prms, m, modks, residues, rescnt, pcs2start, maxprms, rs] # parameters output
     end
 
@@ -444,10 +444,20 @@ module Primes
     end
 
     def select_pg(num, start_num)   # adaptively select PG
-      range_size = num - start_num
-      primes = [2, 3, 5]                      # use P5 for small ranges
-      primes << 7  if range_size > 35*10**5   # use P7 for midsize ranges
-      primes << 11 if range_size > 850*10**5  # use P11 for large ranges
+      range = num - start_num
+      pg = 5
+      if start_num <= Math.sqrt(num).to_i     # for one array of primes upto N
+        pg =  7 if num >  50*10**4
+        pg = 11 if num > 305*10**5
+      else                                    # for split array cases
+        pg =  7 if ((10**6...10**7).cover? range and start_num < 10**8)  or
+                   ((10**7...10**8).cover? range and start_num < 10**10) or
+                   ((10**8...10**9).cover? range and start_num < 10**12) or
+                   (range >= 10**9 and start_num < 10**14)
+        pg = 11 if ((10**8...10**9).cover? range and start_num < 10**10) or
+                   (range >= 10**9 and start_num < 10**11)
+      end
+      primes = [2,3,5,7,11,13].select! {|p| p <= pg}
       [primes, primes.reduce(:*)]   # [excluded primes, mod] for PG
     end
 

data/lib/primes/utils/version.rb

@@ -1,5 +1,5 @@
 module Primes
   module Utils
-    VERSION = "2.5.1"
+    VERSION = "2.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primes-utils
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Jabari Zakiya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler