pickup 0.0.7 → 0.0.8

data/README.md

@@ -92,6 +92,16 @@ pickup.pick(10){ |v| v**10 }
 #=> ["minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow"]
 ```
 
+Or you can use reverse probability:
+
+```ruby
+pickup = Pickup.new(pond)
+pickup.pick(10){ |v| v**(-10) }
+#=> ["selmon", "selmon", "selmon", "selmon", "crucian", "selmon", "selmon", "selmon", "selmon", "selmon"]
+```
+
+Reverse
+
 ## Contributing
 
 1. Fork it

data/benchmarks/pickup.rb

@@ -0,0 +1,72 @@
+require 'benchmark'
+require './lib/pickup'
+
+def simple_hash
+  @simple ||= begin
+    hash = {}
+    (1..30).to_a.each do |i|
+      hash["item_#{i}"] = rand(30)
+    end
+    hash
+  end
+end
+
+def big_hash
+  @big ||= begin
+    hash = {}
+    (1..5000).to_a.each do |i|
+      hash["item_#{i}"] = rand(1000)
+    end
+    hash
+  end
+end
+
+def big_weights_hash
+  @big_weights ||= begin
+    hash = {}
+    (1..5000).to_a.each do |i|
+      hash["item_#{i}"] = rand(100_000) + 10_000
+    end
+    hash
+  end
+end
+
+def simple(uniq=false)
+  pickup = Pickup.new(simple_hash, uniq: uniq)
+  pickup.pick(10)
+end
+
+def big(uniq=false)
+  pickup = Pickup.new(big_hash, uniq: uniq)
+  pickup.pick(100)
+end
+
+def big_weights(uniq=false)
+  pickup = Pickup.new(big_weights_hash, uniq: uniq)
+  pickup.pick(100)
+end
+
+
+
+n = 500
+
+Benchmark.bm do |x|
+  x.report("simple: ") do
+    n.times{ simple }
+  end
+  x.report("simple uniq: ") do
+    n.times{ simple(true) }
+  end
+  x.report("big: ") do
+    n.times{ big }
+  end
+  x.report("big uniq: ") do
+    n.times{ big(true) }
+  end
+  x.report("big weights: ") do
+    n.times{ big_weights }
+  end
+  x.report("big weights uniq: ") do
+    n.times{ big_weights(true) }
+  end
+end

data/lib/pickup.rb

@@ -26,31 +26,27 @@ class Pickup
   end
 
   class CircleIterator
-    attr_reader :func, :obj
+    attr_reader :func, :obj, :max
 
-    def initialize(obj, func)
+    def initialize(obj, func, max)
       @obj = obj.dup
       @func = func
+      @max = max
     end
 
     def each
-      mx = max
       until obj.empty?
         start = 0
         obj.each do |item, weight|
           val = func.call(weight)
           start += val
-          if yield([item, start, mx])
+          if yield([item, start, max])
             obj.delete item
-            mx = max
+            @max -= val
           end
         end
       end
     end
-
-    def max
-      obj.inject(0){ |mx, item| mx += func.call(item[1]) }
-    end
   end
 
   class MappedList
@@ -64,7 +60,7 @@ class Pickup
     end
 
     def each(&blk)
-      CircleIterator.new(@list, func).each do |item|
+      CircleIterator.new(@list, func, max).each do |item|
         if uniq
           true if yield item
         else
@@ -80,14 +76,13 @@ class Pickup
     end
 
     def get_random_items(nums)
-      next_num = Proc.new{ nums.shift }
-      current_num = next_num.call
+      current_num = nums.shift
       items = []
       each do |item, counter, mx|
         break unless current_num
         if counter%(mx+1) > current_num%mx
           items << item
-          current_num = next_num.call
+          current_num = nums.shift
           true
         end
       end
@@ -95,7 +90,11 @@ class Pickup
     end
 
     def max
-      list.inject(0){ |mx, item| mx += func.call(item[1]) }
+      @max ||= begin
+        max = 0
+        list.each{ |item| max += func.call(item[1]) }
+        max
+      end
     end
   end
 end

data/lib/pickup/version.rb

@@ -1,3 +1,3 @@
 class Pickup
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/pickup/pickup_spec.rb

@@ -60,8 +60,13 @@ describe Pickup do
     proc{ items = @pickup2.pick(8) }.must_raise RuntimeError
   end
 
-  it "should return include most wegtful item (but not always - sometimes it will fail)" do
+  it "should return include most weigtfull item (but not always - sometimes it will fail)" do
     items = @pickup2.pick(2){ |v| v**20 }
     (items.include? "minnow").must_equal true
   end
+
+  it "should return include less weigtfull item (but not always - sometimes it will fail)" do
+    items = @pickup2.pick(2){ |v| v**(-20) }
+    (items.include? "selmon").must_equal true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -23,6 +23,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- benchmarks/pickup.rb
 - lib/pickup.rb
 - lib/pickup/version.rb
 - pickup.gemspec