to_histogram 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05347479d1ed05a641f8340d5fa10f5ed46a289
-  data.tar.gz: 5a0b25984a17f27b7fe899c8ff3706a86a044bf2
+  metadata.gz: 95f6c12298b9da0f4bf82a323b643cb61309bbd8
+  data.tar.gz: cb98da14fc867bb1a50d150c1c2dbb0e1317e997
 SHA512:
-  metadata.gz: bdb131e078435c3899409b12fd1ac6f442b1b83a6aa15f9c5228389b6464306e0ae78b0e1a21bacf654709cd472c26e80624e9693c327e6458217b269438efb6
-  data.tar.gz: 16077b970962f3846b3df7d6353a7331e05c5c11204f9008d331f98dffdf0d8d3ed4448b488a94fb2be6fdd335136bd2ae7641eae6e46890fd1bd657af0c9419
+  metadata.gz: 86bfa3f3d6f6de5033c1b6036096dc6c25cc1f0fe04dc195c9bcdb1e8d45b164ae7b467a7f3d856bdf72a404f91eb7326a6a263d3065d5077c71787312929c60
+  data.tar.gz: 9ab0280cf88d0f7fc71f19285a061baa5f733635e3f59efc599c98d61ec3075c0c315a981e40a0183770a954920706180314de7bef99ef44313ab04147c39b7c

data/lib/bucket.rb

@@ -0,0 +1,15 @@
+module ToHistogram
+    class Bucket
+
+        def initialize(from, to, contents)
+            @from       = from
+            @to         = to
+            @contents   = contents
+        end
+        attr_reader :from, :to, :contents
+
+        def inspect
+            puts "#{self.class}: @from: #{@from}, @to: #{@to}, @contents: #{@contents.class}"
+        end
+    end
+end

data/lib/bucketizer.rb

@@ -1,3 +1,5 @@
+require_relative './bucket'
+
 module ToHistogram
 
   class Bucketizer
@@ -14,6 +16,7 @@ module ToHistogram
 
     def create_buckets
       l_index               = 0
+      last_bucket           = @arr[0]
       next_bucket           = get_initial_next_bucket(@bucket_width)
       buckets               = []
 
@@ -21,9 +24,10 @@ module ToHistogram
       if(@arr.count(0) > 0 && next_bucket == 1)
         bucket_0 = []
         @arr.count(0).times { bucket_0 << @arr.shift }
-        buckets << bucket_0
+        buckets << Bucket.new(0, 0, bucket_0)
 
-        next_bucket += 1
+        last_bucket = 1
+        next_bucket = 2
       end
 
       # Iterate thorough the remainder of the list in the normal case
@@ -31,20 +35,23 @@ module ToHistogram
         break if buckets.length == (@num_buckets - 1)
 
         if (e >= next_bucket)
-          buckets << @arr[l_index..(i - 1)]
+          buckets << Bucket.new(last_bucket, next_bucket - 1, @arr[l_index..(i - 1)])
 
           # Special case here also where all of the results fit into the first bucket
-          if buckets[0].length == @arr.length
+          if buckets[0].contents.length == @arr.length
             l_index = (@arr.length)
             break
           end
 
           l_index = i
+          last_bucket = next_bucket
           next_bucket += @bucket_width
 
           # Add empty buckets until the next bucket is greater than the current l_index
           while(next_bucket < @arr[l_index])
-            buckets << []
+
+            buckets << Bucket.new(last_bucket, next_bucket - 1, [])
+            last_bucket = next_bucket
             next_bucket += @bucket_width
           end
         end
@@ -52,7 +59,7 @@ module ToHistogram
 
       # Stuff the remainder into the last bucket
       if(l_index <= (@arr.length - 1))
-        buckets << @arr[l_index..(@arr.length - 1)]
+        buckets << Bucket.new(last_bucket, next_bucket - 1, @arr[l_index..(@arr.length - 1)])
       end
 
       return buckets
@@ -62,8 +69,10 @@ module ToHistogram
     def get_initial_next_bucket(increments)
       if(@arr[0] != nil && @arr[0] < 0)
         return (@arr[0] + increments)
-      else
+      elsif(@arr[0] == 0 || @arr[0] == nil)
         return increments
+      else
+        return increments + @arr[0]
       end
     end
 

data/lib/histogram.rb

@@ -9,7 +9,7 @@ module ToHistogram
       bucketizer      = Bucketizer.new(array, num_buckets: num_buckets, bucket_width: bucket_width, percentile: percentile)
       
       @buckets        = bucketizer.create_buckets
-      @bucket_width  = bucketizer.bucket_width
+      @bucket_width   = bucketizer.bucket_width
       @percentile     = percentile
       @num_buckets    = num_buckets
     end
@@ -29,6 +29,16 @@ module ToHistogram
       return @buckets.length
     end
 
+    def bucket_contents_length
+      @buckets.reduce(0) { |sum, x| sum + x.contents.length }
+    end
+
+    def bucket_contents_values
+      a = []
+      @buckets.map { |b| a << b.contents }
+      return a.flatten
+    end
+
     def inspect
       return "class: #{self.class} object_id: #{self.object_id}"
     end

data/lib/stdout_print.rb

@@ -26,10 +26,10 @@ module ToHistogram
   
       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.reduce(:+).length} items"
+      @stdout.puts "Data set Size: #{@histogram.bucket_contents_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 "Min Value: #{@histogram[0].contents[0]}, Max Value: #{@histogram[-1].contents[-1]}"
+      @stdout.puts "Mean: #{mean(@histogram.bucket_contents_values)}, Median: #{median(@histogram.bucket_contents_values)}, Mode: #{mode(@histogram.bucket_contents_values)}"
       @stdout.puts "\n"
             
       @stdout.puts "Histogram bucket width: #{@histogram.bucket_width}"
@@ -37,28 +37,23 @@ module ToHistogram
     end
 
     def print_body
-      total_data_value_length = (@histogram.map { |b| b.length }).reduce(:+)
       @stdout.printf("%-20s %-20s %-30s %-20s \n\n", "Range", "Frequency", "  Percentage", "Histogram (each * =~ 1%)")
-      
-      from  = @histogram[0][0]
-      to    = (from + @histogram.bucket_width - 1)
+    
       @histogram.each_with_index do |b, i|
         #next_bucket = (@histogram[i + 1]) ? @histogram[i + 1][0] : b[-1]
-        range       = "#{from} to #{to}"
-        frequency   = b.length
-        percentage  = ((frequency.to_f / total_data_value_length) * 100)
+        range       = "#{@histogram[i].from} to #{@histogram[i].to}"
+        frequency   = b.contents.length
+        percentage  = ((frequency.to_f / @histogram.bucket_contents_length) * 100)
         stars       = ''
         percentage.round.times { |x| stars << '*' }
 
         if(i == (@histogram.length - 1))
-          if(b[-1] - b[0] != 0 && (b[-1] - b[0] > @histogram.bucket_width))
-            range = "> than #{b[0]}"
+          if(b.contents[-1] - b.contents[0] != 0 && (b.contents[-1] - b.contents[0] > @histogram.bucket_width))
+            range = "> than #{b.contents[0]}"
           end
         end
 
         @stdout.printf("%-20s | %-20s | %-30s | %-20s \n", range, frequency, ('%.4f' % percentage), stars)
-        from = to + 1
-        to += @histogram.bucket_width
       end
     end
 

metadata

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