categorical_distribution 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bacc10077bb5dc4e4662c482f5f7e998574704
-  data.tar.gz: 096ebc9b023c6b842bbe60b1ef6fab7f412d0521
+  metadata.gz: 4b0487b59cbaa4f41e4e40295a2d9ff73513b387
+  data.tar.gz: 68871338ae32391f43e5c6ad857656a98f692483
 SHA512:
-  metadata.gz: 296d5956f4d2dcf59d032fb6f10f809407e27aeb6557d9949a60fc76abc8f459618890a9d3d303f9ac57e167d61a0f72e97fedce6b992b10cb9a011326a12aab
-  data.tar.gz: e1de5a78bc59289acf47978b1a0010b95841cd33349f839cd4ba62e6f8f24b5e82d05ba2f9061bf04a3e9594b170968887b0b5365da1a091028287126883b6fe
+  metadata.gz: 3a65b3985a695b1010da47f397cd4537e2226a159ce02abb25715699efb258938251117b81597b2339cfbd809e0dcf48b1709d07a5fb500e0b83332b0778d581
+  data.tar.gz: ed9d93b77779ba444b974447d3c82c37c90a6217fbf8153c20219f94b16bfac26ecd1d36cc559d0603eb8bfcc69c19005ceef269c6762619ce55c5549e630ba1

data/categorical_distribution.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/zanecodes/categorical_distribution"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 1.9'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end

data/lib/categorical_distribution.rb

@@ -1,5 +1,3 @@
-require 'forwardable'
-
 # Generate values from a categorical probability distribution in constant time.
 # Uses Vose's Alias Method to construct a table of probabilities and aliases.
 # To generate a value, we pick an entry in the distribution at random, and then pick
@@ -10,10 +8,8 @@ require 'forwardable'
 # See http://www.keithschwarz.com/darts-dice-coins for a detailed explanation.
 
 class CategoricalDistribution
-  extend Forwardable
   include Enumerable
 
-
   # :call-seq:
   #   CategoricalDistribution.new(p={})
   #   CategoricalDistribution.new(p=[])
@@ -49,22 +45,20 @@ class CategoricalDistribution
   def initialize(p={}, values=nil)
     if p.respond_to?(:keys) && p.respond_to?(:values)
       values, p = p.keys, p.values 
-    else
-      values ||= p.each_index.to_a
     end
 
+    @size = p.size
+    @values = values
+
     raise ArgumentError, 'probabilities must be positive' if p.any? { |value| value < 0 }
 
     sum = p.reduce(:+)
     p.map! { |value| Rational(value, sum) } unless sum == 1
 
-    @p = Hash[[values, p].transpose].freeze
-
-    n = p.size
-    @prob = Array.new(n, Rational(1))
-    @alias = Array.new(n)
+    @prob = Array.new(size, Rational(1))
+    @alias = Array.new(size)
 
-    p.map! { |value| value * n }
+    p.map! { |value| value * size }
 
     small, large = p.each_index.partition { |i| p[i] < 1 }
 
@@ -95,10 +89,11 @@ class CategoricalDistribution
   #   distribution.rand      #=> :c
 
   def rand(random: Random)
-    return if @prob.empty?
+    return if empty?
 
-    i = random.rand(@prob.size)
-    random.rand <= @prob[i] ? @p.keys[i] : @p.keys[@alias[i]]
+    i = random.rand(size)
+    index = random.rand <= @prob[i] ? i : @alias[i]
+    @values.nil? ? index : @values[index]
   end
 
 
@@ -127,6 +122,7 @@ class CategoricalDistribution
 
   # Returns the distribution's values and their probabilities, as a hash of
   # objects to Rationals which sum to one, or an empty hash if the distribution is empty.
+  # This operation is expensive, in exchange for memory efficiency.
   #
   #   CategoricalDistribution.new([1, 1, 1]).probabilities   
   #     #=> {0 => (1/3), 1 => (1/3), 2 => (1/3)}
@@ -135,7 +131,10 @@ class CategoricalDistribution
   #     #=> {}
 
   def probabilities
-    @p
+    p = @prob.clone
+    @alias.each_with_index { |a, i| p[a] += 1 - @prob[i] unless a.nil? }
+    p.map! { |prob| prob / size }
+    Hash[[@values || size.times.to_a, p].transpose]
   end
 
 
@@ -159,7 +158,9 @@ class CategoricalDistribution
   #     #=> false
 
   def ==(other)
-    self.probabilities == other.probabilities
+    self.prob     == other.prob &&
+      self.alias  == other.alias &&
+      self.values == other.values
   end
 
 
@@ -171,14 +172,35 @@ class CategoricalDistribution
 
   def eql?(other)
     self.equal?(other) || 
-      (self.class == other.class && self.probabilities == other.probabilities)
+      (self.class   == other.class &&
+       self.prob    == other.prob &&
+       self.alias   == other.alias &&
+       self.values  == other.values)
   end
 
 
-  def_delegators :@p, :empty?, :hash, :length, :size, :to_s
+  # :call_seq:
+  #   distribution.hash    -> fixnum
+  #
+  # Compute a hash-code for this probability distribution.
+  #
+  # Two distributions with the same values and probabilities will have the same
+  # hash code (and will compare using #eql?).
+
+  def hash
+    hash = 17
+    hash = 37 * hash + @prob.hash
+    hash = 37 * hash + @alias.hash
+    hash = 37 * hash + @values.hash
+    hash
+  end
+
+
+  def to_s
+    probabilities.to_s
+  end
+
 
-  ##
-  # :method: empty?
   # :call_seq:
   #   distribution.empty?    -> true or false
   #
@@ -187,17 +209,9 @@ class CategoricalDistribution
   #   distribution = CategoricalDistribution.new
   #   distribution.empty?   #=> true
 
-  ##
-  # :method: hash
-  # :call_seq:
-  #   distribution.hash    -> fixnum
-  #
-  # Compute a hash-code for this probability distribution.
-  #
-  # Two distributions with the same values and probabilities will have the same
-  # hash code (and will compare using #eql?).
-  #
-  # See also Hash#hash.
+  def empty?
+    size.zero?
+  end
 
   ##
   # :method: length
@@ -208,4 +222,10 @@ class CategoricalDistribution
   #
   #   CategoricalDistribution.new([1, 2, 3, 4]).length    #=> 4
   #   CategoricalDistribution.new.length                  #=> 0
+  
+  attr_reader :size
+  alias length size
+
+  protected
+    attr_reader :prob, :alias, :values
 end

data/lib/categorical_distribution/version.rb

@@ -1,3 +1,3 @@
 module CategoricalDistribution
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: categorical_distribution
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Zane Geiger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="