to_histogram 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba2aa3dfca1bb5992786030deadd4ffc569b483
-  data.tar.gz: 58b857484458ca438a0548db2f6f945a6c0f99ee
+  metadata.gz: bc64fe5ed589d7281499abede70e628d1d185fff
+  data.tar.gz: d0ed5fa267e3328cfd72fba7625ad500cfebc521
 SHA512:
-  metadata.gz: 87163c0f3ea544d88f63d7313b5dbf21dc64544e6fff56ff46c7e777e7f8fdac0af84fc89a70dbd4317f259e4006c686fa9ba5b14ec1594d037d94384c33799f
-  data.tar.gz: 9a6a995528dc649652839f8399d54f2687abcfef78d1d3325e9c3a698ca94bacaf471f08beb1d228a87f59a982bafb0eca1888b36a70276d30a6b517159af01e
+  metadata.gz: 8062a66b610ee50b52c3053c4fb514cdb8edb70226b51500df6918e72dca7ad7457ca37e2826c0c73a0d2bb299390b6ff7481883f77e9114fbb0bf70c9e25dea
+  data.tar.gz: b4ad12cd120b69b86ce20ce032c03bb3e1c0c8112ac10f1783519ffe42bf176d3a0969cb47a0eeea24a869fc5145d20fe783ae4a949eed3fbd1e77e36b791b3c

data/lib/bucketizer.rb

@@ -1,35 +1,56 @@
 module ToHistogram
 
-    class Bucketizer
-
-        def create_buckets(array, num_buckets)
-          arr                   = array.sort
-          bucket_increments     = (arr[-1].to_f) / num_buckets  
-          l_index               = 0
-          next_bucket           = bucket_increments
-          buckets               = []
-          
-          arr.each_with_index do |e, i|
-            if !(e <= next_bucket)
-              buckets << arr[l_index..(i - 1)]
-
-              # Special case where all of the results fit into the first bucket
-              if buckets[0].length == arr.length
-                l_index = (arr.length)
-                break
-              end
-
-              l_index = i
-              next_bucket += bucket_increments
-            end
-          end
+  class Bucketizer
+
+    def initialize(array, num_buckets)
+      @arr                = array.sort
+      @num_buckets        = num_buckets
+      @bucket_increments  = get_bucket_increment
+    end
+    attr_reader :bucket_increments
+
+    def create_buckets
+      l_index               = 0
+      next_bucket           = (@bucket_increments == 1 && @arr[0] == 0) ? 0 : @bucket_increments
+      buckets               = []
+
+      @arr.each_with_index do |e, i|
+        break if buckets.length == (@num_buckets - 1)
+
+        if !(e <= next_bucket)
+          buckets << @arr[l_index..(i - 1)]
 
-          if(l_index <= (arr.length - 1))
-            buckets << arr[l_index..(arr.length - 1)]
+          # Special case where all of the results fit into the first bucket
+          if buckets[0].length == @arr.length
+            l_index = (@arr.length)
+            break
           end
 
-          return buckets
+          l_index = i
+          next_bucket += @bucket_increments
         end
+      end
 
+      # Stuff the remainder into the last bucket
+      if(l_index <= (@arr.length - 1))
+        buckets << @arr[l_index..(@arr.length - 1)]
+      end
+
+      return buckets
     end
+
+    private
+    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 * 0.9).to_i - 1] - @arr[(@arr.length * 0.1).to_i - 1]) / @num_buckets.to_f).ceil
+      end
+
+      return increment
+    end
+
+  end
 end

data/lib/histogram.rb

@@ -6,9 +6,11 @@ module ToHistogram
     include Enumerable
 
     def initialize(array, num_buckets)
-      bucketizer  = Bucketizer.new()
-      @buckets    = bucketizer.create_buckets(array, num_buckets)
+      bucketizer  = Bucketizer.new(array, num_buckets)
+      @buckets    = bucketizer.create_buckets
+      @increments = bucketizer.bucket_increments
     end
+    attr_reader :increments
 
     def each(&block)
       @buckets.each do |b|

data/lib/stdout_print.rb

@@ -6,17 +6,22 @@ module ToHistogram
     end
 
     def invoke
-      last_value = nil
       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 (percetage)")
       
-      @histogram.each do |b|
-        range       = last_value.nil? ? "#{b[0]} to #{b[-1]}" : "#{last_value + 1} to #{b[-1]}"
+      @histogram.each_with_index do |b, i|
+        range       = "#{b[0]} to #{b[-1]}"
         frequency   = b.length
         percentage  = ((frequency.to_f / total_data_value_length) * 100)
         stars       = ''
         percentage.round.times { |x| stars << '*' }
 
+        if(i == (@histogram.length - 1))
+          if(b[-1] - b[0] != 0 && (b[-1] - b[0] > @histogram.increments))
+            range = "> than #{b[0]}"
+          end
+        end
+
         printf("%-20s | %-20s | %-30s | %-20s \n", range, frequency, ('%.4f' % percentage), stars)
         last_value = b[-1]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_histogram
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Brett Sykes