means 0.1.3 → 0.1.4

data/Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "yard", "~> 0.6.0"
+  gem "rspec", "~> 2.7.0"
+  gem "yard", "~> 0.7.4"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -9,15 +9,15 @@ GEM
       rake
     rake (0.9.2.2)
     rcov (0.9.11)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    yard (0.6.8)
+    rspec-mocks (2.7.0)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
@@ -26,5 +26,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   rcov
-  rspec (~> 2.3.0)
-  yard (~> 0.6.0)
+  rspec (~> 2.7.0)
+  yard (~> 0.7.4)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/means.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "means"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2011-12-11"
+  s.date = "2012-01-02"
   s.description = "Calculates the different means for a data set (arithmetic, geometric and harmonic)."
   s.email = "nigel-lowry@ultra.eclipse.co.uk"
   s.extra_rdoc_files = [
@@ -40,21 +40,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+    s.add_dependency(%q<yard>, ["~> 0.7.4"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/spec/Mean_spec.rb

@@ -1,110 +1,95 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Mean" do
-
-  describe "#arithmetic" do
-    it "should be nil for an empty array" do
-      Mean.arithmetic([]).should be_nil
+shared_examples_for "all means" do
+  [:arithmetic, :geometric, :harmonic].each do |mean|
+    it "is nil for an empty array" do
+      Mean.send(mean, []).should be_nil
     end
 
-    it "should be the singleton element of a singleton array" do
+    it "is the singleton element of a singleton array" do
       element = 5.5
-      Mean.arithmetic([element]).should == element
+      Mean.send(mean, [element]).should == element
     end
 
-    it "should be the common value in an array when all values are equal" do
+    it "is the common value in an array when all values are equal" do
       element = 5.5
-      Mean.arithmetic([element, element]).should == element
+      Mean.send(mean, [element, element]).should == element
+    end
+  end
+end
+
+shared_examples_for "non-arithmetic means" do
+  [:geometric, :harmonic].each do |mean|
+    it "is zero when there are any zeroes" do
+      data = [1.1, 2.2, 0.0]
+      Mean.send(mean, data).should == 0
     end
+  end
+end
+
+describe "Mean" do
+
+  describe ".arithmetic" do
+    it_behaves_like "all means"
 
-    it "should be 1.5 for [1, 2]" do 
+    it "is 1.5 for [1, 2]" do 
       data = [1.0, 2.0]
       Mean.arithmetic(data).should be_within(0.01).of(1.5)
     end
 
-    it "should work with integers" do
+    it "works with integers" do
       data = [1, 2]
       Mean.arithmetic(data).should be_within(0.01).of(1.5) 
     end
 
-    it "should work with an int then a float" do
+    it "works with an int then a float" do
       data = [1, 2.0]
       Mean.arithmetic(data).should be_within(0.01).of(1.5) 
     end
 
-    it "should work with a float then an int" do
+    it "works with a float then an int" do
       data = [1.0, 2]
       Mean.arithmetic(data).should be_within(0.01).of(1.5) 
     end
 
-    it "should work with three numbers" do
+    it "works with three numbers" do
       data = [1, 2, 3]
       Mean.arithmetic(data).should == 2
     end
   end
 
-  describe "#geometric" do
-    it "should be nil for an empty array" do
-      Mean.geometric([]).should be_nil
-    end
-
-    it "should be the singleton element of a singleton array" do
-      element = 5.5
-      Mean.geometric([element]).should == element
-    end
-
-    it "should be the common value in a when all values are equal" do
-      element = 5.5
-      Mean.geometric([element, element]).should == element
-    end
+  describe ".geometric" do
+    it_behaves_like "all means"
 
-    it "should be zero when there is even a single zero" do
-      data = [1.1, 2.2, 0.0]
-      Mean.geometric(data).should == 0
-    end
+    it_behaves_like "non-arithmetic means"
 
-    it "should be the square root of the product of two numbers" do
+    it "is the square root of the product of two numbers" do
       d1, d2 = 2, 8
       data = [d1, d2]
-      Mean.geometric(data).should == 4
+      Mean.geometric(data).should == Math.sqrt(d1 * d2)
     end
 
-    it "should be the cube root of the product of three numbers" do
+    it "is the cube root of the product of three numbers" do
       d1, d2, d3 = 4, 1, 1.0 / 32.0
       data = [d1, d2, d3]
-      Mean.geometric(data).should == 1.0 / 2.0
+      Mean.geometric(data).should == Math.cbrt(d1 * d2 * d3)
     end
   end
 
-  describe "#harmonic" do
-    it "should be nil for an empty array" do
-      Mean.harmonic([]).should be_nil
-    end
-
-    it "should be the singleton element of a singleton array" do
-        element = 5.5
-        Mean.harmonic([element]).should == element
-    end
+  describe ".harmonic" do
+    it_behaves_like "all means"
 
-    it "should be the common value in a when all values are equal" do
-      element = 5.5
-      Mean.harmonic([element, element]).should == element
-    end
+    it_behaves_like "non-arithmetic means"
 
-    it "should be be according to the formula with two elements" do
+    it "is according to the formula with two elements" do
       d1, d2 = 1.0, 2.0
       data = [d1, d2]
       Mean.harmonic(data).should be_within(0.01).of((2.0 * d1 * d2) / (d1 + d2))
     end
 
-    it "should be 12/7 for [1, 2, 4]" do
+    it "is 12/7 for [1, 2, 4]" do
       data = [1.0, 2.0, 4.0]
-      Mean.harmonic(data).should be_within(0.01).of(1.7142)
-    end
-
-    it "should be zero if there is even one zero" do 
-      data = [1.0, 2.0, 0.0]
-      Mean.harmonic(data).should == 0
+      Mean.harmonic(data).should be_within(0.01).of(12/7)
     end
   end
 
@@ -113,49 +98,55 @@ describe "Mean" do
       @m = Mean.new()
     end
 
-    it "should accumulate the arithmetic mean" do
-      @m.arithmetic_mean.should be_nil
-      @m.push 1
-      @m.arithmetic_mean.should == 1
-      @m.push 2
-      @m.arithmetic_mean.should == 1.5
-      @m.push 3
-      @m.arithmetic_mean.should == 2
-    end
-
-    it "should accumulate the geometric mean" do
-      @m.geometric_mean.should be_nil
-      @m.push 2
-      @m.geometric_mean.should == 2
-      @m.push 8
-      @m.geometric_mean.should == 4
-    end
-
-    it "should accumulate the harmonic mean" do
-      @m.harmonic_mean.should be_nil
-      @m.push 1
-      @m.harmonic_mean.should == 1
-      @m.push 2
-      @m.harmonic_mean.should == 4.0 / 3.0
+    describe "#arithmetic_mean" do
+      it "accumulates the arithmetic mean" do
+        @m.arithmetic_mean.should be_nil
+        @m.push 1
+        @m.arithmetic_mean.should == 1
+        @m.push 2
+        @m.arithmetic_mean.should == 1.5
+        @m.push 3
+        @m.arithmetic_mean.should == 2
+      end
+    end
+
+    describe "#geometric_mean" do
+      it "accumulates the geometric mean" do
+        @m.geometric_mean.should be_nil
+        @m.push 2
+        @m.geometric_mean.should == 2
+        @m.push 8
+        @m.geometric_mean.should == 4
+      end
+    end
+
+    describe "#harmonic_mean" do
+      it "accumulates the harmonic mean" do
+        @m.harmonic_mean.should be_nil
+        @m.push 1
+        @m.harmonic_mean.should == 1
+        @m.push 2
+        @m.harmonic_mean.should == 4.0 / 3.0
+      end
     end
   end
 
   describe "initialising accumulator" do
-    it "should resurrect the arithmetic mean using the count and sum" do
+    it "resurrects the arithmetic mean using the count and sum" do
       m = Mean.new(count: 1, sum: 1)
       m.arithmetic_mean.should == 1
       m.push 2
       m.arithmetic_mean.should == 1.5
     end
 
-    it "should resurrect the geometric mean using the count and product" do
+    it "resurrects the geometric mean using the count and product" do
       m = Mean.new(count: 1, product: 2)
       m.geometric_mean.should == 2
       m.push 8
       m.geometric_mean.should == 4
     end
 
-    it "should resurrect the harmonic mean using the count and sum of the reciprocals" do
+    it "resurrects the harmonic mean using the count and sum of the reciprocals" do
       m = Mean.new(count: 1, sum_of_reciprocals: 1)
       m.harmonic_mean.should == 1
       m.push 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: means
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168930981980 !ruby/object:Gem::Requirement
+  requirement: &70121412973800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70168930981980
+  version_requirements: *70121412973800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70168930981500 !ruby/object:Gem::Requirement
+  requirement: &70121412973300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *70168930981500
+  version_requirements: *70121412973300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70168930981020 !ruby/object:Gem::Requirement
+  requirement: &70121412972800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70168930981020
+  version_requirements: *70121412972800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70168930980540 !ruby/object:Gem::Requirement
+  requirement: &70121412972300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70168930980540
+  version_requirements: *70121412972300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70168930980060 !ruby/object:Gem::Requirement
+  requirement: &70121412971800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168930980060
+  version_requirements: *70121412971800
 description: Calculates the different means for a data set (arithmetic, geometric
   and harmonic).
 email: nigel-lowry@ultra.eclipse.co.uk
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 824942231782093681
+      hash: 4236443169670694727
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: