min_max 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b9b64396908ffd54a712e8a8e9b4eb6546e0538a6c168a69d67304dc6fcf1d
-  data.tar.gz: 487b79da6a3a3f99ab408af1feb17ebe33c21c08b7c64b9e20e5b259bcf764bf
+  metadata.gz: 6d739946dcb0939e2e05893222c927f4dea0eda65da5c0a00156402de3e49c29
+  data.tar.gz: 61b4453a94b93bb2ccefd0787a751cef5d3ef380ac0ed591c73c3b0afddc394b
 SHA512:
-  metadata.gz: '086026e3dfe0851390e4090e700aed60a27eaaf70ae53beb9a50164fd78a024797513994b2bd3c67995b29a655c6c8ca755b19ff42797e12190fae9bac10f4c6'
-  data.tar.gz: b7cebaf1da79607d638628c1ef2d54ff11126902e9c1072d4c2bfd1db883db662d323c9e760134c76941747f447494141122e2a4dad6dd0ddc9a65682bfcfd9f
+  metadata.gz: 70dd4402ca82a60cffbc451ea134ca9fc34391f28311d23726d22055bfc01db9ba62002f0d54c76282888993613f2bf5618dcfa7a964da39c6995747401f3a3f
+  data.tar.gz: 31ada4f8ed50624701e389c6a1d50b83b75a585ef703d2f18c6511498dc9373647fa1f88d959ccdcbf56336d38dc550e1ce96710644f65970f2341549f843d53

data/Cargo.lock

@@ -270,9 +270,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"

data/Cargo.toml

@@ -8,5 +8,6 @@ resolver = "2"
 
 [profile.release]
 opt-level = 3
-lto = "fat"
+lto = "thin"
 codegen-units = 1
+strip = "debuginfo"

data/README.md

@@ -24,10 +24,6 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'min_max'
-
-# or manually specify target . E.g.
-
-CARGO_BUILD_TARGET=x86_64-apple-darwin gem install min_max
 ```
 
 
@@ -40,6 +36,10 @@ bundle install
 Or install it yourself as:
 ```bash
 gem install min_max
+
+# or manually specify target . E.g.
+
+CARGO_BUILD_TARGET=x86_64-apple-darwin gem install min_max
 ```
 
 ## Usage

data/benchmarks/benchmarks.rb

@@ -0,0 +1,85 @@
+require "bundler/setup"
+require "min_max"
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'rb_heap'
+  gem 'algorithms'
+  gem 'ruby-heap'
+  gem 'pqueue'
+end
+
+require 'benchmark'
+require 'rb_heap'
+require 'min_max'
+
+
+data = 100_000.times.map{ Random.rand(0...1000_000_000) }
+rb_hp = Heap.new(:<)
+mm_hp = MinMax[]
+
+Benchmark.bm do |x|
+  x.report("push_rb_heap"){ data.each{|d| rb_hp.add(d) } }
+  x.report("push_mm_heap"){ data.each{|d| mm_hp.push(d) } }
+  x.report("push_mm_heap_batches"){ mm_hp = MinMax[]; data.each_slice(1000){|d| mm_hp.push(*d) } }
+end
+
+Benchmark.bm do |x|
+  x.report("pop_rb_heap"){ 100_000.times{|d| rb_hp.pop } }
+  x.report("pop_mm_heap"){ 100_000.times{|d| mm_hp.pop_min } }
+  x.report("pop_mm_heap_batches"){ 1000.times{|d| mm_hp.pop_min(100) } }
+end
+
+Object.send(:remove_const, :Heap)
+
+require 'Heap'
+puts "# ruby-heap vs min_max"
+ruby_hp = Heap::BinaryHeap::MinHeap.new
+mm_hp = MinMax[]
+
+Benchmark.bm do |x|
+  x.report("push_ruby_heap"){ data.each{|d| ruby_hp.add(d) } }
+  x.report("push_mm_heap"){ data.each{|d| mm_hp.push(d) } }
+  x.report("push_mm_heap_batches"){ mm_hp = MinMax[]; data.each_slice(1000){|d| mm_hp.push(*d) } }
+end
+
+Benchmark.bm do |x|
+  x.report("pop_ruby_heap"){ 100_000.times{|d| ruby_hp.extract_min! } }
+  x.report("pop_mm_heap"){ 100_000.times{|d| mm_hp.pop_min } }
+  x.report("pop_mm_heap_batches"){ 1000.times{|d| mm_hp.pop_min(100) } }
+end
+
+
+require 'algorithms'
+minheap = Containers::MinHeap.new()
+mm_hp = MinMax[]
+
+Benchmark.bm do |x|
+  x.report("push_algos_heap"){ data.each{|d| minheap.push(d) } }
+  x.report("push_mm_heap"){ data.each{|d| mm_hp.push(d) } }
+  x.report("push_mm_heap_batches"){ mm_hp = MinMax[]; data.each_slice(1000){|d| mm_hp.push(*d) } }
+end
+
+Benchmark.bm do |x|
+  x.report("pop_algos_heap"){ 100_000.times{|d| minheap.pop } }
+  x.report("pop_mm_heap"){ 100_000.times{|d| mm_hp.pop_min } }
+  x.report("pop_mm_heap_batches"){ 1000.times{|d| mm_hp.pop_min(100) } }
+end
+
+require 'pqueue'
+pqueue = PQueue.new()
+mm_hp = MinMax[]
+
+Benchmark.bm do |x|
+  x.report("push_algos_heap"){ data.each{|d| pqueue.push(d) } }
+  x.report("push_mm_heap"){ data.each{|d| mm_hp.push(d) } }
+  x.report("push_mm_heap_batches"){ mm_hp = MinMax[]; data.each_slice(1000){|d| mm_hp.push(*d) } }
+end
+
+Benchmark.bm do |x|
+  x.report("pop_algos_heap"){ 100_000.times{|d| minheap.pop } }
+  x.report("pop_mm_heap"){ 100_000.times{|d| mm_hp.pop_min } }
+  x.report("pop_mm_heap_batches"){ 1000.times{|d| mm_hp.pop_min(100) } }
+end

data/ext/min_max/src/lib.rs

@@ -52,9 +52,9 @@ impl RubyMinMaxHeap {
 
     fn push(&self, values: RArray) -> Result<(), Error> {
         let mut hp = self.heap.borrow_mut();
-        let values_vec = values.to_vec::<(i64, i64)>().unwrap();
-        values_vec.into_iter().for_each(|(priority, key)| {
-            hp.push(PriorityOrderableValue(priority, key));
+        let values_vec = values.to_vec::<(i64, i64)>()?;
+        values_vec.iter().for_each(|(priority, key)| {
+            hp.push(PriorityOrderableValue(*priority, *key));
         });
         Ok(())
     }

data/lib/min_max/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class MinMax
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/min_max.rb

@@ -6,7 +6,7 @@ require_relative "min_max/min_max"
 class MinMax
   class Error < StandardError; end
 
-  attr_reader :priority_blk, :storage, :counts, :mtx
+  attr_reader :priority_blk, :storage, :mtx
 
   def self.[](*args, &blk)
     new(*args, &blk)
@@ -15,9 +15,8 @@ class MinMax
   def self.new(*args, &blk)
     self._new.tap{|s|
       s.instance_eval{
-        @priority_blk = (blk || proc{|x| (x.respond_to?(:priority) ? x.priority : x.to_i ) rescue 0})
-        @storage = Hash.new
-        @counts = Hash.new(0)
+        @priority_blk = (blk || proc{|x| x.respond_to?(:priority) ? x.priority : x.to_i })
+        @storage = Hash.new{|h,k| h[k] = [0, nil] }
         @mtx  ||= Mutex.new
       }
       s.push(*args)
@@ -25,18 +24,17 @@ class MinMax
   end
 
   def push(*args)
-    mtx.synchronize do
-      mapped = args.map do |a|
-          self.counts[a.hash] += 1
-          self.storage[a.hash] = a
-          [
-            self.priority_blk.call(a),
-            a.hash
-          ]
-      end
-       _push(mapped)
+    mapped = args.map do |a|
+      hash = a.hash
+      entry = self.storage[hash]
+      entry[0] += 1
+      entry[1] ||= a
+      [
+        (self.priority_blk.call(a) rescue 0),
+        hash
+      ]
     end
-    self
+     _push(mapped)
   end
 
   def add(*args)
@@ -44,17 +42,13 @@ class MinMax
   end
 
   def pop_max(*args)
-    mtx.synchronize {
-      popped = _pop_max(*args)
-      popped.kind_of?(Array) ? popped.map{|p| retrieve(p) } : retrieve(popped)
-    }
+    popped = _pop_max(*args)
+    popped.kind_of?(Array) ? popped.map{|p| retrieve(p) } : retrieve(popped)
   end
 
   def pop_min(*args)
-    mtx.synchronize {
-      popped = _pop_min(*args)
-      popped.kind_of?(Array) ? popped.map{|p| retrieve(p) } : retrieve(popped)
-    }
+    popped = _pop_min(*args)
+    popped.kind_of?(Array) ? popped.map{|p| retrieve(p) } : retrieve(popped)
   end
 
   def peek_min(*args)
@@ -101,15 +95,9 @@ class MinMax
 
   private
   def retrieve(hash, remove=true)
-    if remove
-      if (self.counts[hash] -= 1) == 0
-        self.storage.delete(hash)
-      else
-        self.storage[hash]
-      end
-    else
-      self.storage[hash]
-    end
+    entry = self.storage[hash]
+    self.storage.delete(hash) if remove && (entry[0] -= 1) == 0
+    entry[1]
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: min_max
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -66,6 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/benchmarks.rb
 - ext/min_max/Cargo.toml
 - ext/min_max/extconf.rb
 - ext/min_max/src/lib.rs