benelux 0.5.12 → 0.5.13

data/CHANGES.txt

@@ -1,5 +1,11 @@
 BENELUX, CHANGES
 
+#### 0.5.13 (2010-03-??) ##############################
+
+* FIXED: Benelux::Stats::Calculator#merge! checks @n instead of @sum
+* CHANGE: Don't merge when the other Calculator has 0 samples. 
+
+
 #### 0.5.12 (2010-03-19) ##############################
 
 * CHANGE: When merging Benelux::Stats::Calculator objects into one that has 0 samples, 

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.12"
+  s.version = "0.5.13"
   s.summary = "Benelux: A mad way to time Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

data/lib/benelux.rb

@@ -4,7 +4,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end

data/lib/benelux/stats.rb

@@ -149,7 +149,8 @@ module Benelux
       end
       
       def merge!(other)    
-        if @sum == 0
+        return self if other.n == 0
+        if @n == 0
           @min, @max = other.min, other.max
         else
           @min = other.min if other.min < @min

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -04:00
+date: 2010-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: []