hyperll 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fde20f1294d29f01337a6ef65af833cb0f6d0f6
-  data.tar.gz: cec1fca655e5b953323490558623f6020f7e0a93
+  metadata.gz: 92a2d971e950386e6482dffd805a62c0440e73f6
+  data.tar.gz: 37fc41caaf80eb69eae2b4745ff6c5013d4d6db8
 SHA512:
-  metadata.gz: b3a9f0e91e502b9306dba43c6853ac9707374d4c68365feefe5115a341ccb5c5af0b6c2f9141038fc6127146873d19118efb9eddd4044e3c0e06edb11891b47c
-  data.tar.gz: d98c9a44979c962c362130d4961f6cb68bd66b27986d76fdd7411abfb9f349b4daf3c7d536685839894149365f36de153f087881704cb5896a3355c8fa920f43
+  metadata.gz: 996aae58d31e7c758294b23d8257488e014890ea4610fae1c2c2f570fc76ecd320f032e6847faa11f01caec70ce0de3428c23f8f0970a1e185cc90f3bee68e73
+  data.tar.gz: 23d9a863527faafc92bd8fd075e33823d4909734c3ddc24d214683df50efe43a76b3e5126cd4d0f7463792305c0cdff13721b47ee82f3580d5e26ac2c24347d7

data/lib/hyperll/hyper_log_log_plus.rb

@@ -172,6 +172,8 @@ module Hyperll
           end
         end
       end
+
+      self
     end
 
     def convert_to_normal
@@ -228,7 +230,7 @@ module Hyperll
       if (k & 1) == 1
         ((k >> 1) & 63) ^ 63
       else
-        number_of_leading_zeros((k << (p + (31 - sp))) & INT_MASK) + 1
+        number_of_leading_zeros(encoded_hash(k)) + 1
       end
     end
 
@@ -317,7 +319,7 @@ module Hyperll
         end
       end
 
-      new_set
+      new_set.sort_by { |e| [e, sparse_index(e), encoded_hash(e)] }
     end
 
     def consume_duplicates(sparse_set, index, start)
@@ -332,6 +334,7 @@ module Hyperll
     end
 
     def sparse_index(k)
+      k = k & INT_MASK
       if (k & 1) == 1
         k >> 7
       else
@@ -339,6 +342,10 @@ module Hyperll
       end
     end
 
+    def encoded_hash(k)
+      (k << (p + (31 - sp))) & INT_MASK
+    end
+
     def number_of_leading_zeros(int)
       -(Math.log2(int).to_i - 31)
     end

data/lib/hyperll/version.rb

@@ -1,3 +1,3 @@
 module Hyperll
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hyperll
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andy Lindeman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-  prerelease: false
-  type: :development
 description: HyperLogLog implementation in pure Ruby
 email:
 - andy@andylindeman.com
@@ -86,7 +86,7 @@ homepage: https://github.com/alindeman/hyperll
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,9 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
 specification_version: 4
 summary: HyperLogLog implementation in pure Ruby
 test_files: