sieve 0.1.2 → 1.0.0

data/.gitignore

@@ -8,5 +8,6 @@ coverage/*
 rerun.txt
 pkg/*
 *.gem
+Gemfile.lock
 
 !.keep

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2010 Josh Clayton
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -81,3 +81,7 @@ The benchmarks were run on a 2.8GHz Intel Core 2 Duo MacBook Pro with 8 GB memor
 ## Author
 
 Written by Josh Clayton
+
+## License
+
+See the LICENSE

data/Rakefile

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

data/ext/sieve/extconf.rb

@@ -1,2 +1,3 @@
 require "mkmf"
+$CFLAGS = "--std=c99 -O"
 create_makefile("sieve/sieve")

data/ext/sieve/sieve.c

@@ -10,41 +10,73 @@ void Init_sieve() {
 }
 
 static VALUE sieve(const VALUE self) {
-  if(NUM2LONG(self) < 2) { return Qnil; }
-  long number = NUM2LONG(self) + 1;
+  if(NUM2LONG(self) < 2) { return rb_ary_new(); }
 
-  char* results = malloc((long)(number/8));
+  sieve_data* data = initialize_sieve_data(self);
 
-  if(results == NULL) {
-    rb_raise(rb_eNoMemError, "Can't allocate enough memory.");
-  }
+  default_sieve_data(data);
+  remove_non_primes(data);
+  VALUE primes_array = primes_array_from_sieve_data(data);
 
-  CLEARBIT(results, 0);
-  CLEARBIT(results, 1);
-  long i;
-  for(i = 2; i < number; i++) { SETBIT(results, i); }
+  destroy_sieve_data(data);
+
+  return primes_array;
+}
+
+static sieve_data* initialize_sieve_data(const VALUE self) {
+  sieve_data* data = (sieve_data*)malloc(sizeof(sieve_data));
 
-  long current_square;
-  for(i = 0; i < number; i++) {
-    if(BITNOTSET(results, i)) { continue; }
+  data->number  = NUM2LONG(self) + 1;
+  data->results = malloc((long)(data->number/8));
+
+  ensure_memory_allocated(data->results);
+
+  return data;
+}
+
+static void remove_non_primes(sieve_data* data) {
+  long current_square, i, n;
+
+  for(i = 0; i < data->number; i++) {
+    if(BITNOTSET(data->results, i)) { continue; }
 
     current_square = powl(i, 2);
-    if(current_square > number) { break; }
+    if(current_square > data->number) { break; }
 
-    long n;
-    for(n = current_square; n < number; n += i) {
-      CLEARBIT(results, n);
-    }
+    for(n = current_square; n < data->number; n += i) { CLEARBIT(data->results, n); }
   }
 
+  return;
+}
+
+static void default_sieve_data(sieve_data* data) {
+  CLEARBIT(data->results, 0);
+  CLEARBIT(data->results, 1);
+
+  long i;
+  for(i = 2; i < data->number; i++) { SETBIT(data->results, i); }
+  return;
+}
+
+static VALUE primes_array_from_sieve_data(sieve_data* data) {
   VALUE primes_array = rb_ary_new();
-  for(i = 0; i < number; i++) {
-    if(BITSET(results, i)) {
-      rb_ary_push(primes_array, LONG2FIX(i));
-    }
-  }
 
-  free(results);
+  long i;
+  for(i = 0; i < data->number; i++) {
+    if(BITSET(data->results, i)) { rb_ary_push(primes_array, LONG2FIX(i)); }
+  }
 
   return primes_array;
 }
+
+static void ensure_memory_allocated(void* data) {
+  if(NULL == data) {
+    rb_raise(rb_eNoMemError, "Can't allocate enough memory.");
+  }
+}
+
+static void destroy_sieve_data(sieve_data* data) {
+  free(data->results);
+  free(data);
+  return;
+}

data/ext/sieve/sieve.h

@@ -6,5 +6,19 @@
 #define SETBIT(x,i)    ((x)[(i)>>3] |= (1<<((i)&7)))
 #define CLEARBIT(x,i)  ((x)[(i)>>3] &= (1<<((i)&7))^0xFF)
 
+typedef struct {
+  char* results;
+  long  number;
+} sieve_data;
+
 static VALUE sieve(VALUE);
+
+static sieve_data* initialize_sieve_data(const VALUE);
+static void destroy_sieve_data(sieve_data*);
+static void default_sieve_data(sieve_data*);
+static void initialize_results(sieve_data*);
+static void remove_non_primes(sieve_data*);
+static VALUE primes_array_from_sieve_data(sieve_data*);
+static void ensure_memory_allocated(void*);
+
 #endif

data/features/sieve.feature

@@ -8,11 +8,11 @@ Feature: Sieve of Eratosthenes
     Then I should have the primes <primes>
     Examples:
       | number | primes                                                                                 |
-      | -12345 | nil                                                                                    |
-      | -5     | nil                                                                                    |
-      | -1     | nil                                                                                    |
-      | 0      | nil                                                                                    |
-      | 1      | nil                                                                                    |
+      | -12345 |                                                                                        |
+      | -5     |                                                                                        |
+      | -1     |                                                                                        |
+      | 0      |                                                                                        |
+      | 1      |                                                                                        |
       | 2      | 2                                                                                      |
       | 3      | 2,3                                                                                    |
       | 4      | 2,3                                                                                    |

data/features/step_definitions/sieve_steps.rb

@@ -7,8 +7,8 @@ end
 
 Then /^I should have the primes (.*)$/ do |primes|
   case primes
-  when "nil"
-    @result.should be_nil
+  when ""
+    @result.should == []
   else
     @primes = primes.split(",").map {|prime| prime.to_i }
     @result.should == @primes

data/features/support/env.rb

@@ -1,3 +1,2 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+Bundler.require
 require "sieve"
-require "spec/expectations"

data/lib/sieve.rb

@@ -1,5 +1,5 @@
-require "sieve/sieve"
-
 module Sieve
-  VERSION = "0.1.2"
+  autoload :Version, "sieve/version"
 end
+
+require "sieve/sieve"

data/lib/sieve/version.rb

@@ -0,0 +1,3 @@
+module Sieve
+  VERSION = "1.0.0"
+end

data/sieve.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path("../lib/", __FILE__)
+$:.unshift(lib) unless $:.include?(lib)
+
+require "sieve/version"
+
+Gem::Specification.new do |s|
+  s.name             = %q{sieve}
+  s.summary          = %q{Sieve of Eratosthenes}
+  s.description      = %q{Ruby C Extension for the Sieve of Eratosthenes}
+  s.homepage         = %q{http://github.com/joshuaclayton/sieve}
+  s.version          = Sieve::VERSION
+  s.authors          = ["Josh Clayton"]
+  s.email            = %q{joshua.clayton@gmail.com}
+
+  s.rubygems_version = %q{1.3.7}
+  s.date             = %q{2010-09-12}
+
+  s.require_paths = ["lib"]
+  s.extensions = ["ext/sieve/extconf.rb"]
+  s.files      = %x{git ls-files}.split("\n").reject {|file| file =~ /^(features|cucumber)/ }
+  s.test_files = %x{git ls-files}.split("\n").select {|file| file =~ /^(features|cucumber)/ }
+
+  s.add_dependency "rake-compiler",        "0.7.9"
+  s.add_development_dependency "rspec",    "2.7.0"
+  s.add_development_dependency "cucumber", "1.1.0"
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sieve
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors: 
 - Josh Clayton
@@ -16,8 +12,40 @@ cert_chain: []
 
 date: 2010-09-12 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.9
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.7.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+  type: :development
+  version_requirements: *id003
 description: Ruby C Extension for the Sieve of Eratosthenes
 email: joshua.clayton@gmail.com
 executables: []
@@ -28,6 +56,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
+- LICENSE
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -35,6 +65,8 @@ files:
 - ext/sieve/sieve.c
 - ext/sieve/sieve.h
 - lib/sieve.rb
+- lib/sieve/version.rb
+- sieve.gemspec
 - cucumber.yml
 - features/sieve.feature
 - features/step_definitions/sieve_steps.rb
@@ -54,21 +86,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sieve of Eratosthenes