bernoulli 0.2.1 → 0.3.0

data/README.md

@@ -28,8 +28,8 @@ Or we could just `require 'bernoulli'` in any Ruby script.
 
 Then we create a new instance of class Bernoulli and calculate our desired probability and properties like so
 
-	x = Bernoulli.new(180, 1.0/6)
-	# => #<Bernoulli:0x007fba721a1bf0 @n=180, @p=0.16666666666666666>
+	x = Bernoulli::Distribution.new(180, 1.0/6)
+	# => #<Bernoulli::Distribution @n=180, @p=0.16666666666666666>
 	
 	# The probability of getting between 25 and 36 sixes is
 	x[25..36] # => 0.7665588897840108
@@ -45,8 +45,8 @@ We could also calculate the standard deviation, excess or skewness:
 	
 `bernoulli` can also do empirical tests. Let's look at a smaller example We can simulate the tossing of 4 fair coins
 
-	y = Bernoulli.new(4, 0.5)
-	# => #<Bernoulli:0x007ff894293198 @n=4, @p=0.5>
+	y = Bernoulli::Distribution.new(4, 0.5)
+	# => #<Bernoulli::Distribution @n=4, @p=0.5>
 
 The method `sample` gives as a random array of length `n`, where each entry is `1` with a probability of `p`. The methods `sample_value` gives us the number of wins in a random expriment, we could than compare it to `expected_value`.
 
@@ -81,7 +81,7 @@ Feel free to cantact me about anything I could/should add  or to contribute in a
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am 'added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 

data/lib/bernoulli/version.rb

@@ -1,4 +1,4 @@
 module Bernoulli
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end
 

data/lib/bernoulli.rb

@@ -1,79 +1,86 @@
 require 'bernoulli/math'
+require 'bernoulli/version'
 require 'csv'
 
-class Bernoulli
-
-	def initialize(n, p)
-		if n < 0 or p > 1.0 or p < 0.0 or not n.is_a? Integer
-			raise 'Could not initialize Bernoulli experiment'
-		end
-		@n = n
-		@p = p
-	end
-
-	def probability(k)
-		Math.binomial(@n, k) * @p**k * (1 - @p)**(@n - k)
-	end
-
-	def [](k)
-		if k.is_a? Integer
-			raise Math::DomainError if not (k <= @n and k >= 0)
-			probability(k).to_f
-		elsif k.is_a? Range
-			raise Math::DomainError if not (k.begin >= 0 and k.end <= @n)
-			sum = 0
-			k.each do |i|
-				sum += probability(i)
+module Bernoulli
+	class Distribution
+	
+		def initialize(n, p)
+			if n < 0 or p > 1.0 or p < 0.0 or not n.is_a? Integer
+				raise 'Could not initialize Bernoulli experiment'
 			end
-			sum.to_f
-		else
-			raise TypeError
+			@n = n
+			@p = p
 		end
-	end
-	
-	def sample
-		s = []
-		@n.times do
-			s << (rand < @p ? 1 : 0)
+		
+		def to_s
+			"#<Bernoulli::Distribution @n=#{@n}, @p=#{@p}>"
 		end
-		s
-	end
-	
-	def sample_value
-		sample.inject(:+)
-	end
-	alias :sv :sample_value
-	
-	def expected_value
-		@n * @p
-	end
-	alias :ev :expected_value
-	
-	def variance
-		@n * @p * (1 - @p)
-	end
-	alias :v :variance
-	
-	def standard_deviation
-		Math.sqrt(variance)
-	end
-	alias :sd :standard_deviation
-	
-	def skewness
-		(1 - 2 * @p) / (Math.sqrt(@n * @p * (1 - @p)))
-	end
 	
-	def excess
-		(1 - 6 * @p * (1 - @p)) / (@n * @p * (1 - @p))
-	end
+		def probability(k)
+			Math.binomial(@n, k) * @p**k * (1 - @p)**(@n - k)
+		end
 	
-	def table
-		CSV.generate do |csv|
-			(0..@n).each do |n|
-				csv << [n, probability(n)]
+		def [](k)
+			if k.is_a? Integer
+				raise Math::DomainError if not (k <= @n and k >= 0)
+				probability(k).to_f
+			elsif k.is_a? Range
+				raise Math::DomainError if not (k.begin >= 0 and k.end <= @n)
+				sum = 0
+				k.each do |i|
+					sum += probability(i)
+				end
+				sum.to_f
+			else
+				raise TypeError
 			end
 		end
+		
+		def sample
+			s = []
+			@n.times do
+				s << (rand < @p ? 1 : 0)
+			end
+			s
+		end
+		
+		def sample_value
+			sample.count(1)
+		end
+		alias :sv :sample_value
+		
+		def expected_value
+			@n * @p
+		end
+		alias :ev :expected_value
+		
+		def variance
+			@n * @p * (1 - @p)
+		end
+		alias :v :variance
+		
+		def standard_deviation
+			Math.sqrt(variance)
+		end
+		alias :sd :standard_deviation
+		
+		def skewness
+			(1 - 2 * @p) / (Math.sqrt(@n * @p * (1 - @p)))
+		end
+		
+		def excess
+			(1 - 6 * @p * (1 - @p)) / (@n * @p * (1 - @p))
+		end
+		
+		def table
+			CSV.generate do |csv|
+				(0..@n).each do |n|
+					csv << [n, probability(n)]
+				end
+			end
+		end
+	
 	end
-
 end
 

data/test/test_bernoulli.rb

@@ -2,23 +2,28 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'bernoulli'
 
-class BernoulliTest < MiniTest::Unit::TestCase
+class DistributionTest < MiniTest::Unit::TestCase
 	
 	def test_new_experiment
 		assert_raises RuntimeError do
-			Bernoulli.new(10, 1.1)
+			Bernoulli::Distribution.new(10, 1.1)
 		end
 		assert_raises RuntimeError do
-			Bernoulli.new(-10, 0.7)
+			Bernoulli::Distribution.new(-10, 0.7)
 		end
 		assert_raises RuntimeError do
-			Bernoulli.new(4.5, 0.2)
+			Bernoulli::Distribution.new(4.5, 0.2)
 		end
 	end
 	
 	def setup
-		@x = Bernoulli.new(180, 1.0/6)
-		@y = Bernoulli.new(2, 0.5)
+		@x = Bernoulli::Distribution.new(180, 1.0/6)
+		@y = Bernoulli::Distribution.new(2, 0.5)
+		@z = Bernoulli::Distribution.new(4, 0.5)
+	end
+	
+	def test_to_s
+		assert_equal "#<Bernoulli::Distribution @n=2, @p=0.5>", @y.to_s
 	end
 
 	def test_coin_toss
@@ -47,5 +52,10 @@ class BernoulliTest < MiniTest::Unit::TestCase
 		assert_in_delta 0.0066666666666667, @x.excess, 1.0e-7
 	end
 	
+	def test_table
+		str = "0,0.0625\n1,0.25\n2,0.375\n3,0.25\n4,0.0625\n"
+		assert_equal str, @z.table
+	end
+	
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bernoulli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest