sieve 0.1.0 → 0.1.1

data/Rakefile

@@ -1,6 +1,8 @@
 require "rubygems"
 require "rake"
 require "benchmark"
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 require "sieve"
 
 require "rake/extensiontask"
@@ -8,15 +10,17 @@ Rake::ExtensionTask.new("sieve") do |extension|
   extension.lib_dir = "lib/sieve"
 end
 
+task :build => [:clean, :compile]
+
 require "cucumber/rake/task"
-Cucumber::Rake::Task.new(:cucumber => [:clean, :compile]) do |t|
+Cucumber::Rake::Task.new(:cucumber => :build) do |t|
   t.rcov = true
 end
 
 task :default => :cucumber
 
 desc "Benchmark C implementation against pure Ruby implementation of the Sieve"
-task(:benchmark => [:clean, :compile]) do
+task(:benchmark => :build) do
   def sieve(n)
     numbers = (0..n).map {|i| i }
     numbers[0] = numbers[1] = nil
@@ -43,5 +47,13 @@ task(:benchmark => [:clean, :compile]) do
         i.sieve
       end
     end
+
+    benchmark.report("sieve 10_000_000") do
+      sieve 10_000_000
+    end
+
+    benchmark.report("10_000_000.sieve") do
+      10_000_000.sieve
+    end
   end
 end

data/ext/sieve/sieve.c

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

data/lib/sieve.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sieve
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Josh Clayton
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -04:00
+date: 2010-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -62,6 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"