multiset 0.4.1 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBiNjk1YzU0M2U4ZTEzYzdlZjQwZTdhOWY3OGQ5MWI5MzJiNGY1OA==
+    OTM5ZWVlZGI1NzVhMmM4NDk2ZTRhNGJmOTg4YTVmNmY4M2NiZTExOA==
   data.tar.gz: !binary |-
-    MDMwNjFmMTkzZjhmYjY0OTE3MzJjZDE2YTliZGE4NTdkZjVkMjM4MQ==
-!binary "U0hBNTEy":
+    NmRmNGI0ZjEyYzYxNjQ1NzIzOTRhMWI1ZmE3ODdmMjAxNjA2OTkwNg==
+SHA512:
   metadata.gz: !binary |-
-    YjdlOWFjMDBhY2E5YzllYzgzNjNmNjM0YWVjOTcyNGYyOWU2ZmZhNmFkYjdh
-    MDkyYmIzMzg5NzVjNGRlODU1OGE5ZGUzZDhkOTUzNWY0ZGJmMjY4ZjI1Njcz
-    NDNkOGU0OTEwZTYwNGE3ZjhlNmNjZTFjMzZiNTJiNDQ2MzdjODc=
+    NDlmYzA4M2RkNjNhZWExZDAwYzUwZjkyMGY5MWNjMzVlNzcwNjk2NGRhYTY0
+    NTQ3Mjg4YzhhOTIxNTJmNDdiYTAwZmRmMzM2OTA2YjU2ZDcwNGYxNDkwYzA3
+    YmUwNzZhMzFkMWM2ZTc0NWVjM2Q3MmM1YWExNTg2MGU1MGMzN2M=
   data.tar.gz: !binary |-
-    NWRkNDVmMDg4Y2Q3ODMyMzkxMjliNGIwM2ZhNDBiNTdlZDVkMTc4M2U1MjMy
-    ZDJmZTlmODRjOTNhMjMzOTlmY2MxOTc2MjNlMDg0MzBjOGMyZWQ3YmM1NTBh
-    ZGU2OTUwOWU5ODMzYTZhOTFmNTQ0ZjIxZThkNzYwZjQ2ZTIwYzQ=
+    MmI2NmIyZWZjZmE2NDJhMWMwOWRkNzQzM2RjZDgxY2M3YzRmZGQ3MjZiZWIx
+    YTE4NzVlMmQ1N2FlNjJjYjlhNDFhODgzMDJkMGUxMWQxMjY1MGVhNTdmODM0
+    M2QwNmM2YTgwMThiZjllZmQ1NTdkYzExN2Y5NmY1NzYzZDRhM2Q=

data/History.txt

@@ -214,3 +214,12 @@
 (en)
 * Multiset#each_**** and Multimap#each_**** returns an Enumerator if called without a block.
   (Forgot implementation although documented...)
+
+=== 0.5.0 / 2014-05-16
+
+(ja)
+* 空のmultisetに対して Multiset#sample を呼び出した場合、nilを返すようにした。（Array#sampleと挙動を合わせました）
+
+(en)
+* Multiset#sample returns nil in case the multiset is empty. (The same behavior as Array#sample.)
+

data/README.txt

@@ -62,7 +62,7 @@ and generate the RDoc.
 
 (The MIT License)
 
-Copyright (c) 2008-2012 H.Hiro (Maraigue)
+Copyright (c) 2008-2014 H.Hiro (Maraigue)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/multiset.rb

@@ -3,7 +3,7 @@
 
 require "enumerator"
 require "multimap"
-VERSION = "0.4.1"
+VERSION = "0.5.0"
 
 #==概要(Basic information)
 #
@@ -686,10 +686,13 @@ class Multiset
   
   # <code>self</code>の要素を無作為に1つ選んで返します。
   # すべての要素は等確率で選ばれます。
+  # 空のmultisetに対して呼び出した場合は<code>nil</code>を返します。
   #
   # Returns one item in <code>self</code> randomly.
   # All items are selected with the same probability.
+  # Returns <code>nil</code> in case the multiset is empty.
   def sample
+    return nil if empty?
     pos = Kernel.rand(self.size)
     @entries.each_pair do |item, count|
       pos -= count

data/spec/multiset_spec.rb

@@ -230,7 +230,11 @@ describe Multiset do
     it "should return a new Multiset by the specified condition with Multiset#map_with / Multiset#collect_with" do
       @ms.map_with{ |item, count| [item * 2, count * 2] }.should == Multiset.new(%w'aa aa aa aa bb bb bb bb bb bb bb bb cc cc dd dd dd dd dd dd')
     end
-    
+
+    it "should return nil for an empty Multiset with Multiset#rand" do
+      Multiset.new.rand.should == nil
+    end
+
     it "should return the maximum/mininum value by max/min/minmax" do
       @ms.max.should == "d"
       @ms.min.should == "a"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiset
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - H.Hiro(Maraigue)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: multiset
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Unlike ordinary set(see Ruby documentation for "set" library), multiset can