easystats 0.3.2 → 0.4.0.rc1

data/.rvmrc

@@ -1,2 +1 @@
-rvm 1.9.3@easystats --install --create
-rvm_project_rvmrc_default=1
+rvm 1.9.3

data/.travis.yml

@@ -2,7 +2,14 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
-  - jruby
-  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
   - ree
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head

data/Guardfile

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

data/README.md

@@ -1,4 +1,4 @@
-# Easystats [![Build Status](https://secure.travis-ci.org/mgrigajtis/easystats.png)](https://secure.travis-ci.org/mgrigajtis/easystats) 
+# Easystats [![Build Status](https://secure.travis-ci.org/mgrigajtis/easystats.png)](https://secure.travis-ci.org/mgrigajtis/easystats) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mgrigajtis/easystats) 
 
 > Created by [Matthew Grigajtis](http://www.matthewgrigajtis.com)
 

data/easystats.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov" 
+  s.add_development_dependency "simplecov" if RUBY_DESCRIPTION.start_with? "ruby 1.9"
 end

data/lib/easystats/version.rb

@@ -1,3 +1,3 @@
 module Easystats
-  VERSION = "0.3.2"
+  VERSION = "0.4.0.rc1"
 end

data/lib/easystats.rb

@@ -1,144 +1,77 @@
 class Array
-  # take in an array of numbers and calculate the mean (average)
   def mean
-    return if self.empty?
+    return if empty?
 
-    self.sum / self.count.to_f
+    sum / count.to_f
   end unless method_defined? :mean
 
   alias_method :average, :mean unless method_defined? :average
 
-  # take in the array of numbers and calculate the median
   def median
-    return if self.empty?
+    return if empty?
 
-    data = self
+    data = sort
 
     halfway = data.count / 2
 
-    # Sort the array
-    data = data.sort
-
-    # The median will be different based on the number of numbers in the array
-    # If there is an even number in the array
-    if(data.count % 2) == 0
-      median = (data[halfway] + data[halfway-1]) / 2.0
-
-    # Else, there is an odd number of elements in the array
+    if data.count.even?
+      (data[halfway] + data[halfway - 1]) / 2.0
     else
-      median = data[halfway]
+      data[halfway]
     end
-
-    median
   end unless method_defined? :median
 
-  # take in an array of numbers and return the mode
   def mode
-    return if self.empty?
-
-    # Sort the array
-    data = self.sort
+    return if empty?
+    return first if one?
+    return if self == uniq
 
-    # create a flag to tell the user if all the numbers only appear once
-    no_mode = true
+    frequencies = inject(Hash.new(0)) { |k,v| k[v] += 1; k }
+    frequencies = frequencies.sort_by { |k,v| v }
 
-    # The variable that will hold the highest number
-    highest_value = 0
+    return if frequencies[-1][1] == frequencies[-2][1]
 
-    # The variable that holds the most time the value appears
-    most_times = 0
-
-    # Create a new hash to hold the numbers
-    tmp = Hash.new
+    frequencies.last[0]
+  end unless method_defined? :mode
 
-    # Populate the hash
-    data.each do |num|
-      if tmp["#{num}"].nil? == false
-        tmp["#{num}"] = tmp["#{num}"].to_i + 1
-      else
-        tmp["#{num}"] = 1
-      end
-    end
+  def probability_distribution
+    return if empty?
 
-    # Check to make sure that there is a mode
-    data.each do |num|
-      if tmp["#{num}"].to_i > 0
-        no_mode = false
-      end
-    end
+    total = count.to_f
 
-    if no_mode == true
-      nil
-    else
-      data.each do |num|
-        if tmp["#{num}"].to_i > most_times
-          highest_value = num
-          most_times = tmp["#{num}"]
-        end
-      end
-
-      # now loop through again just to make sure another number doesn't appear an equal number of times
-      data.each do |num|
-        if num != highest_value
-          if tmp["#{num}"].to_i == most_times
-            no_mode = true
-          end
-        end
-      end
-
-      if no_mode == true
-        nil
-      else
-        highest_value
-      end
-    end
-  end unless method_defined? :mode
+    inject({}) { |result, item|
+      result.update({ item => count(item) / total })
+    }
+  end unless method_defined? :probability_distribution
 
-  # take in an array of numbers and calculate the range
   def range
-    return if self.empty?
+    return if empty?
 
-    data = self.sort
-    data.last - data.first
+    max - min
   end unless method_defined? :range
 
-  # take in an array of numbers and calculate the standard deviation
   def standard_deviation
-    return if self.empty?
-    return 0 if self.one?
+    return if empty?
+    return 0 if one?
 
-    Math::sqrt(self.sum_of_deviations_squared / (self.count-1))
+    Math::sqrt sum_of_deviations_squared / (count - 1)
   end unless method_defined? :standard_deviation
 
-  # take in an array of numbers and calculate the sum
   def sum
-    self.reduce { |total, number| total + number }
+    reduce :+
   end unless method_defined? :sum
 
   def variance
-    return if self.empty?
+    return if empty?
 
-    self.sum_of_deviations_squared / self.count.to_f
+    sum_of_deviations_squared / count.to_f
   end unless method_defined? :variance
 
   protected
 
-  # this function returns the sum of each squared difference of mean
   def sum_of_deviations_squared
-    data = self
-
-    deviations = Array.new
-    average = self.mean
-    sum_of_deviations_squared = 0
-
-    data.each do |num|
-      deviations.push((num-average)**2)
-    end
-
-    deviations.each do |num|
-      sum_of_deviations_squared += num
-    end
+    mean = self.mean
 
-    sum_of_deviations_squared
+    inject(0) { |total, number| total + ((number - mean) ** 2) }
   end
 end

data/spec/lib/easystats_spec.rb

@@ -12,7 +12,15 @@ describe Array do
     :range => nil,
     :standard_deviation => nil,
     :sum => nil,
-    :variance => nil
+    :variance => nil,
+    :probability_distribution => nil
+  }
+
+  build_stats_spec [1,1,1,2,2], {
+    :probability_distribution => {
+      1 => 0.6,
+      2 => 0.4
+    }
   }
 
   build_stats_spec [0], {
@@ -22,7 +30,8 @@ describe Array do
     :range => 0,
     :standard_deviation => 0,
     :sum => 0,
-    :variance => 0.0
+    :variance => 0.0,
+    :probability_distribution => {0 => 1.0}
   }
 
   build_stats_spec [1], {
@@ -32,7 +41,8 @@ describe Array do
     :range => 0,
     :standard_deviation => 0,
     :sum => 1,
-    :variance => 0.0
+    :variance => 0.0,
+    :probability_distribution => {1 => 1.0}
   }
 
   build_stats_spec [1,2], {
@@ -42,7 +52,8 @@ describe Array do
     :range => 1,
     :standard_deviation => 0.707106781186548,
     :sum => 3,
-    :variance => 0.25
+    :variance => 0.25,
+    :probability_distribution => {1 => 0.5, 2 => 0.5}
   }
 
   build_stats_spec [1,2,3], {
@@ -52,7 +63,8 @@ describe Array do
     :range => 2,
     :standard_deviation => 1,
     :sum => 6,
-    :variance => 2.0 / 3.0
+    :variance => 2.0 / 3.0,
+    :probability_distribution => {1 => 0.3333333333333333, 2 => 0.3333333333333333, 3 => 0.3333333333333333} 
   }
 
   build_stats_spec [1,2,3,4], {
@@ -62,9 +74,21 @@ describe Array do
     :range => 3,
     :standard_deviation => 1.29099444873581,
     :sum => 10,
-    :variance => 1.25
+    :variance => 1.25,
+    :probability_distribution => {1 => 0.25, 2=>0.25, 3=> 0.25, 4=>0.25}
+
   }
 
+  build_stats_spec [1,1,2,2], {
+    :mean => 1.5,
+    :median => 1.5,
+    :mode => nil,
+    :range => 1,
+    :standard_deviation => 0.5773502691896257,
+    :sum => 6,
+    :variance => 0.25,
+    :probability_distribution => {1=>0.5, 2=>0.5}
+  }
 
   build_stats_spec [1,2,2,4], {
     :mean => 2.25,
@@ -73,10 +97,10 @@ describe Array do
     :range => 3,
     :standard_deviation => 1.2583057392117916,
     :sum => 9,
-    :variance => 1.1875
+    :variance => 1.1875,
+    :probability_distribution => { 1 => 0.25, 2 => 0.5, 4 => 0.25 }
   }
 
-
   build_stats_spec [1,3,3,4], {
     :mean => 2.75,
     :median => 3,
@@ -84,7 +108,8 @@ describe Array do
     :range => 3,
     :standard_deviation => 1.2583057392117916,
     :sum => 11,
-    :variance => 1.1875
+    :variance => 1.1875,
+    :probability_distribution => { 1 => 0.25, 3 => 0.5, 4=>0.25 }
   }
 
   build_stats_spec (0..100).to_a, {
@@ -114,7 +139,8 @@ describe Array do
     :range => 2,
     :standard_deviation => 1,
     :sum => 0,
-    :variance => 0.6666666666666666
+    :variance => 0.6666666666666666,
+    :probability_distribution => { -1 => 0.3333333333333333, 0 => 0.3333333333333333, 1 => 0.3333333333333333 }
   }
 
   build_stats_spec [1,2.5], {
@@ -124,7 +150,8 @@ describe Array do
     :range => 1.5,
     :standard_deviation => 1.0606601717798212,
     :sum => 3.5,
-    :variance =>0.5625
+    :variance =>0.5625,
+    :probability_distribution => { 1 => 0.5, 2.5=>0.5 }
   }
 end
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 puts RUBY_DESCRIPTION
 
-if RUBY_VERSION.to_f >= 1.9
+if RUBY_DESCRIPTION.start_with? "ruby 1.9"
   require 'simplecov'
   SimpleCov.start
 end
@@ -10,11 +10,17 @@ require 'easystats'
 def build_stats_spec(array, expectations)
   expectations.each do |method, expectation|
     describe "##{method}" do
-      context "when #{array}" do
+      context "when #{array.inspect}" 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
+        elsif expectation && method == :probability_distribution
+          it "should return hash #{expectation.inspect}" do
+            array.send(method).each do |key,value|
+              value.should be_within(DELTA).of(expectation[key])
+            end
+          end
         else
           it "should be #{expectation.inspect}" do
             array.send(method).should == expectation

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: easystats
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Matthew Grigajtis
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70193074432080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193074432080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193074431400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193074431400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70193074430520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193074430520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70193074429080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193074429080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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!
@@ -94,15 +114,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: easystats
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy to use statistics functions
 test_files:
 - spec/lib/easystats_spec.rb
 - spec/spec_helper.rb
+has_rdoc: