vose 0.1.2 → 0.2.0

data/Guardfile

@@ -0,0 +1,10 @@
+guard 'minitest' do
+  watch(%r|^spec/(.*)_spec\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/lib/vose.rb

@@ -4,7 +4,7 @@ module Vose
   class InvalidArgumentException < RuntimeError; end;
 
   class AliasMethod
-    attr_reader :limit
+    attr_reader :limit, :prob
 
     def initialize(probabilities)
       raise InvalidArgumentException if probabilities.empty?
@@ -13,7 +13,7 @@ module Vose
       @limit = probabilities.length
       sum = probabilities.reduce(:+)
 
-      scale = limit / sum.to_f
+      scale = @limit / sum.to_f
       scaled_probality = []
       probabilities.each do |p|
         scaled_probality << (p * scale)
@@ -26,26 +26,24 @@ module Vose
     end
 
     def preprocess(scaled_probality)
-      small_worklist         = []
-      large_worklist         = []
+      small_worklist         = Array.new(limit) { 0 }
+      large_worklist         = Array.new(limit) { 0 }
       small_worklist_counter = 0
       large_worklist_counter = 0
 
-      scaled_probality.each_with_index do |p,i|
-        if p > 1
-          large_worklist[large_worklist_counter] = i
-          large_worklist_counter+=1
+      0.upto(limit-1) do |j|
+        if scaled_probality[j] > 1
+          large_worklist[large_worklist_counter+=1] = j
         else
-          small_worklist[small_worklist_counter] = i
-          small_worklist_counter+=1
+          small_worklist[small_worklist_counter+=1] = j
         end
       end
 
       while small_worklist_counter != 0 && large_worklist_counter != 0
-        small_worklist_counter-=1
-        large_worklist_counter-=1
         current_small_worklist_index = small_worklist[small_worklist_counter].to_i
         current_large_worklist_index = large_worklist[large_worklist_counter].to_i
+        small_worklist_counter-=1
+        large_worklist_counter-=1
 
         @prob[current_small_worklist_index] = scaled_probality[current_small_worklist_index]
         @alias[current_small_worklist_index] = current_large_worklist_index

data/lib/vose/version.rb

@@ -1,3 +1,3 @@
 module Vose
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/vose_spec.rb

@@ -30,7 +30,7 @@ describe Vose::AliasMethod do
       vose = Vose::AliasMethod.new probabilities
       results = []
       100000.times { results << vose.next }
-      
+       
       sum = probabilities.reduce(:+) 
       expected_percentages = probabilities.map{|p| p/sum}
       results.must_match_probability expected_percentages
@@ -43,5 +43,11 @@ describe Vose::AliasMethod do
       100000.times { results << vose.next }
       results.must_match_probability probabilities
     end
+
+    it "accounts for zero values" do
+      probabilities = [0, 0, 0, 3]
+      vose = Vose::AliasMethod.new probabilities
+      vose.next.must_equal 3
+    end
   end
 end

data/vose.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("ruby_gntp")
   gem.add_development_dependency("guard-minitest")
   gem.add_development_dependency("guard-bundler")
+  gem.add_development_dependency("rinruby")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vose
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70253871221700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253871221700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70253871221140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253871221140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70253871220680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253871220680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70253871220260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253871220260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rinruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Vose: Sample random values from a discrete probability distribution.
 
 '
@@ -66,6 +102,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -94,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Vose is a Ruby implementation of the Vose Alias Method. It allows for sampling