kujibiki 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1b80e4107b12827cb68fab29191475df72cff4
-  data.tar.gz: 79d96d0bfed5e0894855001e540c9895bed350fc
+  metadata.gz: 5a00aa2d312cdb6a276739da7fd703594f1d6d77
+  data.tar.gz: ec1f679ddd807cb3d49af9e03dd1d9d80a7c2a16
 SHA512:
-  metadata.gz: 3c38987eecf30a7c776a4d47a3b77daf67e342afd0be4a3e9142578a00f26ae4e39b6d9f65600e7df6b39860eef182640dfddedc2286ba8956058d6d570e45da
-  data.tar.gz: fa28225731ed7113e53d9f12fca6ef6f52df4435ec97159259aadaf2cf82796376fd42e3a5cab1cef443a9b2b9f52f6a0a9493079829206cb3a8880148b6d80d
+  metadata.gz: d33baa2cce6c158200ca79930aaf358c879fe0ef68390f565ebb945479dd95c174031db0f81a5274bf8df37979f4867bf1bab2b5fa3abf3b918dca96164ebc43
+  data.tar.gz: 9981869ef4d582dc539828bd8be38c8ef285ef3221d7772b584dcd12370b94ce6d338562e084a553c2c85f2cb0c4220e24388fd24bc60a54ffc389b129282990

data/lib/kujibiki/core_ext/array.rb

@@ -1,43 +1,52 @@
 class Array
   alias_method :_sample, :sample
   def sample(n=nil, random: nil, weight: nil)
-    unless weight
-      if n
-        if random
-          return _sample(n, random: random)
-        else
-          return _sample(n)
-        end
-      else
-        if random
-          return _sample(random: random)
-        else
-          return _sample
-        end
-      end
-    end
+    return call_original_sample(n, random: random) if (weight.nil? || self.size <= 1)
 
     unless weight.select {|w| w > 0}.size >= self.size
       raise ArgumentError, "weight size must be larger than or equal to sample number(#{self.size})"
     end
 
-    sum = weight.inject(0.0, :+)
-    normalized_hash = self.each_with_object({}).with_index do |(e, h), i|
-      h[e] = weight[i] / sum
-    end
+    begin
+      sum = weight.inject(0.0, :+)
+      normalized_hash = self.each_with_object({}).with_index do |(e, h), i|
+        h[e] = weight[i] / sum
+      end
+
+      pick_max = 1.0
+      sampled = n.times.map do
+        pick = random ? random.rand(0..pick_max) : rand(0..pick_max)
 
-    pick_max = 1.0
-    sampled = n.times.map do
-      pick = random ? random.rand(0..pick_max) : rand(0..pick_max)
+        e, weight = normalized_hash.find do |e, weight|
+          (pick <= weight) || ((pick -= weight) && false)
+        end
 
-      e, weight = normalized_hash.find do |e, weight|
-        (pick <= weight) || ((pick -= weight) && false)
+        pick_max -= weight
+        normalized_hash[e] = 0 and e
       end
 
-      pick_max -= weight
-      normalized_hash[e] = 0 and e
+      sampled.size > 1 ? sampled : sampled.first
+    rescue => e
+      warn([e.class, e.message, e.backtrace.join("\n")].join(' '))
+      return call_original_sample(n, random: random)
     end
+  end
 
-    sampled.size > 1 ? sampled : sampled.first
+  private
+
+  def call_original_sample(n=nil, random: nil)
+    if n
+      if random
+        _sample(n, random: random)
+      else
+        _sample(n)
+      end
+    else
+      if random
+        _sample(random: random)
+      else
+        _sample
+      end
+    end
   end
 end

data/lib/kujibiki/version.rb

@@ -1,3 +1,3 @@
 module Kujibiki
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kujibiki
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Naoki Shimizu