histogram 0.2.2.0 → 0.2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a58993942b0878e8dbe58afc139a880d094a33
-  data.tar.gz: 0ff8419d39eae42dddb713cecc00c8b4e76f73a1
+  metadata.gz: 87b16b66fb1ed20c22d818250d368d39fc3445fc
+  data.tar.gz: f6bf7bd712834fc3028a6e8c2ade8a20274ce004
 SHA512:
-  metadata.gz: c4d286bb8e206c0121149ede1f464c5ad8807cbcd2076a3c73b1b2e5add968c55c9dd087168afedd45f0718584897c99e39c3b98d80196b3414a8ed9b5d51313
-  data.tar.gz: a224cd19415ebb82a5222601fb0a44fb85edd7f1c0568bdddca13a0aa93417ee312628384ee7da110cfe1ef3bd50bd004e03a034d0e49994496d52e3761399ae
+  metadata.gz: d19f5747ea74d6a9b70d9b9c22a0d0321f2be8b82679fbd1cbd4226bc9fae828775ded31c7c033bd3153c3528d5b238c1a8ff37bd6e77dcf2759137700fb690a
+  data.tar.gz: 6dadf8f32857060dc8b70bf30493f21b9a63e8caaf99f612a4db42877bc6a00350775cd24d6e9c38b24042cb7b1c6c9bc6be6aeac43d3f040dabd0e13e751d5a

data/README.md

@@ -65,7 +65,7 @@ Big thanks to those who have made contributions!
 
 * deal with zero std ([Greg Dean](https://github.com/gsdean))
 * support for 1.8.7 and jruby ([Kiera Radman](https://github.com/kierarad))
-* reorder nan checks (fix zero stdev arrays) [arjun810](https://github.com/arjun810)
+* reorder nan checks to fix zero stdev arrays ([arjun810](https://github.com/arjun810))
 
 ## See Also
 

data/lib/histogram.rb

@@ -40,21 +40,27 @@ module Histogram
       end
       std_dev = _sum_sq - ((_sum * _sum)/_len)
       std_dev /= ( _len > 1 ? _len-1 : 1 )
-      [_sum.to_f/_len, Math.sqrt(std_dev)]
+      sqrt_of_std_dev =
+        begin
+          Math.sqrt(std_dev)
+        rescue Math::DomainError
+          0.0
+        end
+      [_sum.to_f/_len, sqrt_of_std_dev]
     end
 
-    # opts: 
+    # opts:
     #
     #     defaults:
     #     :method => :moore_mccabe, :tukey
     #     :sorted => false
-    #   
+    #
     def iqrange(obj, opts={})
       opt = {:method => DEFAULT_QUARTILE_METHOD, :sorted => false}.merge( opts )
       srted = opt[:sorted] ? obj : obj.sort
       sz = srted.size
       return 0 if sz == 1
-      answer = 
+      answer =
         case opt[:method]
         when :tukey
           hi_idx = sz / 2
@@ -90,25 +96,30 @@ module Histogram
     if methd == :middle
       [:scott, :sturges, :fd].map {|v| number_of_bins(v) }.sort[1]
     else
-      nbins = 
+      nbins =
         case methd
         when :scott
           range = (self.max - self.min).to_f
-          (mean, stddev) = Histogram.sample_stats(self) 
-          range / ( 3.5*stddev*(self.size**(-1.0/3)) )
+          (mean, stddev) = Histogram.sample_stats(self)
+          if stddev == 0.0
+            1
+          else
+            range / ( 3.5*stddev*(self.size**(-1.0/3)) )
+          end
         when :sturges
           1 + Math::log2(self.size)
         when :fd
           2 * Histogram.iqrange(self, :method => quartile_method) * (self.size**(-1.0/3))
         end
-      nbins = 1 if nbins.nan?
-      nbins = 1 if nbins <= 0
+      if nbins > self.size || nbins.to_f.nan? || nbins <= 0
+        nbins = 1
+      end
       nbins.ceil.to_i
     end
   end
 
   # Returns [bins, freqs]
-  # 
+  #
   # histogram(bins, opts)
   # histogram(opts)
   #
@@ -127,23 +138,23 @@ module Histogram
   #     :bin_width => <float> width of a bin (overrides :bins)
   #     :min => <float> # explicitly set the min
   #     :max => <float> # explicitly set the max val
-  #     
+  #
   #     :other_sets => an array of other sets to histogram
   #
-  # Examples 
+  # Examples
   #
   #    require 'histogram/array'
   #    ar = [-2,1,2,3,3,3,4,5,6,6]
   #    # these return: [bins, freqencies]
   #    ar.histogram(20)                  # use 20 bins
   #    ar.histogram([-3,-1,4,5,6], :bin_boundary => :avg) # custom bins
-  #    
+  #
   #    # returns [bins, freq1, freq2 ...]
   #    (bins, *freqs) = ar.histogram(30, :bin_boundary => :avg, :other_sets => [3,3,4,4,5], [-1,0,0,3,3,6])
   #    (ar_freqs, other1, other2) = freqs
   #
   #    # histogramming with weights
-  #    w_weights.histogram(20, :weights => [3,3,8,8,9,9,3,3,3,3]) 
+  #    w_weights.histogram(20, :weights => [3,3,8,8,9,9,3,3,3,3])
   #
   #    # with NArray
   #    require 'histogram/narray'
@@ -165,7 +176,7 @@ module Histogram
   #   to share the exact same bins. In this case returns [bins, freqs(caller),
   #   freqs1, freqs2 ...]
   # * Can also deal with weights.  :weights should provide parallel arrays to
-  #   the caller and any :other_sets provided.   
+  #   the caller and any :other_sets provided.
   def histogram(*args)
     make_freqs_proc = lambda do |obj, len|
       if obj.is_a?(Array)
@@ -202,13 +213,13 @@ module Histogram
     other_sets = opts[:other_sets]
 
     bins_array_like = bins.kind_of?(Array) || bins.kind_of?(NArray) || opts[:bin_width]
-    all = [self] + other_sets 
+    all = [self] + other_sets
 
     if bins.is_a?(Symbol)
       bins = number_of_bins(bins)
     end
 
-    weights = 
+    weights =
       if opts[:weights]
         have_frac_freqs = true
         opts[:weights][0].is_a?(Numeric) ? [ opts[:weights] ] : opts[:weights]
@@ -217,8 +228,8 @@ module Histogram
       end
 
     # we need to know the limits of the bins if we need to define our own bins
-    if opts[:bin_width] || !bins_array_like 
-      calc_min, calc_max = 
+    if opts[:bin_width] || !bins_array_like
+      calc_min, calc_max =
         unless opts[:min] && opts[:max]
           (mins, maxs) = all.map {|ar| Histogram.minmax(ar) }.transpose
           [mins.min, maxs.max]
@@ -238,9 +249,9 @@ module Histogram
       ########################################################
       # ARRAY BINS:
       ########################################################
-      _bins = 
+      _bins =
         if bins.is_a?(Array)
-          bins.map {|v| v.to_f } 
+          bins.map {|v| v.to_f }
         elsif bins.is_a?(NArray)
           bins.to_f
         end
@@ -250,11 +261,11 @@ module Histogram
 
           _freqs = make_freqs_proc.call(xvals, bins.size)
 
-          break_points = [] 
+          break_points = []
           (0...(bins.size)).each do |i|
             bin = bins[i]
             break if i == (bins.size - 1)
-            break_points << avg_ints(bin,bins[i+1]) 
+            break_points << avg_ints(bin,bins[i+1])
           end
           (0...(xvals.size)).each do |i|
             val = xvals[i]
@@ -262,9 +273,9 @@ module Histogram
             if val < break_points.first
               _freqs[0] += height
             elsif val >= break_points.last
-              _freqs[-1] += height 
+              _freqs[-1] += height
             else
-              (0...(break_points.size-1)).each do |i| 
+              (0...(break_points.size-1)).each do |i|
                 if val >= break_points[i] && val < break_points[i+1]
                   _freqs[i+1] += height
                   break
@@ -272,7 +283,7 @@ module Histogram
               end
             end
           end
-          _freqs 
+          _freqs
         end
       when :min
         freqs_ar = all.zip(weights).map do |xvals, yvals|
@@ -305,7 +316,7 @@ module Histogram
       dmin = _min.to_f
       conv = _max == _min ? 0 : bins.to_f/(_max - _min)
 
-      _bins = 
+      _bins =
         if self.is_a?(Array)
           Array.new(bins)
         elsif self.is_a?(NArray)
@@ -335,12 +346,20 @@ module Histogram
       iconv = 1.0/conv
       case bin_boundary
       when :avg
-        (0...bins).each do |i|
-          _bins[i] = ((i+0.5) * iconv) + dmin
+        if bins == 1
+          _bins[0] = self.to_a.inject(0.0) {|sum, val| sum + val } / self.size
+        else
+          (0...bins).each do |i|
+            _bins[i] = ((i+0.5) * iconv) + dmin
+          end
         end
       when :min
-        (0...bins).each do |i|
-          _bins[i] = (i * iconv) + dmin
+        if bins == 1
+          _bins[0] = self.min
+        else
+          (0...bins).each do |i|
+            _bins[i] = (i * iconv) + dmin
+          end
         end
       end
     end

data/lib/histogram/version.rb

@@ -1,3 +1,3 @@
 module Histogram
-  VERSION = "0.2.2.0"
+  VERSION = "0.2.3.0"
 end

data/spec/histogram_spec.rb

@@ -106,6 +106,10 @@ shared_examples 'something that can histogram' do
     bins, freq = obj7.histogram(:middle)
   end
 
+  it 'can handle all the same value' do
+    bins, freq = obj8.histogram
+  end
+
 end
 
 describe Histogram do
@@ -117,7 +121,8 @@ describe Histogram do
     :obj4 => [2, 2, 2, 2, 2, 4],
     :obj5 => [1,2,3,3,3,4,5,6,7,8],
     :obj6 => [0,0,0,0,0],
-    :obj7 => [0]
+    :obj7 => [0],
+    :obj8 => [1e-1, 1e-1, 1e-1, 1e-1],
   }
   data = tmp.each {|k,v| [k, v.map(&:to_f).extend(Histogram)] }
 

data/spec/spec_helper.rb

@@ -3,24 +3,8 @@ SimpleCov.start
 
 require 'rspec'
 
-require 'rspec/core/formatters/progress_formatter'
-# doesn't say so much about pending guys
-class QuietPendingFormatter < RSpec::Core::Formatters::ProgressFormatter
-  def example_pending(example)
-    output.print pending_color('*')
-  end
-end
-
-require 'rspec/core/formatters/documentation_formatter'
-class QuietPendingDocFormatter < RSpec::Core::Formatters::DocumentationFormatter
-  def example_pending(example)
-    output.puts pending_color( "<pending>: #{example.execution_result[:pending_message]}" )
-  end
-end
-
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.formatter = QuietPendingDocFormatter
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.color = true
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: histogram
 version: !ruby/object:Gem::Version
-  version: 0.2.2.0
+  version: 0.2.3.0
 platform: ruby
 authors:
 - John T. Prince
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: histograms data in different ways