splashy 0.1.1 → 0.1.2

data/README.markdown

@@ -50,6 +50,7 @@ buckets.select( :random => true )
 Changelog
 =========
 
+* *0.1.2* - A few small bugs fixed in few-objects situations. (Thanks to Mars Hall)
 * *0.1.1* - Add support for random selection from buckets.
 * *0.1.0* - Several bug fixes, add `#neediest_buckets` method to `Buckets` to
 allow you to choose which buckets to add to first if an element can be put in

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/splashy/buckets.rb

@@ -84,7 +84,7 @@ module Splashy
     # distribution, sorted descending by how much more they need.
     def neediest_buckets
       multipliers = self.needed_multipliers( self._select_all, @wanted_distribution ).to_a
-      multipliers.sort! { |a, b| b[1] <=> a[1] } # Sort on multiplier ascending
+      multipliers.sort! { |a, b| b[1] <=> a[1] } # Sort on multiplier descending
       multipliers.map{ |bucket_name, multiplier| bucket_name }
     end
     
@@ -169,10 +169,11 @@ module Splashy
         bucket_size = current_selections[bucket_name].size
         desired_pct = wanted_distribution[bucket_name]
         current_pct = bucket_size.to_f / total_size
+        current_pct = 0 if current_pct.nan?
         if current_pct > 0
-          memo[bucket_name] = desired_pct / current_pct
+          memo[bucket_name] = desired_pct - current_pct
         else
-          memo[bucket_name] = 1 / 0.0 # Infinity
+          memo[bucket_name] = desired_pct
         end
         memo
       end
@@ -194,7 +195,7 @@ module Splashy
     # supplied, we can't meet the requirements.
     def estimated_final_count
       limiter_bucket = self.limiter_bucket
-      final_count = ( limiter_bucket.count / @wanted_distribution[limiter_bucket.name] ).floor
+      final_count = ( limiter_bucket.count / @wanted_distribution[limiter_bucket.name] ).ceil # go upward here to avoid missing elements in low-quantity situations
       final_count = [@wanted_count, final_count].min if @wanted_count
       final_count
     end

data/splashy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "splashy"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = "2011-12-13"
+  s.date = "2012-01-19"
   s.description = "Simple distribution-based sampling of arbitrary objects from any number of buckets. Splashy. Buckets. Get it!?"
   s.email = "tyson@tysontate.com"
   s.extra_rdoc_files = [

data/test/test_splashy_buckets.rb

@@ -123,7 +123,7 @@ describe Splashy::Buckets do
       fill_with_counts( 3, 3, 3 )
       assert @buckets.satisfied?
       assert_equal(
-        {:a=>["10"], :b=>["20"], :c=>["30", "31"]},
+        {:a=>["10"], :b=>["20"], :c=>["30", "31", "32"]},
         @buckets.select
       )
     end
@@ -163,7 +163,19 @@ describe Splashy::Buckets do
       fill_with_counts( 10, 2, 40 )
       assert @buckets.satisfied?
       assert_equal(
-        {:a=>["10"], :b=>["20", "21"], :c=>["30", "31", "32", "33", "34", "35", "36", "37"]},
+        {:a=>["10"], :b=>["20", "21"], :c=>["30", "31", "32", "33", "34", "35", "36", "37", "38"]},
+        @buckets.select
+      )
+    end
+    
+    it "selects from a very small pool" do
+      @buckets = Splashy::Buckets.new( {:a => 0.33, :b => 0.67} )
+      @buckets.add( :a, "hoy" )
+      @buckets.add( :b, "zoy" )
+      @buckets.add( :b, "moy" )
+      assert @buckets.satisfied?
+      assert_equal(
+        {:a=>["hoy"], :b=>["zoy", "moy"]},
         @buckets.select
       )
     end
@@ -281,6 +293,13 @@ describe Splashy::Buckets do
     end
   end
   
+  describe "neediness" do
+    it "provides descending list" do
+      @buckets = Splashy::Buckets.new( {:a => 0.33, :b => 0.67} )
+      assert_equal( [:b, :a], @buckets.neediest_buckets )
+    end
+  end
+  
   describe "performance" do
     it "grows linearly with more elements" do
       puts # Formatting...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splashy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70277083322720 !ruby/object:Gem::Requirement
+  requirement: &70280060104260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277083322720
+  version_requirements: *70280060104260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277083321600 !ruby/object:Gem::Requirement
+  requirement: &70280060101400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70277083321600
+  version_requirements: *70280060101400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70277083320380 !ruby/object:Gem::Requirement
+  requirement: &70280060099660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70277083320380
+  version_requirements: *70280060099660
 description: Simple distribution-based sampling of arbitrary objects from any number
   of buckets. Splashy. Buckets. Get it!?
 email: tyson@tysontate.com
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4086114583339023412
+      hash: -2094145325101002950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: