pickup 0.0.6 → 0.0.7

data/README.md

@@ -83,6 +83,15 @@ pickup.pick
 #=> "sturgeon"
 ```
 
+### Custom probability function
+
+You can define your own function. So in case of `f(weight)=weight^10` most possible result will be "minnow", because `20^10` is `2^10` more possible then "gudgeon"
+```ruby
+pickup = Pickup.new(pond)
+pickup.pick(10){ |v| v**10 }
+#=> ["minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow", "minnow"]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/pickup.rb

@@ -26,23 +26,33 @@ class Pickup
   end
 
   class CircleIterator
-      def initialize(obj)
-        @obj = obj.dup
-      end
+    attr_reader :func, :obj
 
-      def each
+    def initialize(obj, func)
+      @obj = obj.dup
+      @func = func
+    end
+
+    def each
+      mx = max
+      until obj.empty?
         start = 0
-        until @obj.empty?
-          @obj.each do |item, weight|
-            start += weight
-            if yield([item, start])
-              @obj.delete item
-            end
+        obj.each do |item, weight|
+          val = func.call(weight)
+          start += val
+          if yield([item, start, mx])
+            obj.delete item
+            mx = max
           end
         end
       end
     end
 
+    def max
+      obj.inject(0){ |mx, item| mx += func.call(item[1]) }
+    end
+  end
+
   class MappedList
     attr_reader :list, :func, :uniq
 
@@ -54,7 +64,7 @@ class Pickup
     end
 
     def each(&blk)
-      CircleIterator.new(@list).each do |item|
+      CircleIterator.new(@list, func).each do |item|
         if uniq
           true if yield item
         else
@@ -65,7 +75,7 @@ class Pickup
 
     def random(count)
       raise "List is shorter then count of items you want to get" if uniq && list.size < count
-      nums = count.times.map{ rand(func.call(max)) }.sort
+      nums = count.times.map{ rand(max) }.sort
       get_random_items(nums)
     end
 
@@ -73,10 +83,9 @@ class Pickup
       next_num = Proc.new{ nums.shift }
       current_num = next_num.call
       items = []
-      each do |item, counter|
+      each do |item, counter, mx|
         break unless current_num
-        val = func.call(counter)
-        if val > current_num
+        if counter%(mx+1) > current_num%mx
           items << item
           current_num = next_num.call
           true
@@ -86,9 +95,7 @@ class Pickup
     end
 
     def max
-      @max ||= begin
-        list.inject(0){ |mx, item| mx += item[1]}
-      end
+      list.inject(0){ |mx, item| mx += func.call(item[1]) }
     end
   end
 end

data/lib/pickup/version.rb

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

data/spec/pickup/pickup_spec.rb

@@ -4,13 +4,13 @@ require 'spec_helper'
 describe Pickup do
   before do
     @list = {
-      "selmon"  => 1,
-      "carp" => 4,
-      "crucian"  => 3,
-      "herring" => 6,
-      "sturgeon" => 8,
-      "gudgeon" => 10,
-      "minnow" => 20
+      "selmon"  => 1,     # 1
+      "carp" => 4,        # 5
+      "crucian"  => 3,    # 8
+      "herring" => 6,     # 14
+      "sturgeon" => 8,    # 22
+      "gudgeon" => 10,    # 32
+      "minnow" => 20      # 52
     }
     @func = Proc.new{ |a| a }
     @pickup = Pickup.new(@list)
@@ -43,7 +43,7 @@ describe Pickup do
     end
 
     it "should return item from the beginning after end of list for uniq pickup" do
-      @ml.get_random_items([20, 20, 20, 20]).must_equal ["sturgeon", "gudgeon", "minnow", "selmon"]
+      @ml.get_random_items([20, 20, 20, 20]).must_equal ["sturgeon", "gudgeon", "minnow", "crucian"]
     end
 
     it "should return right max" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: