sieve 0.1.1 → 0.1.2

data/README.markdown

@@ -12,13 +12,18 @@ Install with Rubygems:
 
 A method is added to the Numeric class.
 
-    5.sieve  # [2, 3, 5]
-    20.sieve # [2, 3, 5, 7, 11, 13, 17, 19]
+    >> require "sieve"
+    => true
+    >> 5.sieve
+    => [2, 3, 5]
+    >> 100.sieve
+    => [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97]
 
 ## Benchmarks
 
 This benchmark loops through a handful of numbers 0 to 1 million in steps of
-100000 and runs a sieve on each number.
+100000 and runs a sieve on each number.  I also include benchmarks for running
+the sieve against 10 million and 100 million.
 
 The sieve method itself looks like this:
 
@@ -37,30 +42,41 @@ As far as I know, this is the most optimized pure Ruby sieve written.
 
 The benchmarks were run on a 2.8GHz Intel Core 2 Duo MacBook Pro with 8 GB memory.
 
-ruby 1.8.6 (2010-02-05 patchlevel 399) [i686-darwin10.4.0]
-
-                        user     system      total        real
-    sieve method    41.430000   0.600000  42.030000 ( 42.261872)
-    Numeric#sieve    1.010000   0.250000   1.260000 (  1.342326)
-
-ruby 1.8.7 (2010-08-16 patchlevel 302) [i686-darwin10.4.0]
-
-                        user     system      total        real
-    sieve method    41.720000   0.730000  42.450000 ( 43.640117)
-    Numeric#sieve    0.960000   0.380000   1.340000 (  1.385924)
-
-ruby 1.8.7 (2010-04-19 patchlevel 253) [i686-darwin10.4.0], MBARI 0x6770, Ruby Enterprise Edition 2010.02
-
-                        user     system      total        real
-    sieve method    42.800000   0.910000  43.710000 ( 45.105879)
-    Numeric#sieve    1.090000   0.370000   1.460000 (  1.517832)
-
-
-ruby 1.9.2p0 (2010-08-18 revision 29036) [x86_64-darwin10.4.0]
-
-                        user     system      total        real
-    sieve method    22.800000   0.670000  23.470000 ( 24.132390)
-    Numeric#sieve    1.000000   0.380000   1.380000 (  1.422877)
+### ruby 1.8.6 (2010-02-05 patchlevel 399) [i686-darwin10.4.0]
+
+                            user     system      total        real
+    sieve method        4.450000   0.060000   4.510000 (  4.526172)
+    Numeric#sieve       0.040000   0.000000   0.040000 (  0.046676)
+    sieve 10_000_000    8.780000   0.120000   8.900000 (  9.010072)
+    10_000_000.sieve    0.080000   0.000000   0.080000 (  0.084518)
+    100_000_000.sieve   2.050000   0.050000   2.100000 (  2.128403)
+
+### ruby 1.8.7 (2010-08-16 patchlevel 302) [i686-darwin10.4.0]
+
+                            user     system      total        real
+    sieve method        4.460000   0.060000   4.520000 (  4.522069)
+    Numeric#sieve       0.040000   0.000000   0.040000 (  0.046349)
+    sieve 10_000_000    8.820000   0.120000   8.940000 (  8.955888)
+    10_000_000.sieve    0.080000   0.010000   0.090000 (  0.083030)
+    100_000_000.sieve   2.040000   0.040000   2.080000 (  2.100103)
+
+### ruby 1.8.7 (2010-04-19 patchlevel 253) [i686-darwin10.4.0], MBARI 0x6770, Ruby Enterprise Edition 2010.02
+
+                            user     system      total        real
+    sieve method        4.610000   0.090000   4.700000 (  4.730966)
+    Numeric#sieve       0.050000   0.010000   0.060000 (  0.046442)
+    sieve 10_000_000    8.640000   0.060000   8.700000 (  8.731662)
+    10_000_000.sieve    0.100000   0.000000   0.100000 (  0.104731)
+    100_000_000.sieve   2.250000   0.050000   2.300000 (  2.303147)
+
+### ruby 1.9.2p0 (2010-08-18 revision 29036) [x86_64-darwin10.4.0]
+
+                            user     system      total        real
+    sieve method        2.410000   0.060000   2.470000 (  2.468430)
+    Numeric#sieve       0.050000   0.000000   0.050000 (  0.049053)
+    sieve 10_000_000    4.770000   0.110000   4.880000 (  4.888397)
+    10_000_000.sieve    0.080000   0.000000   0.080000 (  0.098229)
+    100_000_000.sieve   2.090000   0.040000   2.130000 (  2.137024)
 
 ## Author
 

data/Rakefile

@@ -34,7 +34,7 @@ task(:benchmark => :build) do
 
   Benchmark.bmbm(15) do |benchmark|
     range = (0..1000000)
-    step = 10000
+    step = 100000
 
     benchmark.report("sieve method") do
       range.step(step) do |i|
@@ -55,5 +55,9 @@ task(:benchmark => :build) do
     benchmark.report("10_000_000.sieve") do
       10_000_000.sieve
     end
+
+    benchmark.report("100_000_000.sieve") do
+      100_000_000.sieve
+    end
   end
 end

data/ext/sieve/sieve.c

@@ -12,37 +12,39 @@ void Init_sieve() {
 static VALUE sieve(const VALUE self) {
   if(NUM2LONG(self) < 2) { return Qnil; }
   long number = NUM2LONG(self) + 1;
-  short* numbers = malloc(number * sizeof(short));
 
-  if(numbers == NULL) {
+  char* results = malloc((long)(number/8));
+
+  if(results == NULL) {
     rb_raise(rb_eNoMemError, "Can't allocate enough memory.");
   }
 
-  numbers[0] = numbers[1] = 0;
+  CLEARBIT(results, 0);
+  CLEARBIT(results, 1);
   long i;
-  for(i = 2; i < number; i++) { numbers[i] = 1; }
+  for(i = 2; i < number; i++) { SETBIT(results, i); }
 
   long current_square;
   for(i = 0; i < number; i++) {
-    if(numbers[i] == 0) { continue; }
+    if(BITNOTSET(results, i)) { continue; }
 
     current_square = powl(i, 2);
     if(current_square > number) { break; }
 
     long n;
     for(n = current_square; n < number; n += i) {
-      numbers[n] = 0;
+      CLEARBIT(results, n);
     }
   }
 
   VALUE primes_array = rb_ary_new();
   for(i = 0; i < number; i++) {
-    if(numbers[i] == 1) {
+    if(BITSET(results, i)) {
       rb_ary_push(primes_array, LONG2FIX(i));
     }
   }
 
-  free(numbers);
+  free(results);
 
   return primes_array;
 }

data/ext/sieve/sieve.h

@@ -1,4 +1,10 @@
 #ifndef __sieve_h__
 #define __sieve_h__
+
+#define BITSET(x,i)    ((x)[(i)>>3] &  (1<<((i)&7))) != 0
+#define BITNOTSET(x,i) ((x)[(i)>>3] &  (1<<((i)&7))) == 0
+#define SETBIT(x,i)    ((x)[(i)>>3] |= (1<<((i)&7)))
+#define CLEARBIT(x,i)  ((x)[(i)>>3] &= (1<<((i)&7))^0xFF)
+
 static VALUE sieve(VALUE);
 #endif

data/features/sieve.feature

@@ -17,6 +17,11 @@ Feature: Sieve of Eratosthenes
       | 3      | 2,3                                                                                    |
       | 4      | 2,3                                                                                    |
       | 5      | 2,3,5                                                                                  |
+      | 8      | 2,3,5,7                                                                                |
+      | 9      | 2,3,5,7                                                                                |
+      | 15     | 2,3,5,7,11,13                                                                          |
+      | 16     | 2,3,5,7,11,13                                                                          |
+      | 17     | 2,3,5,7,11,13,17                                                                       |
       | 19     | 2,3,5,7,11,13,17,19                                                                    |
       | 20     | 2,3,5,7,11,13,17,19                                                                    |
       | 29     | 2,3,5,7,11,13,17,19,23,29                                                              |

data/lib/sieve.rb

@@ -1,5 +1,5 @@
 require "sieve/sieve"
 
 module Sieve
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sieve
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Josh Clayton
@@ -55,7 +54,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -64,7 +62,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"