d_heap 0.2.2 → 0.6.1

data/lib/d_heap/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class DHeap
-  VERSION = "0.2.2"
+  VERSION = "0.6.1"
 
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: d_heap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.6.1
 platform: ruby
 authors:
 - nicholas a. evans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
-dependencies: []
+date: 2021-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark_driver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   A C extension implementation of a d-ary heap data structure, suitable for
   use in e.g. priority queues or Djikstra's algorithm.
@@ -25,22 +53,48 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- N
 - README.md
 - Rakefile
+- benchmarks/perf.rb
+- benchmarks/push_n.yml
+- benchmarks/push_n_pop_n.yml
+- benchmarks/push_pop.yml
+- benchmarks/stackprof.rb
+- bin/bench_charts
+- bin/bench_n
+- bin/benchmark-driver
+- bin/benchmarks
 - bin/console
+- bin/profile
 - bin/rake
 - bin/rspec
 - bin/rubocop
 - bin/setup
 - d_heap.gemspec
+- docs/benchmarks-2.txt
+- docs/benchmarks-mem.txt
+- docs/benchmarks.txt
+- docs/profile.txt
 - ext/d_heap/d_heap.c
-- ext/d_heap/d_heap.h
 - ext/d_heap/extconf.rb
+- images/push_n.png
+- images/push_n_pop_n.png
+- images/push_pop.png
+- images/wikipedia-min-heap.png
+- lib/benchmark_driver/runner/ips_zero_fail.rb
 - lib/d_heap.rb
+- lib/d_heap/benchmarks.rb
+- lib/d_heap/benchmarks/benchmarker.rb
+- lib/d_heap/benchmarks/implementations.rb
+- lib/d_heap/benchmarks/profiler.rb
+- lib/d_heap/benchmarks/rspec_matchers.rb
 - lib/d_heap/version.rb
 homepage: https://github.com/nevans/d_heap
 licenses:
@@ -48,7 +102,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/nevans/d_heap
   source_code_uri: https://github.com/nevans/d_heap
-  changelog_uri: https://github.com/nevans/d_heap/blob/master/Changelog.md
+  changelog_uri: https://github.com/nevans/d_heap/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -57,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ext/d_heap/d_heap.h

@@ -1,65 +0,0 @@
-#ifndef D_HEAP_H
-#define D_HEAP_H 1
-
-#include "ruby.h"
-
-// d=4 uses the fewest comparisons for insert + delete-min (in the worst case).
-#define DHEAP_DEFAULT_D 4
-
-// This is a somewhat arbitary maximum. But benefits from more leaf nodes
-// are very unlikely to outweigh the increasinly higher number of worst-case
-// comparisons as d gets further from 4.
-#define DHEAP_MAX_D 32
-
-VALUE rb_cDHeap;
-
-#define CMP_LT(a, b)  (optimized_cmp(a, b) <  0)
-#define CMP_LTE(a, b) (optimized_cmp(a, b) <= 0)
-#define CMP_GT(a, b)  (optimized_cmp(a, b) >  0)
-#define CMP_GTE(a, b) (optimized_cmp(a, b) >= 0)
-
-// <=>
-ID id_cmp;
-
-// from internal/compar.h
-#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString)
-
-/*
- * short-circuit evaluation for a few basic types.
- *
- * Only Integer, Float, and String are optimized,
- * and only when both arguments are the same type.
- */
-static inline int
-optimized_cmp(VALUE a, VALUE b) {
-    if (a == b) // Fixnum equality and object equality
-        return 0;
-    if (FIXNUM_P(a) && FIXNUM_P(b))
-        return (FIX2LONG(a) < FIX2LONG(b)) ? -1 : 1;
-    if (RB_FLOAT_TYPE_P(a) && RB_FLOAT_TYPE_P(b))
-    {
-        double x, y;
-        x = RFLOAT_VALUE(a);
-        y = RFLOAT_VALUE(b);
-        if (isnan(x) || isnan(y)) rb_cmperr(a, b); // raise ArgumentError
-        return (x < y) ? -1 : ((x == y) ? 0 : 1);
-    }
-    if (RB_TYPE_P(a, T_BIGNUM) && RB_TYPE_P(b, T_BIGNUM))
-        return FIX2INT(rb_big_cmp(a, b));
-    if (STRING_P(a) && STRING_P(b))
-        return rb_str_cmp(a, b);
-
-    // give up on an optimized version and just call (a <=> b)
-    return rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b);
-}
-
-#ifdef __D_HEAP_DEBUG
-#define debug(v) { \
-    ID sym_puts = rb_intern("puts"); \
-    rb_funcall(rb_mKernel, sym_puts, 1, v); \
-}
-#else
-#define debug(v)
-#endif
-
-#endif /* D_HEAP_H */