to_histogram 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a497ddca60be2c0142f10ab562d09e0eb1ff402e
-  data.tar.gz: 7b9f1c0d564baecb56efb0fd8b5da7285978ee12
+  metadata.gz: 9601f9e6c6772c4cf1d71f2963caa864ddafbfd7
+  data.tar.gz: dc6eaf01aae093f8ca0213fc561a876e015efdc5
 SHA512:
-  metadata.gz: c97bad0682ad8cf60b4929194fd6b055ee6c7df5a5f4ceff6df4fba9c5851d97ef4f57e3ed1028742712f9779371731605d95e81b154c7842a268b78b6ee0c9e
-  data.tar.gz: f1079ff1691fceb3a050b1eb467118aa403c534e8b99b99cc3c5c3622efe1d299e121ec8bc93cc78dc23a13ba720968275b6650797158aa62ee451b5ac3901c3
+  metadata.gz: 07b9ee278e369bcc7d1349094b0d99d05e2db082a87d4fde855dca8a447830a2731f96b475be81dfa6954d262bdb76e3239da591e3d29cb5ee12b44606980fa4
+  data.tar.gz: 9328e8cb97e0dfebbc213f4eebb1a7c18cbc78e6218380b19b57e8d20946d50db88665b8e613c4d7266a103740e4255aae2b93eee54cfa288ee81025cba43925

data/lib/bucketizer.rb

@@ -5,15 +5,21 @@ module ToHistogram
     def initialize(array, num_buckets, percentile)
       @arr                = array.sort
       @num_buckets        = num_buckets
+      @percentile         =percentile
       @bucket_increments  = get_bucket_increment(percentile)
     end
-    attr_reader :bucket_increments
+    attr_reader :bucket_increments, :arr
 
     def create_buckets
       l_index               = 0
       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 = []

data/lib/histogram.rb

@@ -11,8 +11,9 @@ module ToHistogram
       @increments   = bucketizer.bucket_increments
       @percentile   = percentile
       @num_buckets  = num_buckets
+      @arr          = bucketizer.arr
     end
-    attr_reader :increments, :percentile, :num_buckets
+    attr_reader :increments, :percentile, :num_buckets, :arr
 
     def each(&block)
       @buckets.each do |b|

data/lib/stdout_print.rb

@@ -16,16 +16,23 @@ module ToHistogram
     def print_header
       puts "\n**************************************************************"
       puts "Results for #to_histogram(num_buckets: #{@histogram.num_buckets}, percentile: #{@histogram.percentile}, print_info: true)"
+      
+      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"
-      puts "Min Value: #{@original_array[0]}, Max Value: #{@original_array[-1]}"
-      puts "Mean: #{mean}, Median: #{median}, Mode: #{mode}"
+            
       puts "Histogram bucket sizes: #{@histogram.increments}"
       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 (out of #{total_data_value_length})", "Histogram (each * =~ 1%)")
+      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]
@@ -46,18 +53,18 @@ module ToHistogram
       end
     end
 
-    def mean
-      @original_array.reduce(:+) / @original_array.length
+    def mean(array)
+      array.reduce(:+) / array.length
     end
 
-    def median
-      @original_array[@original_array.length / 2]
+    def median(array)
+      array[array.length / 2]
     end
 
-    def mode
-      frequency = @original_array.inject(Hash.new(0)) { |h,v| h[v] += 1; h }
+    def mode(array)
+      frequency = array.inject(Hash.new(0)) { |h,v| h[v] += 1; h }
       
-      @original_array.max_by { |v| frequency[v] }
+      array.max_by { |v| frequency[v] }
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_histogram
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Brett Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-07 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.'