weightedpicker 0.0.1 → 0.0.2

data/CHANGES

@@ -0,0 +1,9 @@
+== Master (for 0.0.2)
+  Use integer alternative to float.
+  Add test for 'pick' method.
+
+== Version 0.0.1
+  bugfix.
+
+== Version 0.0.0
+  initiali release.

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "weightedpicker"
   gem.homepage = "http://github.com/ippei94da/weightedpicker"
   gem.license = "MIT"
-  gem.summary = %Q{Picking one item from list with weight}
-  gem.description = %Q{This library enable to pick out items with their weight.
+  gem.summary = %Q{Picking one item from list at the rate of its weight.}
+  gem.description = %Q{This library enables to pick out items at the rate of their weight.
     Weight data is storaged as a YAML file.
     You can use this library for music player, wallpaper changer, language training.
   }

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/weightedpicker.rb

@@ -1,8 +1,8 @@
 require 'yaml'
 
 # TODO
-# 	initialize.指定したファイル内のデータが WeightedPicker 的に
-# 	解釈できなければ例外。
+#   initialize.指定したファイル内のデータが WeightedPicker 的に
+#   解釈できなければ例外。
 
 #= 概要
 # 要素群の中から、優先度に応じた重み付きランダムで、
@@ -44,12 +44,12 @@ require 'yaml'
 #
 #= 評価の上限と下限
 #== 上限
-# 点数の上限は 1.0。
+# 点数の上限は 1 million。
 # 上限を越える点数の要素が現れたら、
-# それが 1.0 になるように全ての要素の評価を除算して正規化する。
+# それが max valueになるように全ての要素の評価を除算して正規化する。
 #
 #== 下限
-# 点数の下限は 2.0 ** (-500) としておく。
+# 点数の下限は 1 としておく。
 # 下限を下回る点数の要素が現れたら、
 # その要素の点数を下限値に設定する。
 # これが重要になるのはクイズゲームで間違ったときにその問題以外の
@@ -91,143 +91,127 @@ require 'yaml'
 # 
 # ヒストリ関係はこのクラスの外に出した方が良いと判断。
 class WeightedPicker
-	MAX_WEIGHT = 1.0
-	MIN_WEIGHT = 2.0 ** (-500)
-
-	class InvalidFilenameError < Exception; end
-	class NoEntryError         < Exception; end
-	class NotExistKeyError     < Exception; end
-
-	# Initialization.
-	# Argument 'file' indicates a strage file name for data
-	# which this class manages.
-	# If the 'file' does not exist, this file is used to data strage.
-	#
-	# Argument 'items' is an array of items to be managed.
-	# Not all the items in the 'file' survive.
-	# A and B in the file and B and C in items,
-	# then B and C is the items which this class manage.
-	# A is discarded from record.
-	def initialize(file, items)
-		@save_file = file
-		unless File.exist? @save_file
-			File.open(@save_file, "w") {|io| YAML.dump({}, io)}
-		end
-		@weights = YAML.load_file(file)
-
-		merge(items)
-		normalize_write
-	end
-
-	#乱数を利用して優先度で重み付けして要素を選び、要素を返す。
-	def pick
-		raise NoEntryError if @weights.empty?
-
-		##乱数を 2つ生成し、adopt? を呼ぶ。
-		##乱数でどれか1つを選ぶ。
-		##その priority に応じて、確率で採用する。
-		while ( true )
-			item = @weights.keys[ rand( @weights.size ) ]
-
-			#next if ( ! pick?( item ) )
-			if adopt?( item, rand )
-				return item
-			end
-		end
-	end
-
-	#重みを重くする。(優先度が上がる)
-	def weigh(item)
-		#pp @weights
-		raise NotExistKeyError unless @weights.has_key?(item)
-		@weights[ item ] *= 2.0
-		normalize_write
-	end
-
-	#重みを軽くする。(優先度が下がる)
-	def lighten( item )
-		raise NotExistKeyError unless @weights.has_key?(item)
-		@weights[ item ] /= 2.0
-		normalize_write
-	end
-
-	##管理している要素の数を返す。
-	#def size
-	#	@weights.size
-	#end
-
-	##管理している要素と重みでイテレート。
-	##e.g. ws0.each { |item, weight| p item, weight }
-	##item が管理しているオブジェクト、weight が重み。
-	#def each
-	#	@weights.each do |item, weight|
-	#		yield( item, weight )
-	#	end
-	#end
-
-	private
-
-	# 引数 keys で示したものと、
-	# 内部的に管理しているデータが整合しているかチェックし、
-	# keys に合わせる。
-	# 追加されたデータは MAX_WEIGHT の重みとなる。
-	# データが削除された場合、それが最大値の可能性があるので
-	# 必ず normalize_write される。
-	def merge(keys)
-		keys.each do |key|
-			@weights[key] = MAX_WEIGHT unless
-				@weights.keys.include?(key)
-		end
-		@weights.each do |key, val|
-			@weights.delete(key) unless keys.include?(key)
-		end
-		normalize_write
-	end
-
-	# given_val は 0.0〜1.0 の間の実数とする。
-	# 重みと 与えられた given_val が等しい場合は false になる。
-	# これは重み 1.0 が稀に採用されないことがあっても
-	# 重み 0.0 が稀にでも採用されることを嫌ってのこと。
-	def adopt?( item, given_val )
-		raise NotExistKeyError unless @weights.has_key?(item)
-
-		return given_val < (@weights[item])
-	end
-
-	##データを更新し、整合性を確保する。
-	#def refresh
-	#	TODO
-	#	raise れいがいめい
-	#	"Cannot do refresh because no entry exists." if @weights.size == 0
-
-	#	#normalize のために事前設定。
-	#	@max_weight = @weights.max{ |a, b| a[1] <=> b[1] }[1]
-	#	normalize
-
-	#	#normalize したあとのデータに従い、total_weight などを算出。
-	#	@total_weight = @weights.values.inject( 0 ){ |sum, i| sum += i }
-	#	@max_weight = @weights.max{ |a, b| a[1] <=> b[1] }[1]
-	#end
-
-	# 最大値を max とするように規格化する。
-	# ただし、weight が MIN_WEIGHT 未満となった項目は
-	# MIN_WEIGHT を新しい weight とする。
-	def normalize_write
-		raise NoEntryError if @weights.size == 0
-
-		old_max = @weights.values.max
-		@weights.each do |key, val|
-			new_val = (val * (MAX_WEIGHT / old_max ) )
-			if new_val < MIN_WEIGHT
-				@weights[key] = MIN_WEIGHT
-			else
-				@weights[key] = new_val
-			end
-		end
-
-		File.open(@save_file, "w") do |io|
-			YAML.dump(@weights, io)
-		end
-	end
+  MAX_WEIGHT = 1_000_000
+  MIN_WEIGHT = 1
+
+  class InvalidFilenameError < Exception; end
+  class NoEntryError         < Exception; end
+  class NotExistKeyError     < Exception; end
+  class InvalidWeightError   < Exception; end
+
+  # Initialization.
+  # Argument 'file' indicates a strage file name for data
+  # which this class manages.
+  # If the 'file' does not exist, this file is used to data strage.
+  #
+  # Argument 'items' is an array of items to be managed.
+  # Not all the items in the 'file' survive.
+  # A and B in the file and B and C in items,
+  # then B and C is the items which this class manage.
+  # A is discarded from record.
+  def initialize(file, items)
+    @save_file = file
+    unless File.exist? @save_file
+      File.open(@save_file, "w") {|io| YAML.dump({}, io)}
+    end
+    @weights = YAML.load_file(file)
+
+    @weights.values.each do |i|
+      raise InvalidWeightError, "#{i.inspect}, not integer." unless i.is_a? Integer
+    end
+
+    merge(items)
+    normalize_write
+  end
+
+  # 乱数を利用して優先度で重み付けして要素を選び、要素を返す。
+  # num is only for test. User should not use this argument.
+  def pick(num = nil)
+    raise NoEntryError if @weights.empty?
+
+    sums = []
+    keys = []
+    sum = 0
+    @weights.each do |key, weight|
+      keys << key
+      sum += weight
+      sums << sum
+    end
+
+    num ||= rand(sum)
+    # find index of first excess a number
+    sums.each_with_index do |item, index|
+      return keys[index] if num < item
+    end
+  end
+
+  #重みを重くする。(優先度が上がる)
+  def weigh(item)
+    #pp @weights
+    raise NotExistKeyError unless @weights.has_key?(item)
+    @weights[ item ] *= 2
+    normalize_write
+  end
+
+  #重みを軽くする。(優先度が下がる)
+  def lighten(item)
+    raise NotExistKeyError unless @weights.has_key?(item)
+    #@weights[ item ] /= 2 unless @weights[ item ] == 0
+    @weights.each do |key, val|
+      weigh(key) unless key == item
+    end
+    normalize_write
+  end
+
+  ##管理している要素の数を返す。
+  #def size
+  # @weights.size
+  #end
+
+  ##管理している要素と重みでイテレート。
+  ##e.g. ws0.each { |item, weight| p item, weight }
+  ##item が管理しているオブジェクト、weight が重み。
+  #def each
+  # @weights.each do |item, weight|
+  #   yield(item, weight)
+  # end
+  #end
+
+  private
+
+  # 引数 keys で示したものと、
+  # 内部的に管理しているデータが整合しているかチェックし、
+  # keys に合わせる。
+  # 追加されたデータは MAX_WEIGHT の重みとなる。
+  # データが削除された場合、それが最大値の可能性があるので
+  # 必ず normalize_write される。
+  def merge(keys)
+    keys.each do |key|
+      @weights[key] ||= MAX_WEIGHT
+    end
+    @weights.each do |key, val|
+      @weights.delete(key) unless keys.include?(key)
+    end
+    #pp @weights
+    #pp keys
+    normalize_write
+  end
+
+  # 最大値を max とするように規格化する。
+  # ただし、weight が MIN_WEIGHT 未満となった項目は
+  # MIN_WEIGHT を新しい weight とする。
+  def normalize_write
+    raise NoEntryError if @weights.size == 0
+
+    old_max = @weights.values.max
+    @weights.each do |key, val|
+      new_val = (val.to_f * (MAX_WEIGHT.to_f / old_max.to_f)).to_i
+      @weights[key] = new_val if MIN_WEIGHT <= new_val
+    end
+
+    File.open(@save_file, "w") do |io|
+      YAML.dump(@weights, io)
+    end
+  end
 
 end

data/spec/weightedpicker_spec.rb

@@ -4,7 +4,7 @@ require "fileutils"
 
 class WeightedPicker
   attr_accessor :weights
-  public :normalize_write, :adopt?, :merge
+  public :normalize_write, :merge
 end
 
 TMP_FILE = "tmp.yaml"
@@ -14,7 +14,7 @@ NOT_EXIST_FILE = "not_exist_file"
 
 describe "Weightedpicker::initialize" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -26,8 +26,8 @@ describe "Weightedpicker::initialize" do
   it "should create new file when the file not exist" do
     # 指定したファイルが存在しない場合、
     t = WeightedPicker.new(NOT_EXIST_FILE, ["A","B"])
-    t.weights.should == { "A" => 1.0, "B" => 1.0}
-    YAML.load_file(NOT_EXIST_FILE).should == { "A" => 1.0, "B" => 1.0, }
+    t.weights.should == { "A" => 1_000_000, "B" => 1_000_000}
+    YAML.load_file(NOT_EXIST_FILE).should == { "A" => 1_000_000, "B" => 1_000_000, }
   end
   
   it "should raise exception" do
@@ -37,26 +37,37 @@ describe "Weightedpicker::initialize" do
 
   it "should read correctly" do
     # 正しく取り込めているか？
-    @wp01.weights.should == { "A" => 1.0, "B" => 0.5, }
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 500_000, }
   end
 
   it "should normalize when the maximum in the file not the same as MAX_WEIGHT" do
     # 指定したファイル内の重みの最大値が MAX_WEIGHT と異なれば、
     # 全体を normalize して格納。
-    weights = { "A" => 2.0, "B" => 0.5, }
+    weights = { "A" => 2_000_000, "B" => 500_000, }
     File.open(TMP_FILE, "w") {|io| YAML.dump(weights, io) }
-    WeightedPicker.new(TMP_FILE, ["A","B"]).weights.should == { "A" => 1.0, "B" => 0.25, }
+    WeightedPicker.new(TMP_FILE, ["A","B"]).weights.should == { "A" => 1_000_000, "B" => 250_000, }
     #
-    weights = { "A" => 0.25, "B" => 0.5, }
+    weights = { "A" => 250_000, "B" => 500_000, }
     File.open(TMP_FILE, "w"){ |io| YAML.dump(weights, io) }
-    WeightedPicker.new(TMP_FILE, ["A","B"]).weights.should == { "A" => 0.5, "B" => 1.0, }
+    WeightedPicker.new(TMP_FILE, ["A","B"]).weights.should == { "A" => 500_000, "B" => 1_000_000, }
   end
 
   it "should merge when keys between weights and items" do
-    # weights と items が異なる場合
-    weights = { "A" => 1.0, "B" => 0.50, }
+    # weights と items が異なる場合、
+    # まず新しいキーを重み MAX_WEIGHT で追加して、
+    # それから実際にはないキーを削除。
+    weights = { "A" => 1_000_000, "B" => 500_000, }
+    File.open(TMP_FILE, "w") {|io| YAML.dump(weights, io) }
+    #puts "HERE ###################"
+    WeightedPicker.new(TMP_FILE, ["B","C"]).weights.should == { "B" => 500_000, "C" => 1_000_000, }
+  end
+
+  it "should raise exception if include not integer weight." do
+    weights = { "A" => 1.0, "B" => 0.5, }
     File.open(TMP_FILE, "w") {|io| YAML.dump(weights, io) }
-    WeightedPicker.new(TMP_FILE, ["B","C"]).weights.should == { "B" => 0.5, "C" => 1.0, }
+    lambda{
+      WeightedPicker.new(TMP_FILE, ["A","B"])
+    }.should raise_error(WeightedPicker::InvalidWeightError)
   end
 
   after do
@@ -68,7 +79,7 @@ end
 
 describe "Weightedpicker::merge" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -84,9 +95,9 @@ describe "Weightedpicker::merge" do
     t = Marshal.load(Marshal.dump(@wp01))
     keys = ["B"]
     t.merge(keys)
-    t.weights. should == { "B" => 1.0 }
+    t.weights. should == { "B" => 1_000_000 }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "B" => 1.0 }
+    YAML.load_file(TMP_FILE).should == { "B" => 1_000_000 }
   end
 
   it "when keys given are more than weights file" do
@@ -94,9 +105,9 @@ describe "Weightedpicker::merge" do
     t = Marshal.load(Marshal.dump(@wp01))
     keys = ["A", "B", "C"]
     t.merge(keys)
-    t.weights.should == { "A" => 1.0, "B" => 0.5, "C" => 1.0, }
+    t.weights.should == { "A" => 1_000_000, "B" => 500_000, "C" => 1_000_000, }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 0.5, "C" => 1.0}
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 500_000, "C" => 1_000_000}
   end
 
   it "when keys given are the same as weights file" do
@@ -104,9 +115,9 @@ describe "Weightedpicker::merge" do
     # 同じ場合
     keys = ["A", "B"]
     t.merge(keys)
-    t.weights.should == { "A" => 1.0, "B" => 0.5}
+    t.weights.should == { "A" => 1_000_000, "B" => 500_000}
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 0.5}
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 500_000}
   end
 
   after do
@@ -118,7 +129,7 @@ end
 
 describe "Weightedpicker::pick" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -130,11 +141,16 @@ describe "Weightedpicker::pick" do
   end
 
   it "should pick" do
-    ## No test, beccause including randomness.
-    #assert_raise(WeightedPicker::NoEntryError){@wp02.pick}
-    #100.times do 
-    #  assert_equal(true, ["A","B"].include?(@wp01.pick))
-    #end
+    lambda{@wp02.pick}.should raise_error(WeightedPicker::NoEntryError)
+
+    sum = 1_500_000
+    tryal = 300
+    results = {"A" => 0, "B" => 0}
+    tryal.times do |i|
+      results[@wp01.pick(i * sum / tryal)] += 1
+    end
+    results["A"].should == tryal / 3 * 2
+    results["B"].should == tryal / 3 * 1
   end
 
   after do
@@ -146,7 +162,7 @@ end
 
 describe "Weightedpicker::weigh" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -159,17 +175,17 @@ describe "Weightedpicker::weigh" do
   it "should weigh A" do
     t = Marshal.load(Marshal.dump(@wp01))
     t.weigh("A")
-    t.weights.should == { "A" => 1.0, "B" => 0.25 }
+    t.weights.should == { "A" => 1_000_000, "B" => 250_000 }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 0.25 }
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 250_000 }
   end
 
   it "should weigh B" do
     t = Marshal.load(Marshal.dump(@wp01))
     t.weigh("B")
-    t.weights.should == { "A" => 1.0, "B" => 1.0 }
+    t.weights.should == { "A" => 1_000_000, "B" => 1_000_000 }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 1.0 }
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 1_000_000 }
   end
 
   it "should raise error" do
@@ -185,7 +201,7 @@ end
 
 describe "Weightedpicker::lighten" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -197,17 +213,17 @@ describe "Weightedpicker::lighten" do
   it "should lighten A" do
     t = Marshal.load(Marshal.dump(@wp01))
     t.lighten("A")
-    t.weights.should == { "A" => 1.0, "B" => 1.0 }
+    t.weights.should == { "A" => 1_000_000, "B" => 1_000_000 }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 1.0 }
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 1_000_000 }
   end
 
   it "should lighten B" do
     t = Marshal.load(Marshal.dump(@wp01))
     t.lighten("B")
-    t.weights.should == { "A" => 1.0, "B" => 0.25 }
+    t.weights.should == { "A" => 1_000_000, "B" => 250_000 }
     # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 0.25 }
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 250_000 }
   end
 
   it "should raise error" do
@@ -222,9 +238,9 @@ describe "Weightedpicker::lighten" do
 
 end
 
-describe "Weightedpicker::adopt" do
+describe "Weightedpicker::normalize_write" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 500_000, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
@@ -233,15 +249,47 @@ describe "Weightedpicker::adopt" do
     FileUtils.rm NOT_EXIST_FILE if File.exist? NOT_EXIST_FILE
   end
 
-  it do
-    @wp01.adopt?("A", 0.0  ).should be_true
-    @wp01.adopt?("A", 0.5  ).should be_true
-    @wp01.adopt?("A", 0.999).should be_true
-    @wp01.adopt?("A", 1.0  ).should be_false
-    @wp01.adopt?("B", 0.0  ).should be_true
-    @wp01.adopt?("B", 0.499).should be_true
-    @wp01.adopt?("B", 0.5  ).should be_false
-    @wp01.adopt?("B", 1.0  ).should be_false
+  it "should shrink write" do
+    t = Marshal.load(Marshal.dump(@wp01))
+    t.weights = { "A" => 2_000_000, "B" => 500_000, }
+    t.normalize_write
+    t.weights.should == { "A" => 1_000_000, "B" => 250_000}
+    # 書き込みチェック
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 250_000}
+  end
+
+  it "should shrink write with 2" do
+    t = Marshal.load(Marshal.dump(@wp01))
+    t.weights = { "A" => 2_000_000, "B" => 2, }
+    t.normalize_write
+    t.weights.should == { "A" => 1_000_000, "B" => 1}
+  end
+
+  it "should shrink write with 1" do
+    t = Marshal.load(Marshal.dump(@wp01))
+    t.weights = { "A" => 2_000_000, "B" => 1, }
+    t.normalize_write
+    t.weights.should == { "A" => 1_000_000, "B" => 1}
+  end
+
+  it "should shrink write with 0" do
+    t = Marshal.load(Marshal.dump(@wp01))
+    t.weights = { "A" => 2_000_000, "B" => 0, }
+    t.normalize_write
+    t.weights.should == { "A" => 1_000_000, "B" => 0}
+  end
+
+  it "should expand write" do
+    t = Marshal.load(Marshal.dump(@wp01))
+    t.weights = { "A" => 500_000, "B" => 500_000, }
+    t.normalize_write
+    t.weights.should == { "A" => 1_000_000, "B" => 1_000_000}
+    # 書き込みチェック
+    YAML.load_file(TMP_FILE).should == { "A" => 1_000_000, "B" => 1_000_000}
+  end
+
+  it "should raise error" do
+    lambda{@wp02.normalize_write}.should raise_error (WeightedPicker::NoEntryError)
   end
 
   after do
@@ -251,37 +299,57 @@ describe "Weightedpicker::adopt" do
 
 end
 
-describe "Weightedpicker::normalize_write" do
+describe "include zero weight" do
   before do
-    weights = { "A" => 1.0, "B" => 0.5, }
+    weights = { "A" => 1_000_000, "B" => 0, }
     items = ["A", "B"]
     File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
     @wp01 = WeightedPicker.new(TMP_FILE, items)
-    @wp02 = Marshal.load(Marshal.dump(@wp01))
-    @wp02.weights = {}
     FileUtils.rm NOT_EXIST_FILE if File.exist? NOT_EXIST_FILE
   end
 
-  it "should shrink write" do
-    t = Marshal.load(Marshal.dump(@wp01))
-    t.weights = { "A" => 2.0, "B" => 0.5, }
-    t.normalize_write
-    t.weights.should == { "A" => 1.0, "B" => 0.25}
-    # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 0.25}
+  it "should not change zero weight." do
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 0 }
+    @wp01.lighten("A")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 0 }
+    @wp01.weigh("A")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 0 }
+    @wp01.lighten("B")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 0 }
+    @wp01.weigh("B")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 0 }
   end
 
-  it "should shrink write" do
-    t = Marshal.load(Marshal.dump(@wp01))
-    t.weights = { "A" => 0.5, "B" => 0.5, }
-    t.normalize_write
-    t.weights.should == { "A" => 1.0, "B" => 1.00}
-    # 書き込みチェック
-    YAML.load_file(TMP_FILE).should == { "A" => 1.0, "B" => 1.00}
+  after do
+    FileUtils.rm TMP_FILE  if File.exist? TMP_FILE
+    FileUtils.rm NOT_EXIST_FILE if File.exist? NOT_EXIST_FILE
   end
 
-  it "should raise error" do
-    lambda{@wp02.normalize_write}.should raise_error (WeightedPicker::NoEntryError)
+end
+
+describe "include one weight" do
+  before do
+    weights = { "A" => 1_000_000, "B" => 1, }
+    items = ["A", "B"]
+    File.open(TMP_FILE, "w") { |io| YAML.dump(weights, io) }
+    @wp01 = WeightedPicker.new(TMP_FILE, items)
+    FileUtils.rm NOT_EXIST_FILE if File.exist? NOT_EXIST_FILE
+  end
+
+  it "should not change zero weight." do
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 1 }
+
+    @wp01.lighten("A")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 2 }
+
+    @wp01.weigh("A")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 1 }
+
+    @wp01.lighten("B")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 1 }
+
+    @wp01.weigh("B")
+    @wp01.weights.should == { "A" => 1_000_000, "B" => 2 }
   end
 
   after do
@@ -290,3 +358,4 @@ describe "Weightedpicker::normalize_write" do
   end
 
 end
+

data/weightedpicker.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "weightedpicker"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2012-04-13"
-  s.description = "This library enable to pick out items with their weight.\n    Weight data is storaged as a YAML file.\n    You can use this library for music player, wallpaper changer, language training.\n  "
+  s.date = "2012-07-13"
+  s.description = "This library enables to pick out items at the rate of their weight.\n    Weight data is storaged as a YAML file.\n    You can use this library for music player, wallpaper changer, language training.\n  "
   s.email = "ippei94da@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "CHANGES",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ippei94da/weightedpicker"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
-  s.summary = "Picking one item from list with weight"
+  s.rubygems_version = "1.8.11"
+  s.summary = "Picking one item from list at the rate of its weight."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weightedpicker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71663210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *71663210
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71662930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *71662930
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71662620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+  version_requirements: *71662620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71662320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *71662320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71662030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "This library enable to pick out items with their weight.\n    Weight
-  data is storaged as a YAML file.\n    You can use this library for music player,
-  wallpaper changer, language training.\n  "
+  version_requirements: *71662030
+description: ! "This library enables to pick out items at the rate of their weight.\n
+  \   Weight data is storaged as a YAML file.\n    You can use this library for music
+  player, wallpaper changer, language training.\n  "
 email: ippei94da@gmail.com
 executables: []
 extensions: []
@@ -103,8 +78,8 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- CHANGES
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -128,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -774423471
+      hash: -490884429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Picking one item from list with weight
+summary: Picking one item from list at the rate of its weight.
 test_files: []

data/Gemfile.lock

@@ -1,37 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.6)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.1.3)
-  jeweler (~> 1.8.3)
-  rdoc (~> 3.12)
-  rspec (~> 2.9.0)
-  simplecov