benelux 0.5.12 → 0.5.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGES.txt CHANGED
@@ -1,5 +1,11 @@
1
1
  BENELUX, CHANGES
2
2
 
3
+ #### 0.5.13 (2010-03-??) ##############################
4
+
5
+ * FIXED: Benelux::Stats::Calculator#merge! checks @n instead of @sum
6
+ * CHANGE: Don't merge when the other Calculator has 0 samples.
7
+
8
+
3
9
  #### 0.5.12 (2010-03-19) ##############################
4
10
 
5
11
  * CHANGE: When merging Benelux::Stats::Calculator objects into one that has 0 samples,
data/benelux.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  @spec = Gem::Specification.new do |s|
2
2
  s.name = "benelux"
3
3
  s.rubyforge_project = 'benelux'
4
- s.version = "0.5.12"
4
+ s.version = "0.5.13"
5
5
  s.summary = "Benelux: A mad way to time Ruby codes"
6
6
  s.description = s.summary
7
7
  s.author = "Delano Mandelbaum"
data/lib/benelux.rb CHANGED
@@ -4,7 +4,7 @@ require 'thwait'
4
4
  require 'selectable'
5
5
 
6
6
  module Benelux
7
- VERSION = "0.5.12"
7
+ VERSION = "0.5.13"
8
8
  NOTSUPPORTED = [Class, Object, Kernel]
9
9
 
10
10
  class BeneluxError < RuntimeError; end
data/lib/benelux/stats.rb CHANGED
@@ -149,7 +149,8 @@ module Benelux
149
149
  end
150
150
 
151
151
  def merge!(other)
152
- if @sum == 0
152
+ return self if other.n == 0
153
+ if @n == 0
153
154
  @min, @max = other.min, other.max
154
155
  else
155
156
  @min = other.min if other.min < @min
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: benelux
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.12
4
+ version: 0.5.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2010-03-19 00:00:00 -04:00
12
+ date: 2010-03-20 00:00:00 -04:00
13
13
  default_executable:
14
14
  dependencies: []
15
15