roulette-wheel-selection 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3484337fe62871d485f23ef11feba7ee6d474358bc77ed9024d079c9aaa54c
-  data.tar.gz: 88b36caaf509f594f708529da4eaa924e7d0a2ee9fe940ae6595e18f25001a42
+  metadata.gz: b9666d28896171b78e19cf6b50a123b9177b5048695ac7d21b7ea7cfb8abf0b3
+  data.tar.gz: 194ece6957aadd240d567272d3d81edb98cd88c1a7c4f4f7686759ce8eafddd4
 SHA512:
-  metadata.gz: 3fbe3ca6f8517b5fc1609d2872aa79204b8459adcfcd31c272d9d72b2295b9169824d52802db7f01eba06c174d64230b6b722a9ea46c2296c3513f4e4697ac40
-  data.tar.gz: 2df389f4ebe67517f858af187021f2eab13e1934e8e86a62956ec8c3eaf26f3a89d134815b409f00888cca4f1d0152eeb6ac7f1b1e38b236cf9aab8696299445
+  metadata.gz: 74fd4bbcd66a24710c52b3fae66b8fcb7cf2af4b9da3b5ecd8615f0d4fbda6c5c2cc894bab9aadb00b5669d27318388ff6394961e6e0acd10682cf1831d1d31c
+  data.tar.gz: a88b3ba11e7ab066e5e35fa57b0da7d3c90ced0b4375e00ac7281f30d7c61c97aa141f937d17c2a72d0e7bda5a081531e4dff808994a74071778586483776387

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## Change Log
+
+### v1.0.1 2018/07/17
+- [#3](https://github.com/khiav223577/roulette-wheel-selection/pull/3) Fix: zero weight objects should be ignored (@khiav223577)
+- [#2](https://github.com/khiav223577/roulette-wheel-selection/pull/2) Fix: should return nil if input is empty (@khiav223577)
+- [#1](https://github.com/khiav223577/roulette-wheel-selection/pull/1) try using new test reporter (@khiav223577)

data/README.md

@@ -31,17 +31,27 @@ require 'roulette-wheel-selection'
 ```
 
 ### Hash format
+
 ```rb
 RouletteWheelSelection.sample(
-  'cola'   => 40, 
-  'sprite' => 20, 
+  'cola'   => 40,
+  'sprite' => 20,
   'fanta'  => 30,
   'wine'   => 40,
 )
 # => 'cola'
 ```
 
+#### sample n random elements
+
+```rb
+roulette = RouletteWheelSelection.new('ps4' => 50, 'switch' => 40, 'xbox' => 30)
+roulette.sample(3)
+# => ['ps4', 'switch', 'xbox']
+```
+
 ### Array format
+
 ```rb
 drinks = [
   { name: 'cola', weight: 40 },
@@ -50,7 +60,7 @@ drinks = [
   { name: 'wine', weight: 40 },
 ]
 RouletteWheelSelection.sample(drinks, :weight)
-# => 'cola'
+# => { name: 'cola', weight: 40 }
 ```
 
 ## Development

data/lib/roulette-wheel-selection.rb

@@ -19,13 +19,41 @@ class RouletteWheelSelection
     end
 
     def sample_from_hash(hash)
-      total_rate = hash.values.inject(&:+) || 0
-      return if total_rate == 0
-      random_seed = rand(total_rate)
-      hash.each do |obj, rate|
-        return obj if random_seed < rate
-        random_seed -= rate
-      end
+      RouletteWheelSelection.new(hash).sample
+    end
+  end
+
+  def initialize(hash)
+    @hash = hash
+    @total_rate = hash.values.inject(&:+) || 0
+  end
+
+  def sample(num = 1)
+    return if @total_rate == 0
+    return if num < 1
+    return sample_n_objects(num) if num > 1
+    return sample_an_object(@total_rate, @hash)
+  end
+
+  private
+
+  def sample_n_objects(num)
+    hash = @hash.clone
+    total_rate = @total_rate
+    num = total_rate if num > total_rate
+    return Array.new(num) do
+      obj = sample_an_object(total_rate, hash)
+      hash[obj] -= 1
+      total_rate -= 1
+      next obj
+    end
+  end
+
+  def sample_an_object(total_rate, hash)
+    random_seed = rand(total_rate)
+    hash.each do |obj, rate|
+      return obj if random_seed < rate
+      random_seed -= rate
     end
   end
 end

data/lib/roulette-wheel-selection/version.rb

@@ -1,3 +1,3 @@
 class RouletteWheelSelection
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/roulette-wheel-selection.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: roulette-wheel-selection
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 3.x
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +66,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile