easystats 0.3.1 → 0.3.2

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :rvm => %w[1.8.7 1.9.3].map { |v| v << "@easystats" } do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/easystats/version.rb

@@ -1,3 +1,3 @@
 module Easystats
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/easystats.rb

@@ -1,16 +1,16 @@
 class Array
   # take in an array of numbers and calculate the mean (average)
   def mean
-    return unless self.any?
+    return if self.empty?
 
     self.sum / self.count.to_f
-  end unless Array.method_defined? :mean
+  end unless method_defined? :mean
 
-  alias_method :average, :mean unless Array.method_defined? :average
+  alias_method :average, :mean unless method_defined? :average
 
   # take in the array of numbers and calculate the median
   def median
-    return unless self.any?
+    return if self.empty?
 
     data = self
 
@@ -30,11 +30,11 @@ class Array
     end
 
     median
-  end unless Array.method_defined? :median
+  end unless method_defined? :median
 
   # take in an array of numbers and return the mode
   def mode
-    return unless self.any?
+    return if self.empty?
 
     # Sort the array
     data = self.sort
@@ -92,34 +92,34 @@ class Array
         highest_value
       end
     end
-  end unless Array.method_defined? :mode
+  end unless method_defined? :mode
 
   # take in an array of numbers and calculate the range
   def range
-    return unless self.any?
+    return if self.empty?
 
     data = self.sort
     data.last - data.first
-  end unless Array.method_defined? :range
+  end unless method_defined? :range
 
   # take in an array of numbers and calculate the standard deviation
   def standard_deviation
-    return unless self.any?
+    return if self.empty?
     return 0 if self.one?
 
     Math::sqrt(self.sum_of_deviations_squared / (self.count-1))
-  end unless Array.method_defined? :standard_deviation
+  end unless method_defined? :standard_deviation
 
   # take in an array of numbers and calculate the sum
   def sum
     self.reduce { |total, number| total + number }
-  end unless Array.method_defined? :sum
+  end unless method_defined? :sum
 
   def variance
-    return unless self.any?
+    return if self.empty?
 
     self.sum_of_deviations_squared / self.count.to_f
-  end unless Array.method_defined? :variance
+  end unless method_defined? :variance
 
   protected
 

data/spec/lib/easystats_spec.rb

@@ -1,74 +1,130 @@
 require 'spec_helper'
 
 describe Array do
-  describe "#mean" do
-    it {        [].mean.should be_nil }
-    it {       [1].mean.should ==   1 }
-    it {     [1,2].mean.should == 1.5 }
-    it {   [1,2,3].mean.should ==   2 }
-    it { [1,2,3,4].mean.should == 2.5 }
-  end
-
-  describe "#average" do
-    it { [1,2,3,4].average.should == 2.5 }
-  end
-
-  describe "#median" do
-    it {        [].median.should be_nil }
-    it {       [1].median.should ==   1 }
-    it {     [1,2].median.should == 1.5 }
-    it {   [1,2,3].median.should ==   2 }
-    it { [1,2,3,4].median.should == 2.5 }
-    it { [1,2,2,4].median.should ==   2 }
-    it { [1,3,3,4].median.should ==   3 }
-  end
-
-  describe "#mode" do
-    it {        [].mode.should be_nil }
-    it {       [1].mode.should ==   1 }
-    it {     [1,2].mode.should be_nil }
-    it {   [1,2,3].mode.should be_nil }
-    it { [1,2,3,4].mode.should be_nil }
-    it { [1,2,2,4].mode.should ==   2 }
-    it { [1,3,3,4].mode.should ==   3 }
-  end
-
-  describe "#range" do
-    it {        [].range.should be_nil }
-    it {       [1].range.should == 0 }
-    it {     [1,2].range.should == 1 }
-    it {   [1,2,3].range.should == 2 }
-    it { [1,2,3,4].range.should == 3 }
-    it { [1,2,2,4].range.should == 3 }
-    it { [1,3,3,4].range.should == 3 }
-  end
-
-  describe "#standard_deviation" do
-    let(:delta) { 0.00000000000001 }
-
-    it {        [].standard_deviation.should be_nil }
-    it {       [1].standard_deviation.should == 0 }
-    it {     [1,2].standard_deviation.should be_within(delta).of(0.707106781186548) }
-    it {   [1,2,3].standard_deviation.should be_within(delta).of(1) }
-    it { [1,2,3,4].standard_deviation.should be_within(delta).of(1.29099444873581) }
-  end
-
-  describe "#sum" do
-    it {        [].sum.should be_nil }
-    it {       [1].sum.should ==  1 }
-    it {     [1,2].sum.should ==  3 }
-    it {   [1,2,3].sum.should ==  6 }
-    it { [1,2,3,4].sum.should == 10 }
-    it { [1,2,2,4].sum.should ==  9 }
-    it { [1,3,3,4].sum.should == 11 }
-  end
-
-  describe "#variance" do
-    it {        [].variance.should be_nil }
-    it {       [1].variance.should ==     0.0 }
-    it {     [1,2].variance.should ==    0.25 }
-    it {   [1,2,3].variance.should == 2.0/3.0 }
-    it { [1,2,3,4].variance.should ==    1.25 }
-  end
+  DELTA = 0.00000000000001
+
+  it { should respond_to :average }
+
+  build_stats_spec [], {
+    :mean => nil,
+    :median => nil,
+    :mode => nil,
+    :range => nil,
+    :standard_deviation => nil,
+    :sum => nil,
+    :variance => nil
+  }
+
+  build_stats_spec [0], {
+    :mean => 0,
+    :median => 0,
+    :mode => 0,
+    :range => 0,
+    :standard_deviation => 0,
+    :sum => 0,
+    :variance => 0.0
+  }
+
+  build_stats_spec [1], {
+    :mean => 1,
+    :median => 1,
+    :mode => 1,
+    :range => 0,
+    :standard_deviation => 0,
+    :sum => 1,
+    :variance => 0.0
+  }
+
+  build_stats_spec [1,2], {
+    :mean => 1.5,
+    :median => 1.5,
+    :mode => nil,
+    :range => 1,
+    :standard_deviation => 0.707106781186548,
+    :sum => 3,
+    :variance => 0.25
+  }
+
+  build_stats_spec [1,2,3], {
+    :mean => 2,
+    :median => 2,
+    :mode => nil,
+    :range => 2,
+    :standard_deviation => 1,
+    :sum => 6,
+    :variance => 2.0 / 3.0
+  }
+
+  build_stats_spec [1,2,3,4], {
+    :mean => 2.5,
+    :median => 2.5,
+    :mode => nil,
+    :range => 3,
+    :standard_deviation => 1.29099444873581,
+    :sum => 10,
+    :variance => 1.25
+  }
+
+
+  build_stats_spec [1,2,2,4], {
+    :mean => 2.25,
+    :median => 2,
+    :mode => 2,
+    :range => 3,
+    :standard_deviation => 1.2583057392117916,
+    :sum => 9,
+    :variance => 1.1875
+  }
+
+
+  build_stats_spec [1,3,3,4], {
+    :mean => 2.75,
+    :median => 3,
+    :mode => 3,
+    :range => 3,
+    :standard_deviation => 1.2583057392117916,
+    :sum => 11,
+    :variance => 1.1875
+  }
+
+  build_stats_spec (0..100).to_a, {
+    :mean => 50,
+    :median => 50,
+    :mode => nil,
+    :range => 100,
+    :standard_deviation => 29.300170647967224,
+    :sum => 5050,
+    :variance => 850.0
+  }
+
+  build_stats_spec (1..100).to_a, {
+    :mean => 50.5,
+    :median => 50.5,
+    :mode => nil,
+    :range => 99,
+    :standard_deviation => 29.011491975882016,
+    :sum => 5050,
+    :variance => 833.25
+  }
+
+  build_stats_spec [-1,0,1], {
+    :mean => 0,
+    :median => 0,
+    :mode => nil,
+    :range => 2,
+    :standard_deviation => 1,
+    :sum => 0,
+    :variance => 0.6666666666666666
+  }
+
+  build_stats_spec [1,2.5], {
+    :mean => 1.75,
+    :median => 1.75,
+    :mode => nil,
+    :range => 1.5,
+    :standard_deviation => 1.0606601717798212,
+    :sum => 3.5,
+    :variance =>0.5625
+  }
 end
 

data/spec/spec_helper.rb

@@ -1,5 +1,27 @@
-require 'simplecov'
-SimpleCov.start
+puts RUBY_DESCRIPTION
+
+if RUBY_VERSION.to_f >= 1.9
+  require 'simplecov'
+  SimpleCov.start
+end
 
 require 'easystats'
 
+def build_stats_spec(array, expectations)
+  expectations.each do |method, expectation|
+    describe "##{method}" do
+      context "when #{array}" do
+        if expectation && method == :standard_deviation
+          it "should be within #{DELTA} of #{expectation.inspect}" do
+            array.send(method).should be_within(DELTA).of(expectation)
+          end
+        else
+          it "should be #{expectation.inspect}" do
+            array.send(method).should == expectation
+          end
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easystats
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70327162346300 !ruby/object:Gem::Requirement
+  requirement: &70193074432080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327162346300
+  version_requirements: *70193074432080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70327162345840 !ruby/object:Gem::Requirement
+  requirement: &70193074431400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327162345840
+  version_requirements: *70193074431400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327162345260 !ruby/object:Gem::Requirement
+  requirement: &70193074430520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327162345260
+  version_requirements: *70193074430520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70327162344620 !ruby/object:Gem::Requirement
+  requirement: &70193074429080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327162344620
+  version_requirements: *70193074429080
 description: This gem contains statistics functions that are very easy to use.  Much
   easier and much more complete than many of the other statistical gems available
   out there.  If you need a feature added, send me a message on Github!