multimeter 1.0.1-java → 1.1.0-java

data/lib/multimeter/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Multimeter
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/multimeter.rb

@@ -527,36 +527,23 @@ module Multimeter
       types.first
     end
 
-    COMPUTATIONS = {
-      :max => :max,
-      :min => :min,
-      :type => :first,
-      :event_type => :first,
-      :count => :sum,
-      :sum => :sum,
-      :mean => :avg,
-      :mean_rate => :avg,
-      :one_minute_rate => :avg,
-      :five_minute_rate => :avg,
-      :fifteen_minute_rate => :avg,
-      :std_dev => :avg,
-      :value => :avg
-    }.freeze
-
     def compute_total
       h = {}
       metric_hs = @metrics.values.map(&:to_h)
       metric_hs.first.keys.each do |property|
         values = metric_hs.map { |h| h[property] }
         aggregate_value = begin
-          case COMPUTATIONS[property]
-          when :first then values.first
-          when :max   then values.max
-          when :min   then values.min
-          when :sum   then values.reduce(:+)
-          when :avg   then values.reduce(:+)/values.size.to_f
-          else
-            raise "Don't know how to aggregate #{property}"
+          case property
+          when :type, :event_type then values.first
+          else 
+            min, max = values.minmax
+            sum = values.reduce(:+)
+            {
+              :max => max,
+              :min => min,
+              :sum => sum,
+              :avg => sum/values.size.to_f,
+            }
           end
         end
         h[property] = aggregate_value

metadata

@@ -2,14 +2,14 @@
 name: multimeter
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.1
+  version: 1.1.0
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000Z
+date: 2012-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrics-core-jars