histogram 0.2.1.3 → 0.2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7328c3ca0000e0400eb3f755153170bcc02d017
-  data.tar.gz: 4df8b91ec124fddbca08099ab7ac7302bde3a682
+  metadata.gz: deecc5f583bc853f2e7dccdb1e4cb8311acb45c0
+  data.tar.gz: 879bdf4508f55f29a1c560328d11b48ef2acc48d
 SHA512:
-  metadata.gz: db2f21ceb25dcc0558923e385f07147b1a16aa824ef3119fc3097a2e26bfdb9f6b30c6d7677577c0ab88d53fb22a14f4848a7ccf7162c48ec78242c467b10cc3
-  data.tar.gz: a6ceb91a51ba4da871e9f00635fd1277e3046e9ac24d0a95e12cb39ad8fc4f7119c9076ac30d96efbde679f44fa6fbee2f6e1a98c7c8d23ad18ebb61473a9878
+  metadata.gz: c29c405ec579ac016526801f7845767aae155ee186f63dd8610d3d1596e1542126c2749623d84ae64c11e68a95b9b6d446d4b5a34bbecdfe11a20cd7d2d8fdaf
+  data.tar.gz: 81fc3b7306f61085b57cf103d6815f894841af07549421647ff343179b521f794e6ac4237cf49d6158587ab79c3aebf0b47e908ceeb26c8daaa3995feb333abe

data/README.md

@@ -4,7 +4,10 @@
 
 Generates histograms similar to R's hist and numpy's histogram functions.
 Inspired somewhat by [Richard Cottons's matlab implementation](http://www.mathworks.com/matlabcentral/fileexchange/21033-calculate-number-of-bins-for-histogram)
-and the wikipedia [histogram article](http://en.wikipedia.org/wiki/Histogram).
+and the wikipedia [histogram
+article](http://en.wikipedia.org/wiki/Histogram).
+
+Tested on latest MRI 1.9.x, 2.x, and jruby (no NArray support for jruby).  Known to work on MRI 1.8.7.
 
 ### Typical usage:
 
@@ -12,13 +15,13 @@ and the wikipedia [histogram article](http://en.wikipedia.org/wiki/Histogram).
 
     data = [0,1,2,2,2,2,2,3,3,3,3,3,3,3,3,3,5,5,9,9,10]
     # by default, uses Scott's method to calculate optimal number of bins
-    # and the bin values are midpoints between the bin edges 
-    (bins, freqs) = data.histogram 
-    # equivalent to:  data.histogram(:scott, :bin_boundary => :avg)  
+    # and the bin values are midpoints between the bin edges
+    (bins, freqs) = data.histogram
+    # equivalent to:  data.histogram(:scott, :bin_boundary => :avg)
 
 ### Multiple types of binning behavior:
 
-    # :scott, :fd, :sturges, or :middle  
+    # :scott, :fd, :sturges, or :middle
     data.histogram(:fd)  # use Freedman-Diaconis method to calc num bins
     data.histogram(:middle) # (median value between the three methods)
     (bins, freqs) = data.histogram(20)                         # use 20 bins
@@ -33,7 +36,7 @@ and the wikipedia [histogram article](http://en.wikipedia.org/wiki/Histogram).
     (bins, freqs) = data.histogram(:bin_width => 0.5)
 
 ### Multiple Datasets:
-      
+
 Sometimes, we want to create histograms where the bins are calculated based on
 all the data sets.  That way, the resulting frequencies will all line up:
 
@@ -41,12 +44,12 @@ all the data sets.  That way, the resulting frequencies will all line up:
     (bins, *freqs) = set1.histogram(30, :other_sets => [[3,3,4,4,5], [-1,0,0,3,3,6]])
 
 ### Histograms with weights/fractions:
-  
+
     # histogramming with weights
     data.histogram(20, :weights => [3,3,8,8,9,9,3,3,3,3])
 
 ### Works with NArray objects
-  
+
     require 'histogram/narray'    # enables NArray#histogram
     # if the calling object is an NArray, the output is two NArrays:
     (bins, freqs) = NArray.float(20).random!(3).histogram(20)
@@ -56,6 +59,13 @@ all the data sets.  That way, the resulting frequencies will all line up:
 
     gem install histogram
 
+## Acknowledgements
+
+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))
+
 ## See Also
 
 [aggregate](http://github.com/josephruscio/aggregate), [rserve-client](http://rubygems.org/gems/rserve-client), [rsruby](http://github.com/alexgutteridge/rsruby)

data/Rakefile

@@ -1,5 +1,4 @@
 require "bundler/gem_tasks"
-require_relative "lib/histogram/version"
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/histogram.gemspec

@@ -19,12 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  [ "bundler ~> 1.3", 
+  [ "bundler ~> 1.3",
     "rake ~> 10.1.0",
     "simplecov ~> 0.7.1",
     "rspec ~> 2.13.0",
-    "narray",
+    "rdoc"
   ].each do |argline|
     spec.add_development_dependency *argline.split(' ', 2).compact
   end
+
+  unless RUBY_PLATFORM =~ /java/
+    spec.add_development_dependency "narray"
+  end
 end

data/lib/histogram.rb

@@ -1,5 +1,11 @@
 
-class NArray 
+class NArray
+end
+
+unless Math.respond_to?(:log2)
+  def Math.log2(num)
+    Math.log(num, 2)
+  end
 end
 
 module Histogram
@@ -44,8 +50,8 @@ module Histogram
     #     :sorted => false
     #   
     def iqrange(obj, opts={})
-      opt = {method: DEFAULT_QUARTILE_METHOD, sorted: false}.merge( opts )
-      srted = opt[:sorted] ? obj : obj.sort 
+      opt = {:method => DEFAULT_QUARTILE_METHOD, :sorted => false}.merge( opts )
+      srted = opt[:sorted] ? obj : obj.sort
       sz = srted.size
       answer = 
         case opt[:method]
@@ -89,9 +95,9 @@ module Histogram
           (mean, stddev) = Histogram.sample_stats(self) 
           range / ( 3.5*stddev*(self.size**(-1.0/3)) )
         when :sturges
-          1 + Math::log(self.size, 2)
+          1 + Math::log2(self.size)
         when :fd
-          2 * Histogram.iqrange(self, method: quartile_method) * (self.size**(-1.0/3))
+          2 * Histogram.iqrange(self, :method => quartile_method) * (self.size**(-1.0/3))
         end
       nbins = 1 if nbins <= 0
       nbins = 1 if nbins.nan?

data/lib/histogram/version.rb

@@ -1,3 +1,3 @@
 module Histogram
-  VERSION = "0.2.1.3"
+  VERSION = "0.2.1.4"
 end

data/spec/histogram_spec.rb

@@ -2,6 +2,16 @@ require 'spec_helper'
 
 require 'histogram'
 
+class Float
+  def round(n=nil)
+    if n
+      ((n**10) * self).to_i/(10**n)
+    else
+      super()
+    end
+  end
+end
+
 RSpec::Matchers.define :be_within_rounding_error_of do |expected|
   match do |actual|
     (act, exp) = [actual, expected].map {|ar| ar.collect {|v| v.to_f.round(8) } }
@@ -91,14 +101,14 @@ shared_examples 'something that can histogram' do
 end
 
 describe Histogram do
-  tmp = { 
-    obj0: (0..10).to_a,
-    obj1: [0, 1, 1.5, 2.0, 5.0, 6.0, 7, 8, 9, 9],
-    obj2: [-1, 0, 1, 1.5, 2.0, 5.0, 6.0, 7, 8, 9, 9, 10], 
-    obj3: [1, 1, 2, 2, 3, 3, 4, 4, 4],
-    obj4: [2, 2, 2, 2, 2, 4],
-    obj5: [1,2,3,3,3,4,5,6,7,8],
-    obj6: [0,0,0,0,0]
+  tmp = {
+    :obj0 => (0..10).to_a,
+    :obj1 => [0, 1, 1.5, 2.0, 5.0, 6.0, 7, 8, 9, 9],
+    :obj2 => [-1, 0, 1, 1.5, 2.0, 5.0, 6.0, 7, 8, 9, 9, 10],
+    :obj3 => [1, 1, 2, 2, 3, 3, 4, 4, 4],
+    :obj4 => [2, 2, 2, 2, 2, 4],
+    :obj5 => [1,2,3,3,3,4,5,6,7,8],
+    :obj6 => [0,0,0,0,0]
   }
   data = tmp.each {|k,v| [k, v.map(&:to_f).extend(Histogram)] }
 
@@ -112,12 +122,12 @@ describe Histogram do
     it_behaves_like 'something that can histogram'
   end
 
-  have_narray = 
+  have_narray =
     begin
       require 'narray'
       NArray.respond_to?(:to_na)
       true
-    rescue
+    rescue LoadError
       false
     end
 
@@ -152,16 +162,15 @@ describe Histogram do
     end
 
     it 'calculates the interquartile range via moore_mccabe' do
-      Histogram.iqrange(even, method: :moore_mccabe).should == 4.0
-      Histogram.iqrange(odd, method: :moore_mccabe).should == 4.0
+      Histogram.iqrange(even, :method => :moore_mccabe).should == 4.0
+      Histogram.iqrange(odd, :method => :moore_mccabe).should == 4.0
     end
 
     it 'calculates the interquartile range via tukey' do
-      Histogram.iqrange(even, method: :tukey).should == 4.0
-      Histogram.iqrange(odd, method: :tukey).should == 3.0
+      Histogram.iqrange(even, :method => :tukey).should == 4.0
+      Histogram.iqrange(odd, :method => :tukey).should == 3.0
     end
 
 
   end
 end
-

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: histogram
 version: !ruby/object:Gem::Version
-  version: 0.2.1.3
+  version: 0.2.1.4
 platform: ruby
 authors:
 - John T. Prince
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: narray
-  requirement: !ruby/object:Gem::Requirement
+  name: rdoc
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: gives objects the ability to 'histogram' in several useful ways
 email:
 - jtprince@gmail.com
@@ -88,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -106,24 +106,24 @@ homepage: https://github.com/jtprince/histogram
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: histograms data in different ways
 test_files: