weightedpicker 0.1.0 → 0.1.1

data/CHANGES

@@ -1,6 +1,9 @@
 = weightedpicker changelog
 
 == Master (for 0.1.1)
+  Add bin/weight to deal with weight yaml.
+  Add WeightedPicker::names.
+  Add WeightedPicker::dump_histgram.
 
 == Version 0.1.0
   Use integer alternative to float.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/weight

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "yaml"
+require "pp"
+require "optparse"
+
+require "rubygems"
+require "weightedpicker"
+
+WIDTH = 50
+
+## option analysis
+OPTIONS = {}
+op = OptionParser.new
+op.on("-l", "--lighten", "Lighten all"){ OPTIONS[:lighten] = true}
+op.on("-w", "--weigh"  , "Weigh all"  ){ OPTIONS[:weigh]   = true}
+op.parse!(ARGV)
+
+data_file = ARGV[0]
+wp = WeightedPicker.load_file data_file
+
+if OPTIONS[:lighten]
+  wp.names.each { |name| wp.lighten name }
+  io = File.open(data_file, "w") { |io| wp.dump io }
+elsif OPTIONS[:weigh]
+  wp.names.each { |name| wp.weigh name }
+  io = File.open(data_file, "w") { |io| wp.dump io }
+end
+
+wp.dump_histgram($stdout)
+

data/lib/weightedpicker.rb

@@ -99,6 +99,8 @@ class WeightedPicker
   INI_WEIGHT = 2** 8
   MIN_WEIGHT = 2** 0
 
+  HISTGRAM_WIDTH = 50
+
   class InvalidFilenameError < Exception; end
   class NoEntryError         < Exception; end
   class NotExistKeyError     < Exception; end
@@ -128,10 +130,30 @@ class WeightedPicker
     YAML.dump(@tree.names_weights, io)
   end
 
+  def dump_histgram(io)
+    encounters = {}
+    names_weights.each do |key, weight|
+      #val_log2 = (Math::log(weight)/Math::log(2.0)).to_i
+      power = Math::log2(weight).ceil
+      encounters[power] ||= 0
+      encounters[power] += 1
+    end
+    max = encounters.values.max
+    0.upto(16) do |power|
+      num = encounters[power] || 0
+      stars = "*" * (HISTGRAM_WIDTH.to_f * num / max).ceil
+      io.printf("%6d(%4d)|#{stars}\n", 2**power, num)
+    end
+  end
+
   def names_weights
     @tree.names_weights
   end
 
+  def names
+    names_weights.keys
+  end
+
   # 乱数を利用して優先度で重み付けして要素を選び、要素を返す。
   # num is only for test. User should not use this argument.
   def pick

data/lib/weightedpicker/tree.rb

@@ -55,22 +55,6 @@ class WeightedPicker::Tree
       current_index = 2 * current_index + choise
     end
     return @names[current_index]
-
-
-    #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)

data/spec/weightedpicker_spec.rb

@@ -188,5 +188,51 @@ describe "Weightedpicker" do
 
   end
 
+  describe "Weightedpicker::names" do
+    it "should return an array of names." do
+      @wp01.names.should == [ "A", "B"]
+    end
+
+  end
+
+  describe "Weightedpicker::dump_histgram" do
+    it "should output histgram to io." do
+      input = {}
+      4.times do |power|
+        num = 10**power
+        num.times do |i|
+          input["#{power}_#{i}"] = num
+        end
+      end
+      #pp input
+      wp20 = WeightedPicker.new(input)
+      #pp wp20
+      io = StringIO.new
+      wp20.dump_histgram(io)
+      io.rewind
+      io.read.should == <<HERE
+     1(   1)|*
+     2(   0)|
+     4(   0)|
+     8(   0)|
+    16(  10)|*
+    32(   0)|
+    64(   0)|
+   128( 100)|*****
+   256(   0)|
+   512(   0)|
+  1024(1000)|**************************************************
+  2048(   0)|
+  4096(   0)|
+  8192(   0)|
+ 16384(   0)|
+ 32768(   0)|
+ 65536(   0)|
+HERE
+
+    end
+
+  end
+
 end
 

data/weightedpicker.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "weightedpicker"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2013-04-10"
+  s.date = "2013-04-18"
   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.executables = ["weight"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -25,6 +26,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/weight",
     "lib/weightedpicker.rb",
     "lib/weightedpicker/tree.rb",
     "spec/a-1b256.yaml",
@@ -42,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ippei94da/weightedpicker"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weightedpicker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71283260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *71283260
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71282480 !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: *71282480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71281810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+  version_requirements: *71281810
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71281240 !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: *71281240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &71280910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,17 +65,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *71280910
 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: []
+executables:
+- weight
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -109,6 +85,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/weight
 - lib/weightedpicker.rb
 - lib/weightedpicker/tree.rb
 - spec/a-1b256.yaml
@@ -137,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -243347693
+      hash: -1071442157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Picking one item from list at the rate of its weight.