tdigest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d323c00e8ecc6fc72db137c6160f28c23a8615
-  data.tar.gz: efad7cb62f79a512e4fc68dceca2ae5a55a693c3
+  metadata.gz: 5aeae6aa49816daeea269ec499590c97075a3149
+  data.tar.gz: dd214c32109be62d1fb145743f52d1398feb13d4
 SHA512:
-  metadata.gz: a948d7d63a22957a34e9e1cf71d4e6904a325b1b7e4cd93de12611332c41c62be932a7fd69a6f356122c7da033bc24abaa86db29db5b03a8d1dc79031f603e59
-  data.tar.gz: 6fb668b7bbe9f1885af98036843095f03d0a74034462c7fdd8fdde970c95b606be556074c41c042a1e02ce9c60bb29fddd0177d4eefdc6da5a32bac857e391ff
+  metadata.gz: 9cc95403c4e428cf3ea0443e0cda972dd78b948779bff3fccf6265c155a50d47d83489965e93aa9ef6dbee316d543107d36a9fe76bbf5b8ea76f034d3f7332c4
+  data.tar.gz: 1325bf0d452da07415d9a12aabf8e014c76c7ade0ab21615cf95bfb4f582d9373b4b7ba70d6265a19d449ae9f88e45d6e1c52624c82d73e96f0f8bfaf4db5678

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
   - 2.1.0
-  - 2.2.3
+  - 2.2.4
+  - 2.3.1
 before_install: gem install bundler -v 1.10.6

data/lib/tdigest/centroid.rb

@@ -1,10 +1,11 @@
 module TDigest
   class Centroid
     attr_accessor :mean, :n, :cumn, :mean_cumn
-    def initialize(params = {})
-      params.each do |p, value|
-        send("#{p}=", value)
-      end
+    def initialize(mean, n, cumn, mean_cumn = nil)
+      @mean      = mean
+      @n         = n
+      @cumn      = cumn
+      @mean_cumn = mean_cumn
     end
 
     def as_json(_ = nil)

data/lib/tdigest/tdigest.rb

@@ -13,6 +13,7 @@ module TDigest
       @cx = cx
       @centroids = RBTree.new
       @nreset = 0
+      @n = 0
       reset!
     end
 
@@ -97,10 +98,8 @@ module TDigest
     def compress!
       points = to_a
       reset!
-      while points.length > 0
-        push_centroid(points.delete_at(rand(points.length)))
-      end
-      _cumulate(true)
+      push_centroid(points.shuffle)
+      _cumulate(true, true)
       nil
     end
 
@@ -128,10 +127,8 @@ module TDigest
     end
 
     def merge!(other)
-      # Uses delta, k and cx from the caller
-      t = self + other
-      @centroids = t.centroids
-      compress!
+      push_centroid(other.centroids.values.shuffle)
+      self
     end
 
     def p_rank(x)
@@ -277,7 +274,6 @@ module TDigest
       nearest.cumn += n
       nearest.mean_cumn += n / 2.0
       nearest.n += n
-      @n += n
 
       nil
     end
@@ -311,6 +307,8 @@ module TDigest
       max = max.nil? ? nil : max[1]
       nearest = find_nearest(x)
 
+      @n += n
+
       if nearest && nearest.mean == x
         _add_weight(nearest, x, n)
       elsif nearest == min
@@ -341,9 +339,8 @@ module TDigest
     end
 
     def _new_centroid(x, n, cumn)
-      c = Centroid.new({ mean: x, n: n, cumn: cumn })
+      c = Centroid.new(x, n, cumn)
       @centroids[x] = c
-      @n += n
       c
     end
   end

data/lib/tdigest/version.rb

@@ -1,3 +1,3 @@
 module TDigest
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdigest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sebastian Wallin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of Dunning's T-Digest for streaming quantile approximation