to_histogram 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9601f9e6c6772c4cf1d71f2963caa864ddafbfd7
-  data.tar.gz: dc6eaf01aae093f8ca0213fc561a876e015efdc5
+  metadata.gz: d76599692e37ff86d3d2ebaa05aa54da8b9da7ab
+  data.tar.gz: 3149b591c776df617496904bb2066a8f8fd64d41
 SHA512:
-  metadata.gz: 07b9ee278e369bcc7d1349094b0d99d05e2db082a87d4fde855dca8a447830a2731f96b475be81dfa6954d262bdb76e3239da591e3d29cb5ee12b44606980fa4
-  data.tar.gz: 9328e8cb97e0dfebbc213f4eebb1a7c18cbc78e6218380b19b57e8d20946d50db88665b8e613c4d7266a103740e4255aae2b93eee54cfa288ee81025cba43925
+  metadata.gz: dd0e9518fe1e6841687b91093acf793edbe89ec56b85b7778f3272a1b48146375893a4a3b08ff073b0efd9ed5d35d3356ad063d1aa5d1d702a408783f720bbf8
+  data.tar.gz: 609d746f2f3fe63a9a12b2db5480aaddaf17d9e66cbdd71f15b7829777c7f7d28766593e6024e8be57320cc13f4486b3a2daec52167ac2e5553a0de3154e5444

data/lib/averages.rb

@@ -0,0 +1,15 @@
+module Averages
+    def mean(array)
+      array.reduce(:+) / array.length
+    end
+
+    def median(array)
+      array[array.length / 2]
+    end
+
+    def mode(array)
+      frequency = array.inject(Hash.new(0)) { |h,v| h[v] += 1; h }
+      
+      array.max_by { |v| frequency[v] }
+    end
+end

data/lib/bucketizer.rb

@@ -6,20 +6,17 @@ module ToHistogram
       @arr                = array.sort
       @num_buckets        = num_buckets
       @percentile         =percentile
-      @bucket_increments  = get_bucket_increment(percentile)
+
+      remove_elements_outside_of_percentile
+      @bucket_increments  = get_bucket_increment
     end
     attr_reader :bucket_increments, :arr
 
     def create_buckets
       l_index               = 0
-      next_bucket           = @bucket_increments
+      next_bucket           = get_initial_next_bucket(@bucket_increments)
       buckets               = []
 
-      # Remove any elements outside of the percentile
-      if(@percentile != 100)
-        @arr = @arr[0..(@arr.length * (@percentile / 100.0) - 1).to_i]
-      end
-
       # 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)
       if(@arr.count(0) > 0 && next_bucket == 1)
         bucket_0 = []
@@ -56,15 +53,25 @@ module ToHistogram
     end
 
     private
-    def get_bucket_increment(percentile)
-      nth_percentile = percentile / 100.0
+    def get_initial_next_bucket(increments)
+      if(@arr[0] != nil && @arr[0] < 0)
+        return (@arr[0] + increments)
+      else
+        return increments
+      end
+    end
+
+    def remove_elements_outside_of_percentile
+      if(@percentile != 100)
+        @arr = @arr[0..(@arr.length * (@percentile / 100.0) - 1).to_i]
+      end
+    end
 
+    def get_bucket_increment
       if(@arr.length == 0)
         return 0
-      elsif(@arr.length <= @num_buckets)
-        increment = ((@arr[-1] - @arr[0]) / @num_buckets)
       else
-        increment = ((@arr[(@arr.length * nth_percentile).to_i - 1] - @arr[0]) / @num_buckets.to_f).ceil
+        increment = ((@arr[-1] - @arr[0]) / @num_buckets.to_f).ceil
       end
 
       return increment

data/lib/stdout_print.rb

@@ -1,9 +1,14 @@
+require_relative './averages'
+
 module ToHistogram
 
   class StdoutPrint
-    def initialize(histogram, original_array)
+    include Averages
+
+    def initialize(histogram, original_array, stdout=$stdout)
       @histogram      = histogram
       @original_array = original_array.sort
+      @stdout         = stdout
     end
 
     def invoke
@@ -14,25 +19,25 @@ module ToHistogram
 
     private
     def print_header
-      puts "\n**************************************************************"
-      puts "Results for #to_histogram(num_buckets: #{@histogram.num_buckets}, percentile: #{@histogram.percentile}, print_info: true)"
+      @stdout.puts "\n**************************************************************"
+      @stdout.puts "Results for #to_histogram(num_buckets: #{@histogram.num_buckets}, percentile: #{@histogram.percentile}, print_info: true)"
       
-      puts "\n"
+      @stdout.puts "\n"
   
       percentile_info = (@histogram.percentile == 100) ? '' : "(Numbers limited to the #{@histogram.percentile}th percentile)"
-      puts "Data set used in this calculation #{percentile_info}"
-      puts "Data set Size: #{@histogram.arr.length} items"
-      puts "Min Value: #{@histogram.arr[0]}, Max Value: #{@histogram.arr[-1]}"
-      puts "Mean: #{mean(@histogram.arr)}, Median: #{median(@histogram.arr)}, Mode: #{mode(@histogram.arr)}"
-      puts "\n"
+      @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 "\n"
             
-      puts "Histogram bucket sizes: #{@histogram.increments}"
-      puts "**************************************************************\n\n"
+      @stdout.puts "Histogram bucket sizes: #{@histogram.increments}"
+      @stdout.puts "**************************************************************\n\n"
     end
 
     def print_body
       total_data_value_length = (@histogram.map { |b| b.length }).reduce(:+)
-      printf("%-20s %-20s %-30s %-20s \n\n", "Range", "Frequency", "  Percentage", "Histogram (each * =~ 1%)")
+      @stdout.printf("%-20s %-20s %-30s %-20s \n\n", "Range", "Frequency", "  Percentage", "Histogram (each * =~ 1%)")
       
       @histogram.each_with_index do |b, i|
         next_bucket = (@histogram[i + 1]) ? @histogram[i + 1][0] : b[-1]
@@ -48,24 +53,9 @@ module ToHistogram
           end
         end
 
-        printf("%-20s | %-20s | %-30s | %-20s \n", range, frequency, ('%.4f' % percentage), stars)
-        last_value = b[-1]
+        @stdout.printf("%-20s | %-20s | %-30s | %-20s \n", range, frequency, ('%.4f' % percentage), stars)
       end
     end
 
-    def mean(array)
-      array.reduce(:+) / array.length
-    end
-
-    def median(array)
-      array[array.length / 2]
-    end
-
-    def mode(array)
-      frequency = array.inject(Hash.new(0)) { |h,v| h[v] += 1; h }
-      
-      array.max_by { |v| frequency[v] }
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_histogram
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Brett Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-08 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.'
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/averages.rb
 - lib/bucketizer.rb
 - lib/histogram.rb
 - lib/stdout_print.rb