Removing conversions to int

Allow for other sorts of numeric types (like float). Signed-off-by: Scott Chacon <schacon@gmail.com>
mattallen · Dec 29, 2008 · c6a3ede · c6a3ede
1 parent 2156b36
commit c6a3ede
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/munger/data.rb b/lib/munger/data.rb
@@ -132,12 +132,12 @@ def group(groups, agg_hash = {})
               newcol = key.to_s + '_' + col.to_s
               case key
               when :average
-                sum = data[:cells][col].inject(0) { |sum, a| sum + a.to_i }
+                sum = data[:cells][col].inject { |sum, a| sum + a }
                 new_row[newcol] = (sum / data[:count])  
               when :count
                 new_row[newcol] = data[:count]  
               else            
-                new_row[newcol] = data[:cells][col].inject(0) { |sum, a| sum + a.to_i }
+                new_row[newcol] = data[:cells][col].inject { |sum, a| sum + a }
               end
             end
             new_keys << newcol
@@ -161,7 +161,7 @@ def pivot(columns, rows, value, aggregation = :sum)
         focus = data_hash[row_key][column_key]
         focus[:data] = clean_data(row)
         focus[:count] += 1
-        focus[:sum] += row[value].to_i
+        focus[:sum] += row[value]
       end
 
       new_data = []

diff --git a/lib/munger/report.rb b/lib/munger/report.rb
@@ -234,10 +234,10 @@ def calculate_aggregate(type, data)
           when :count
             data.size
           when :average
-            sum = data.inject(0) {|sum, n| sum + n.to_i }
-            (sum / data.size).to_i rescue 0
+            sum = data.inject {|sum, n| sum + n }
+            (sum / data.size) rescue 0
           else
-            data.inject(0) {|sum, n| sum + n.to_i }
+            data.inject {|sum, n| sum + n }
           end
         end
       end