to_histogram 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76599692e37ff86d3d2ebaa05aa54da8b9da7ab
-  data.tar.gz: 3149b591c776df617496904bb2066a8f8fd64d41
+  metadata.gz: eca08f2d21e518ea5e4db6a1c30a59a2fb63b520
+  data.tar.gz: c174cf44570b3ce27d012e71d29e61481e72f521
 SHA512:
-  metadata.gz: dd0e9518fe1e6841687b91093acf793edbe89ec56b85b7778f3272a1b48146375893a4a3b08ff073b0efd9ed5d35d3356ad063d1aa5d1d702a408783f720bbf8
-  data.tar.gz: 609d746f2f3fe63a9a12b2db5480aaddaf17d9e66cbdd71f15b7829777c7f7d28766593e6024e8be57320cc13f4486b3a2daec52167ac2e5553a0de3154e5444
+  metadata.gz: 072f67a79f664adeda1a608045795e8eb8c4d6e5a688717ac4a860a2a9e6814a9d9dc3ff652bbdf782a39e1b55d04441bbec3a7a01148abe00f79d14cb476ea1
+  data.tar.gz: ae1d70a20e0fd9cd98c83efd66061cb51e5986ffb9cf96ad081b7ce82df9e22e0ef9e31e0ddfd846ae5bd838ad5aea0ae5ff95286893be381055ab7375c69bab

data/lib/bucketizer.rb

@@ -2,19 +2,19 @@ module ToHistogram
 
   class Bucketizer
 
-    def initialize(array, num_buckets, percentile)
+    def initialize(array, num_buckets: 10, bucket_width: 'auto', percentile: 100)
       @arr                = array.sort
       @num_buckets        = num_buckets
-      @percentile         =percentile
+      @percentile         = percentile
 
       remove_elements_outside_of_percentile
-      @bucket_increments  = get_bucket_increment
+      @bucket_width  = (bucket_width == 'auto') ? get_bucket_increment : bucket_width
     end
-    attr_reader :bucket_increments, :arr
+    attr_reader :bucket_width
 
     def create_buckets
       l_index               = 0
-      next_bucket           = get_initial_next_bucket(@bucket_increments)
+      next_bucket           = get_initial_next_bucket(@bucket_width)
       buckets               = []
 
       # Deal with the special case where we have elements that == 0 and an increment sizes of 1 (count 0 as a value and don't lump it in with 1)
@@ -40,7 +40,7 @@ module ToHistogram
           end
 
           l_index = i
-          next_bucket += @bucket_increments
+          next_bucket += @bucket_width
         end
       end
 

data/lib/histogram.rb

@@ -5,15 +5,15 @@ module ToHistogram
   class Histogram
     include Enumerable
 
-    def initialize(array, num_buckets, percentile)
-      bucketizer    = Bucketizer.new(array, num_buckets, percentile)
-      @buckets      = bucketizer.create_buckets
-      @increments   = bucketizer.bucket_increments
-      @percentile   = percentile
-      @num_buckets  = num_buckets
-      @arr          = bucketizer.arr
+    def initialize(array, num_buckets: 10, bucket_width: 'auto', percentile: 100)
+      bucketizer      = Bucketizer.new(array, num_buckets: num_buckets, bucket_width: bucket_width, percentile: percentile)
+      
+      @buckets        = bucketizer.create_buckets
+      @bucket_width  = bucketizer.bucket_width
+      @percentile     = percentile
+      @num_buckets    = num_buckets
     end
-    attr_reader :increments, :percentile, :num_buckets, :arr
+    attr_reader :percentile, :num_buckets, :bucket_width, :buckets
 
     def each(&block)
       @buckets.each do |b|

data/lib/stdout_print.rb

@@ -20,18 +20,19 @@ module ToHistogram
     private
     def print_header
       @stdout.puts "\n**************************************************************"
-      @stdout.puts "Results for #to_histogram(num_buckets: #{@histogram.num_buckets}, percentile: #{@histogram.percentile}, print_info: true)"
+      @stdout.puts "Results for #to_histogram(num_buckets: #{@histogram.num_buckets}, bucket_width: #{@histogram.bucket_width}, percentile: #{@histogram.percentile}, print_info: true)"
       
       @stdout.puts "\n"
   
       percentile_info = (@histogram.percentile == 100) ? '' : "(Numbers limited to the #{@histogram.percentile}th percentile)"
       @stdout.puts "Data set used in this calculation #{percentile_info}"
-      @stdout.puts "Data set Size: #{@histogram.arr.length} items"
-      @stdout.puts "Min Value: #{@histogram.arr[0]}, Max Value: #{@histogram.arr[-1]}"
-      @stdout.puts "Mean: #{mean(@histogram.arr)}, Median: #{median(@histogram.arr)}, Mode: #{mode(@histogram.arr)}"
+      @stdout.puts "Data set Size: #{@histogram.reduce(:+).length} items"
+
+      @stdout.puts "Min Value: #{@histogram[0][0]}, Max Value: #{@histogram[-1][-1]}"
+      @stdout.puts "Mean: #{mean(@histogram.reduce(:+))}, Median: #{median(@histogram.reduce(:+))}, Mode: #{mode(@histogram.reduce(:+))}"
       @stdout.puts "\n"
             
-      @stdout.puts "Histogram bucket sizes: #{@histogram.increments}"
+      @stdout.puts "Histogram bucket width: #{@histogram.bucket_width}"
       @stdout.puts "**************************************************************\n\n"
     end
 
@@ -48,7 +49,7 @@ module ToHistogram
         percentage.round.times { |x| stars << '*' }
 
         if(i == (@histogram.length - 1))
-          if(b[-1] - b[0] != 0 && (b[-1] - b[0] > @histogram.increments))
+          if(b[-1] - b[0] != 0 && (b[-1] - b[0] > @histogram.bucket_width))
             range = "> than #{b[0]}"
           end
         end

data/lib/to_histogram.rb

@@ -2,8 +2,8 @@ require_relative './histogram'
 require_relative './stdout_print'
 
 class Array
-  def to_histogram(num_buckets: 10, percentile: 100, print_info: true)
-    histogram       = ToHistogram::Histogram.new(self, num_buckets, percentile)    
+  def to_histogram(num_buckets: 10, bucket_width: 'auto', percentile: 100, print_info: true)
+    histogram       = ToHistogram::Histogram.new(self, num_buckets: num_buckets, bucket_width: bucket_width, percentile: percentile)
     stdout_print    = ToHistogram::StdoutPrint.new(histogram, self)
 
     stdout_print.invoke if print_info

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_histogram
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Brett Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies: []
 description: 'Adds #to_histogram to Array. Returns a histogram distribution object
   from an Array and optionally prints detailed info to stdout.'