descriptive_statistics 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1879dad6f99acc6168dc63b2574ca72b3225d05
-  data.tar.gz: 1cc44d9e5259ba71a343556886a0ebc814800475
+  metadata.gz: e28f48a7fc39460fc375049b65f79956f52cec0b
+  data.tar.gz: 71570533e928cc63aaab9afbf7b16d02930b13d0
 SHA512:
-  metadata.gz: af8be7209ff639f578b7ddd01eebcd4149dfe75d94607d99964aafa353823a141737c34852213e46fba62877e36ab22905f768d7b3b2b9d27214c6724e252a58
-  data.tar.gz: 5180ca2d716200159d3843faf882a12ef167020d65dcca31efdf010368318c323538f564ea81d6337e13bcb19069a529c250ec8e637443ed3c0fa8b8d5679b0e
+  metadata.gz: 4c95bbdcfc03c5a90a70a0b165a38cc12f42601c6a4b4202ade3adf5793e87359a7f1acc975c7c89d4bbec9076b860cff29fa1f7d10eac2ca930c23eb4895205
+  data.tar.gz: 0c4f66b5cb53468b89f0d6d88c7214ce4f295adf0f4dd3d9cc96f0ccc583df684a1f1b84b476992c3dd6a88bcf0b4ff580f738bbbdd286ff9bc1e68bf5c81bce

data/lib/descriptive_statistics/class_methods.rb

@@ -17,19 +17,20 @@ module DescriptiveStatistics
       end
       define_method("#{m}_empty_collection_default_value=") do |value|
         default_values[m] = value
-      end      
-    end
-
-    DescriptiveStatistics.instance_methods.each do |m|
-      define_method(m, DescriptiveStatistics.instance_method(m))
+      end
     end
 
     private
 
     def default_values
-      @default_values ||= {} 
+      @default_values ||= {}
     end
 
   end
 
+  DescriptiveStatistics.instance_methods.each do |method|
+    module_function method
+    public method
+  end
+
 end

data/lib/descriptive_statistics/descriptive_statistics.rb

@@ -1,17 +1,17 @@
 module DescriptiveStatistics
-  def descriptive_statistics
-    return { :number => self.number,
-             :sum => self.sum,
-             :variance => self.variance,
-             :standard_deviation => self.standard_deviation,
-             :min => self.min,
-             :max => self.max,
-             :mean => self.mean,
-             :mode => self.mode,
-             :median => self.median,
-             :range => self.range,
-             :q1 => self.percentile(25),
-             :q2 => self.percentile(50),
-             :q3 => self.percentile(75) }
+  def descriptive_statistics(&block)
+    return { :number => self.number(&block),
+             :sum => self.sum(&block),
+             :variance => self.variance(&block),
+             :standard_deviation => self.standard_deviation(&block),
+             :min => self.min(&block),
+             :max => self.max(&block),
+             :mean => self.mean(&block),
+             :mode => self.mode(&block),
+             :median => self.median(&block),
+             :range => self.range(&block),
+             :q1 => self.percentile(25, &block),
+             :q2 => self.percentile(50, &block),
+             :q3 => self.percentile(75, &block) }
   end
 end

data/lib/descriptive_statistics/mean.rb

@@ -1,8 +1,8 @@
 module DescriptiveStatistics
-  def mean(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.mean_empty_collection_default_value unless values.size > 0
+  def mean(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.mean_empty_collection_default_value if values.empty?
 
     values.sum / values.number
-  end 
+  end
 end

data/lib/descriptive_statistics/median.rb

@@ -1,8 +1,8 @@
 module DescriptiveStatistics
-  def median(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.median_empty_collection_default_value unless values.size > 0
+  def median(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.median_empty_collection_default_value if values.empty?
 
     values.percentile(50)
-  end 
+  end
 end

data/lib/descriptive_statistics/mode.rb

@@ -1,12 +1,12 @@
 module DescriptiveStatistics
-  def mode(collection = self)
-    values = Support::extract(collection)
-    return unless values.size > 0
+  def mode(collection = self, &block)
+    values = Support::extract(collection, &block)
+    return if values.to_a.empty?
 
     values
       .group_by { |e| e }
       .values
       .max_by(&:size)
       .first
-  end 
+  end
 end

data/lib/descriptive_statistics/number.rb

@@ -1,7 +1,7 @@
 module DescriptiveStatistics
-  def number(collection = self)
-    values = Support::extract(collection)
+  def number(collection = self, &block)
+    values = Support::extract(collection, &block)
 
-    values.size.to_f
+    values.to_a.size.to_f
   end
 end

data/lib/descriptive_statistics/percentile.rb

@@ -1,17 +1,14 @@
 module DescriptiveStatistics
-  def percentile(p, collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.percentile_empty_collection_default_value unless values.size > 0
+  def percentile(p, collection = self, &block)
+    values = Support::convert(collection, &block)
 
-    return values.first unless values.size > 1
+    return DescriptiveStatistics.percentile_empty_collection_default_value if values.empty?
+    return values.first if values.size == 1
 
-    sorted = values.sort
-    return sorted[-1] if p == 100        
-    rank = p / 100.0 * (values.number - 1) 
-    lrank = rank.floor
-    d = rank - lrank
-    lower = sorted[lrank]
-    upper = sorted[lrank+1]
-    lower + (upper - lower) * d
+    values.sort!
+    return values.last if p == 100
+    rank = p / 100.0 * (values.size - 1)
+    lower, upper = values[rank.floor,2]
+    lower + (upper - lower) * (rank - rank.floor)
   end
 end

data/lib/descriptive_statistics/percentile_rank.rb

@@ -1,9 +1,9 @@
 module DescriptiveStatistics
   # percent of cases that are at or below a score
-  def percentile_rank(p, collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.percentile_rank_empty_collection_default_value unless values.size > 0
+  def percentile_rank(p, collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.percentile_rank_empty_collection_default_value if values.empty?
 
-    return (((values.sort.rindex{ |x| x <= p } || -1.0) + 1.0)) / values.number * 100.0
+    return (((values.sort.rindex { |x| x <= p } || -1.0) + 1.0)) / values.number * 100.0
   end
 end

data/lib/descriptive_statistics/range.rb

@@ -1,8 +1,8 @@
 module DescriptiveStatistics
-  def range(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.range_empty_collection_default_value unless values.size > 0
+  def range(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.range_empty_collection_default_value if values.empty?
 
     values.max - values.min
-  end 
+  end
 end

data/lib/descriptive_statistics/standard_deviation.rb

@@ -1,7 +1,7 @@
 module DescriptiveStatistics
-  def standard_deviation(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.standard_deviation_empty_collection_default_value unless values.size > 0
+  def standard_deviation(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.standard_deviation_empty_collection_default_value if values.empty?
 
     Math.sqrt(values.variance)
   end

data/lib/descriptive_statistics/sum.rb

@@ -1,8 +1,8 @@
 module DescriptiveStatistics
-  def sum(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.sum_empty_collection_default_value unless values.size > 0
+  def sum(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.sum_empty_collection_default_value if values.empty?
 
-    return values.inject(:+)
-  end 
+    return values.reduce(:+)
+  end
 end

data/lib/descriptive_statistics/support/convert.rb

@@ -4,24 +4,29 @@ module DescriptiveStatistics
 
   module Support
 
-    def self.convert(from_enumerable)
-      extend to_float to_array from_enumerable
+    def self.convert(from_enumerable, &block)
+      extend to_float to_value(to_array(from_enumerable), &block)
     end
 
-    def self.extract(from_enumerable)
-      extend to_array from_enumerable
+    def self.extract(from_enumerable, &block)
+      extend to_value(to_array(from_enumerable), &block)
     end
 
     private
 
     def self.extend(enumerable)
-      enumerable.extend(DescriptiveStatistics) 
+      enumerable.extend(DescriptiveStatistics)
     end
 
     def self.to_float(enumerable)
       enumerable.map(&:to_f)
     end
 
+    def self.to_value(enumerable, &block)
+      return enumerable unless block_given?
+      enumerable.map { |object| yield object }
+    end
+
     def self.to_array(enumerable)
       case enumerable
       when Hash

data/lib/descriptive_statistics/variance.rb

@@ -1,9 +1,9 @@
 module DescriptiveStatistics
-  def variance(collection = self)
-    values = Support::convert(collection)
-    return DescriptiveStatistics.variance_empty_collection_default_value unless values.size > 0
+  def variance(collection = self, &block)
+    values = Support::convert(collection, &block)
+    return DescriptiveStatistics.variance_empty_collection_default_value if values.empty?
 
     mean = values.mean
-    values.map{ |sample| (mean - sample) ** 2 }.inject(:+) / values.number
+    values.map { |sample| (mean - sample) ** 2 }.reduce(:+) / values.number
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: descriptive_statistics
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Derrick Parkhurst
@@ -9,10 +9,11 @@ authors:
 - Daniel Farrell
 - Graham Malmgren
 - Guy Shechter
+- Charlie Egan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Adds descriptive statistics methods to Enumerable module for use on collections
   or Numeric data
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Descriptive Statistics