min_max 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1020f3ac8e632e3b2b4d99318a78edf48a06d3099e5812637d8dfd5fdf1623
-  data.tar.gz: b774055ca657edf4a01712a71020cbb55df034e38f3db676b0c85484ae1f155e
+  metadata.gz: 48b9b64396908ffd54a712e8a8e9b4eb6546e0538a6c168a69d67304dc6fcf1d
+  data.tar.gz: 487b79da6a3a3f99ab408af1feb17ebe33c21c08b7c64b9e20e5b259bcf764bf
 SHA512:
-  metadata.gz: 2c7a1e0c3893382526f5c94c488618a3d01b7e19aa3a6d1b3cfc0aa012ede494bfb033c1b9544224bcfa3f9147d3d96779d11c83f2723a384c36109c5f837dba
-  data.tar.gz: 4c60344475780f72a7369cac4fc0a22e156750fee690b326a2cbc9b6d1c492446f05dbdda5e39910e9f9549b848730ade850fda8e282d418ba1fa0e8e8c19793
+  metadata.gz: '086026e3dfe0851390e4090e700aed60a27eaaf70ae53beb9a50164fd78a024797513994b2bd3c67995b29a655c6c8ca755b19ff42797e12190fae9bac10f4c6'
+  data.tar.gz: b7cebaf1da79607d638628c1ef2d54ff11126902e9c1072d4c2bfd1db883db662d323c9e760134c76941747f447494141122e2a4dad6dd0ddc9a65682bfcfd9f

data/README.md

@@ -1,7 +1,8 @@
-# MinMax
+# MinMax Heap
 
-The MinMax gem provides a high-performance minmax heap implementation for Ruby, written in Rust. 
-This gem allows for the creation of a min-max-heap and supporting operations like pushing and popping multiple items, iterating over heap items, and converting heaps to arrays. 
+The MinMax Heap gem provides a high-performance minmax heap implementation for Ruby, written in Rust. 
+The gem wraps the excellent [min-max-heap-rs](https://github.com/tov/min-max-heap-rs) Rust library.
+It allows for the creation of a min-max-heap and supporting operations like pushing and popping multiple items, iterating over heap items, and converting heaps to arrays. 
 
 ## Features
 
@@ -23,8 +24,13 @@ 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
 ```
 
+
 And then execute:
 
 ```bash
@@ -84,4 +90,13 @@ heap.length # Alias for size
 heap.clear
 ```
 
+## Count number of times an item is in the heap
+```ruby
+heap.count(item)
+```
+
+## Check if item is contained in the heap
+```ruby
+heap.contains?(item)
+```
 

data/ext/min_max/src/lib.rs

@@ -1,5 +1,5 @@
 use magnus::scan_args::scan_args;
-use magnus::value::{BoxValue, ReprValue};
+use magnus::value::ReprValue;
 use magnus::{
     block::{block_given, Yield},
     define_class, function, method,
@@ -9,32 +9,11 @@ use magnus::{
 use magnus::{DataTypeFunctions, Integer, TypedData};
 use min_max_heap::MinMaxHeap;
 use std::cell::RefCell;
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::rc::Rc;
 
 #[derive(Debug, Clone)]
 struct PriorityOrderableValue(i64, i64);
 
-#[macro_use]
-extern crate lazy_static;
-
-struct MEM(
-    RwLock<HashMap<i64, BoxValue<Value>>>,
-    RwLock<HashMap<i64, RefCell<usize>>>,
-);
-
-impl MEM {
-    fn new() -> Self {
-        MEM(RwLock::new(HashMap::new()), RwLock::new(HashMap::new()))
-    }
-}
-
-unsafe impl Sync for MEM {}
-
-lazy_static! {
-    static ref MEMORY: MEM = MEM::new();
-}
-
 impl PartialOrd for PriorityOrderableValue {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         Some(self.cmp(other))
@@ -43,9 +22,8 @@ impl PartialOrd for PriorityOrderableValue {
 
 impl Ord for PriorityOrderableValue {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match (self, other) {
-            (PriorityOrderableValue(p1, _), PriorityOrderableValue(p2, _)) => p1.cmp(p2),
-        }
+        let (PriorityOrderableValue(p1, _), PriorityOrderableValue(p2, _)) = (self, other);
+        p1.cmp(p2)
     }
 }
 
@@ -53,11 +31,8 @@ impl Eq for PriorityOrderableValue {}
 
 impl PartialEq for PriorityOrderableValue {
     fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (PriorityOrderableValue(p1, v1), PriorityOrderableValue(p2, v2)) => {
-                p1.eq(p2) && (v1).eq(v2)
-            }
-        }
+        let (PriorityOrderableValue(p1, v1), PriorityOrderableValue(p2, v2)) = (self, other);
+        p1.eq(p2) && (v1).eq(v2)
     }
 }
 
@@ -65,13 +40,13 @@ unsafe impl Send for RubyMinMaxHeap {}
 #[derive(DataTypeFunctions, TypedData, Clone)]
 #[magnus(class = "MinMax", size, free_immediately, mark)]
 struct RubyMinMaxHeap {
-    heap: Arc<RefCell<MinMaxHeap<PriorityOrderableValue>>>,
+    heap: Rc<RefCell<MinMaxHeap<PriorityOrderableValue>>>,
 }
 
 impl RubyMinMaxHeap {
     fn new() -> Result<Self, Error> {
         Ok(RubyMinMaxHeap {
-            heap: Arc::new(RefCell::new(MinMaxHeap::new())),
+            heap: Rc::new(RefCell::new(MinMaxHeap::new())),
         })
     }
 
@@ -213,8 +188,8 @@ impl RubyMinMaxHeap {
         Ok(ary)
     }
 
-    fn clear(&self) -> Option<()> {
-        Some(self.heap.borrow_mut().clear())
+    fn clear(&self) {
+        self.heap.borrow_mut().clear()
     }
 }
 

data/lib/min_max/version.rb

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

data/lib/min_max.rb

@@ -6,40 +6,31 @@ require_relative "min_max/min_max"
 class MinMax
   class Error < StandardError; end
 
+  attr_reader :priority_blk, :storage, :counts, :mtx
+
   def self.[](*args, &blk)
     new(*args, &blk)
   end
 
   def self.new(*args, &blk)
     self._new.tap{|s|
-      s.priority_blk =(blk || proc{|x| (x.respond_to?(:priority) ? x.priority : x.to_i ) rescue 0})
+      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)
+        @mtx  ||= Mutex.new
+      }
       s.push(*args)
     }
   end
 
-  def priority_blk=(bll)
-    @priority_blk = bll
-  end
-
-  def storage
-    @storage ||= Hash.new
-  end
-
-  def counts
-    @counts ||= Hash.new(0)
-  end
-
-  def mtx
-    @_mtx  ||= Mutex.new
-  end
-
   def push(*args)
     mtx.synchronize do
       mapped = args.map do |a|
-          counts[a.hash] += 1
-          storage[a.hash] = a
+          self.counts[a.hash] += 1
+          self.storage[a.hash] = a
           [
-            @priority_blk.call(a),
+            self.priority_blk.call(a),
             a.hash
           ]
       end
@@ -66,18 +57,6 @@ class MinMax
     }
   end
 
-  def retrieve(hash, remove=true)
-    if remove
-      if (counts[hash] -= 1) == 0
-        storage.delete(hash)
-      else
-        storage[hash]
-      end
-    else
-      storage[hash]
-    end
-  end
-
   def peek_min(*args)
     peeked = _peek_min(*args)
     peeked.kind_of?(Array) ? peeked.map{|p| retrieve(p, false) } : retrieve(popped, false)
@@ -100,6 +79,14 @@ class MinMax
     each.to_a
   end
 
+  def count(val)
+    counts.has_key?(val.hash) ? counts[val.hash] : 0
+  end
+
+  def contains?(val)
+    counts.has_key?(val.hash) && counts[val.hash] > 0
+  end
+
   def to_a_asc
     mtx.synchronize { _to_a_asc.map{|p| retrieve(p, false) } }
   end
@@ -109,7 +96,21 @@ class MinMax
   end
 
   def inspect
-    "MinMax[#{to_a_asc.first(10).map{|v| v.to_s}.join(", ")}#{size > 10 ? ", ..." : ""}]"
+    "MinMax[#{_each.first(10).map{|v| retrieve(v, false).to_s }.join(", ")}#{size > 10 ? ", ..." : ""}]"
   end
+
+  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
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: min_max
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wouter Coppieters