algorithms 0.5.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 2710897393899fe90ddd5a3046f0fee0dd6d29aec842879ec28654e2767d1626
+  data.tar.gz: 8ccc55227d725e590ea965767765c29bb66211866cc948d81a3ed4997d6db733
+SHA512:
+  metadata.gz: 8fd77563ddfaecf2ab085f4ff9da6b49e0c63cb65ea666ebf737a3aee175498ddb481908b2135d3ae861ae51f756f9abc9749d27a91d802b4fd8c32965d8a117
+  data.tar.gz: d002eba1aa937be5f7afc70e32155dccb108ef5d71cc874729379b403534e34122311234aab35f05c4c1a2df5b0ecfc7fed32b645c2865d1a59b1b911a3564dd

data/CHANGELOG.markdown

@@ -1,3 +1,11 @@
+=== August 20, 2025
+
+    * Fix Heap not working in certain cases
+
+=== January 22, 2013
+    
+    * JRuby support
+
 === April 15, 2012
 
     * Use long instead of int for string methods

data/Gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gemspec
+
+group :development do
+    gem "rspec"
+    gem "rake-compiler"
+end
+

data/README.markdown

@@ -1,7 +1,6 @@
-# algorithms
+# algorithms [![Ruby CI](https://github.com/kanwei/algorithms/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/kanwei/algorithms/actions/workflows/ci.yml)
 
-* Official homes are here on github, and at [rubyforge](http://rubyforge.org/projects/algorithms/)
-* Documentation: [http://algorithms.rubyforge.org/](http://algorithms.rubyforge.org/)
+[API Documentation](http://kanwei.github.io/algorithms/)
 
 ## DESCRIPTION:
 
@@ -9,7 +8,9 @@ Started as a [Google Summer of Code 2008](http://code.google.com/soc/2008/ruby/a
 
 Written by [Kanwei Li](http://kanwei.com/), mentored by Austin Ziegler
 
-Original Proposal: Using the right data structure or algorithm for the situation is an important
+## Original Proposal: ##
+
+Using the right data structure or algorithm for the situation is an important
 aspect of programming. In computer science literature, many data structures
 and algorithms have been researched and extensively documented. However, there
 is still no standard library in Ruby implementing useful structures and
@@ -18,76 +19,48 @@ This project will create such a library with documentation on when to use a
 particular structure/algorithm. It will also come with a benchmark suite to
 compare performance in different situations.
 
-## FEATURES:
-
-Done so far:
-
-		* Heaps              Containers::Heap, Containers::MaxHeap, Containers::MinHeap
-		* Priority Queue     Containers::PriorityQueue
-		* Deque              Containers::Deque, Containers::CDeque (C extension), Containers::RubyDeque
-		* Stack              Containers::Stack (uses Deque)
-		* Queue              Containers::Queue (uses Deque)
-		* Red-Black Trees    Containers::RBTreeMap, Containers::CRBTreeMap (C extension), Containers::RubyRBTreeMap
-		* Splay Trees        Containers::SplayTreeMap, Containers::CSplayTreeMap (C extension), Containers::RubySplayTreeMap
-		* Tries              Containers::Trie
-		* Suffix Array       Containers::SuffixArray
-		* kd Tree   				 Containers::KDTree
-
-		* Search algorithms
-		  - Binary Search            Algorithms::Search.binary_search
-		  - Knuth-Morris-Pratt       Algorithms::Search.kmp_search
-		* Sort algorithms           
-		  - Bubble sort              Algorithms::Sort.bubble_sort
-		  - Comb sort                Algorithms::Sort.comb_sort
-		  - Selection sort           Algorithms::Sort.selection_sort
-		  - Heapsort                 Algorithms::Sort.heapsort
-		  - Insertion sort           Algorithms::Sort.insertion_sort
-		  - Shell sort               Algorithms::Sort.shell_sort
-		  - Quicksort                Algorithms::Sort.quicksort
-		  - Mergesort                Algorithms::Sort.mergesort
+## COMPLETED:
+
+    * Heaps              Containers::Heap, Containers::MaxHeap, Containers::MinHeap
+    * Priority Queue     Containers::PriorityQueue
+    * Deque              Containers::Deque, Containers::CDeque (C ext)
+    * Stack              Containers::Stack
+    * Queue              Containers::Queue
+    * Red-Black Trees    Containers::RBTreeMap, Containers::CRBTreeMap (C ext)
+    * Splay Trees        Containers::SplayTreeMap, Containers::CSplayTreeMap (C ext)
+    * Tries              Containers::Trie
+    * Suffix Array       Containers::SuffixArray
+
+    * Search algorithms
+      - Binary Search            Algorithms::Search.binary_search
+      - Knuth-Morris-Pratt       Algorithms::Search.kmp_search
+    * Sorting algorithms           
+      - Bubble sort              Algorithms::Sort.bubble_sort
+      - Comb sort                Algorithms::Sort.comb_sort
+      - Selection sort           Algorithms::Sort.selection_sort
+      - Heapsort                 Algorithms::Sort.heapsort
+      - Insertion sort           Algorithms::Sort.insertion_sort
+      - Shell sort               Algorithms::Sort.shell_sort
+      - Quicksort                Algorithms::Sort.quicksort
+      - Mergesort                Algorithms::Sort.mergesort
+      - Dual-Pivot Quicksort     Algorithms::Sort.dualpivotquicksort
 
 ## SYNOPSIS:
 
-		require 'rubygems'
-		require 'algorithms'
-		
-		max_heap = Containers::MaxHeap.new
-		
-		# To not have to type "Containers::" before each class, use:
-		include Containers
-		max_heap = MaxHeap.new
-
+    require 'rubygems'
+    require 'algorithms'
 
-## REQUIREMENTS:
+    max_heap = Containers::MaxHeap.new
 
-* Ruby 1.8 compatible Ruby, or Ruby 1.9
-* C compiler for C extensions (optional, but very much recommended for vast performance benefits)
+    # To not have to type "Containers::" before each class, use:
+    include Containers
+    max_heap = MaxHeap.new
 
-## INSTALL:
+## REQUIREMENTS:
 
-* sudo gem install algorithms
+* Ruby 1.8, Ruby 1.9, JRuby
+* C extensions (optional, but very much recommended for vast performance benefits)
 
 ## LICENSE:
 
-(The MIT License)
-
-Algorithms and Containers project is Copyright (c) 2009 Kanwei Li
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+See [LICENSE.md](LICENSE.md).

data/Rakefile

@@ -1,13 +1,22 @@
 require 'rubygems'
-require 'echoe'
- 
-Echoe.new('algorithms') do |p|
-  p.author               = 'Kanwei Li'
-  p.email                = 'kanwei@gmail.com'
-  p.summary              = 'A library of algorithms and data structures (containers).'
-  p.url                  = 'https://rubygems.org/gems/algorithms'
-  p.version              = "0.5.0"
-  p.retain_gemspec       = true
-  p.runtime_dependencies = []
-  p.development_dependencies = ["rspec", "echoe"]
+require 'rake/extensiontask'
+require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
+
+Rake::ExtensionTask.new('algorithms/string')        { |ext| ext.name = "CString" }
+Rake::ExtensionTask.new('containers/deque')         { |ext| ext.name = "CDeque" }
+Rake::ExtensionTask.new('containers/bst')           { |ext| ext.name = "CBst" }
+Rake::ExtensionTask.new('containers/rbtree_map')    { |ext| ext.name = "CRBTreeMap" }
+Rake::ExtensionTask.new('containers/splaytree_map') { |ext| ext.name = "CSplayTreeMap" }
+
+RSpec::Core::RakeTask.new
+
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  task :default => [:spec]
+else
+  task :default => [:compile, :spec]
 end
+
+task :rdoc do
+    `rdoc -f hanna --main algorithms.rb -t "Ruby Algorithms and Containers Documentation"`
+end

data/algorithms.gemspec

@@ -2,35 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = "algorithms"
-  s.version = "0.5.0"
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kanwei Li"]
-  s.date = "2012-04-25"
-  s.description = "A library of algorithms and data structures (containers)."
   s.email = "kanwei@gmail.com"
-  s.extensions = ["ext/algorithms/string/extconf.rb", "ext/containers/bst/extconf.rb", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/splaytree_map/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG.markdown", "README.markdown", "ext/algorithms/string/extconf.rb", "ext/algorithms/string/string.c", "ext/containers/bst/bst.c", "ext/containers/bst/extconf.rb", "ext/containers/deque/deque.c", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/rbtree_map/rbtree.c", "ext/containers/splaytree_map/extconf.rb", "ext/containers/splaytree_map/splaytree.c", "lib/algorithms.rb", "lib/algorithms/search.rb", "lib/algorithms/sort.rb", "lib/algorithms/string.rb", "lib/containers/deque.rb", "lib/containers/heap.rb", "lib/containers/kd_tree.rb", "lib/containers/priority_queue.rb", "lib/containers/queue.rb", "lib/containers/rb_tree_map.rb", "lib/containers/splay_tree_map.rb", "lib/containers/stack.rb", "lib/containers/suffix_array.rb", "lib/containers/trie.rb"]
-  s.files = ["CHANGELOG.markdown", "Manifest", "README.markdown", "Rakefile", "algorithms.gemspec", "benchmarks/deque.rb", "benchmarks/sorts.rb", "benchmarks/treemaps.rb", "ext/algorithms/string/extconf.rb", "ext/algorithms/string/string.c", "ext/containers/bst/bst.c", "ext/containers/bst/extconf.rb", "ext/containers/deque/deque.c", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/rbtree_map/rbtree.c", "ext/containers/splaytree_map/extconf.rb", "ext/containers/splaytree_map/splaytree.c", "lib/algorithms.rb", "lib/algorithms/search.rb", "lib/algorithms/sort.rb", "lib/algorithms/string.rb", "lib/containers/deque.rb", "lib/containers/heap.rb", "lib/containers/kd_tree.rb", "lib/containers/priority_queue.rb", "lib/containers/queue.rb", "lib/containers/rb_tree_map.rb", "lib/containers/splay_tree_map.rb", "lib/containers/stack.rb", "lib/containers/suffix_array.rb", "lib/containers/trie.rb", "spec/bst_gc_mark_spec.rb", "spec/bst_spec.rb", "spec/deque_gc_mark_spec.rb", "spec/deque_spec.rb", "spec/heap_spec.rb", "spec/kd_expected_out.txt", "spec/kd_test_in.txt", "spec/kd_tree_spec.rb", "spec/map_gc_mark_spec.rb", "spec/priority_queue_spec.rb", "spec/queue_spec.rb", "spec/rb_tree_map_spec.rb", "spec/search_spec.rb", "spec/sort_spec.rb", "spec/splay_tree_map_spec.rb", "spec/stack_spec.rb", "spec/string_spec.rb", "spec/suffix_array_spec.rb", "spec/trie_spec.rb"]
-  s.homepage = "https://rubygems.org/gems/algorithms"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Algorithms", "--main", "README.markdown"]
-  s.require_paths = ["lib", "ext"]
-  s.rubyforge_project = "algorithms"
-  s.rubygems_version = "1.8.15"
-  s.summary = "A library of algorithms and data structures (containers)."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
-    end
+  s.license = 'MIT'
+  s.date = "2023-11-11"
+  s.summary = "Useful algorithms and data structures for Ruby. Optional C extensions."
+  s.description = "Heap, Priority Queue, Deque, Stack, Queue, Red-Black Trees, Splay Trees, sorting algorithms, and more"
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    s.platform = "java"
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
+    s.extensions = ["ext/algorithms/string/extconf.rb", "ext/containers/bst/extconf.rb", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/splaytree_map/extconf.rb"]
   end
+  s.files = ["Gemfile", "CHANGELOG.markdown", "Manifest", "README.markdown", "Rakefile", "algorithms.gemspec", "benchmarks/deque.rb", "benchmarks/sorts.rb", "benchmarks/treemaps.rb", "ext/algorithms/string/extconf.rb", "ext/algorithms/string/string.c", "ext/containers/bst/bst.c", "ext/containers/bst/extconf.rb", "ext/containers/deque/deque.c", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/rbtree_map/rbtree.c", "ext/containers/splaytree_map/extconf.rb", "ext/containers/splaytree_map/splaytree.c", "lib/algorithms.rb", "lib/algorithms/search.rb", "lib/algorithms/sort.rb", "lib/algorithms/string.rb", "lib/containers/deque.rb", "lib/containers/heap.rb", "lib/containers/kd_tree.rb", "lib/containers/priority_queue.rb", "lib/containers/queue.rb", "lib/containers/rb_tree_map.rb", "lib/containers/splay_tree_map.rb", "lib/containers/stack.rb", "lib/containers/suffix_array.rb", "lib/containers/trie.rb", "spec/bst_gc_mark_spec.rb", "spec/bst_spec.rb", "spec/deque_gc_mark_spec.rb", "spec/deque_spec.rb", "spec/heap_spec.rb", "spec/kd_expected_out.txt", "spec/kd_test_in.txt", "spec/kd_tree_spec.rb", "spec/map_gc_mark_spec.rb", "spec/priority_queue_spec.rb", "spec/queue_spec.rb", "spec/rb_tree_map_spec.rb", "spec/search_spec.rb", "spec/sort_spec.rb", "spec/splay_tree_map_spec.rb", "spec/stack_spec.rb", "spec/string_spec.rb", "spec/suffix_array_spec.rb", "spec/trie_spec.rb"]
+  s.homepage = "https://github.com/kanwei/algorithms"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Algorithms", "--main", "README.markdown"]
+  s.require_paths = ["lib", "ext"]
 end

data/ext/algorithms/string/string.c

@@ -26,7 +26,7 @@ long levenshtein_distance(VALUE str1, VALUE str2) {
 	s1_len++;
 	s2_len++;
 	
-	d = malloc(sizeof(typeof(d)) * (s1_len) * (s2_len));
+	d = xmalloc(sizeof(typeof(d)) * s1_len * s2_len);
 	
 	for (i = 0; i < s1_len; i++) {
 		d[i] = i; // d[i, 0] = i
@@ -49,7 +49,7 @@ long levenshtein_distance(VALUE str1, VALUE str2) {
 		}
 	}
 	i = d[s1_len * s2_len -1];
-	free(d);
+	xfree(d);
 	return i;
 }
 

data/ext/containers/bst/bst.c

@@ -172,7 +172,7 @@ static void recursively_free_nodes(bst_node *node) {
 	if(node) {
 		recursively_free_nodes(node->left);
 		recursively_free_nodes(node->right);
-		free(node);
+		xfree(node);
 	}
 }
 

data/ext/containers/deque/deque.c

@@ -19,7 +19,7 @@ void free_nodes(deque_node *node) {
 	deque_node *next;
 	while(node) {
 		next = node->right;
-		free(node);
+		xfree(node);
 		node = next;
 	}
 	return;
@@ -71,7 +71,7 @@ static void deque_free(void *ptr) {
 	if (ptr) {
 		deque *deque = ptr;
 		free_nodes(deque->front);
-		free(deque);
+		xfree(deque);
 	}
 }
 

data/ext/containers/rbtree_map/rbtree.c

@@ -31,7 +31,7 @@ static void recursively_free_nodes(rbtree_node *node) {
 	if(node) {
 		recursively_free_nodes(node->left);
 		recursively_free_nodes(node->right);
-		free(node);
+		xfree(node);
 	}
 	return;
 }
@@ -198,7 +198,7 @@ static rbtree_node* delete_min(rbtree_node *h, VALUE *deleted_value) {
 	if ( !h->left ) {
 		if(deleted_value)
 			*deleted_value = h->value;
-		free(h);
+		xfree(h);
 		return NULL;
 	}
 	
@@ -216,7 +216,7 @@ static rbtree_node* delete_max(rbtree_node *h, VALUE *deleted_value) {
 
 	if ( !h->right ) {
 		*deleted_value = h->value;
-		free(h);
+		xfree(h);
 		return NULL;
 	}
 
@@ -245,7 +245,7 @@ static rbtree_node* delete(rbtree *tree, rbtree_node *node, VALUE key, VALUE *de
 		cmp = tree->compare_function(key, node->key);
 		if ( (cmp == 0) && !node->right ) {
 			*deleted_value = node->value;
-			free(node);
+			xfree(node);
 			return NULL;
 		}
 
@@ -339,7 +339,7 @@ static void rbtree_mark(void *ptr) {
 				}
 				old = current;
 				current = current->next;
-				free(old);
+				xfree(old);
 			}
 		}
 	}
@@ -349,7 +349,7 @@ static void rbtree_free(void *ptr) {
 	if (ptr) {
 		rbtree *tree = ptr;
 		recursively_free_nodes(tree->root);
-		free(tree);
+		xfree(tree);
 	}
 }
 

data/ext/containers/splaytree_map/splaytree.c

@@ -28,7 +28,7 @@ static void recursively_free_nodes(splaytree_node *node) {
 	if(node) {
 		recursively_free_nodes(node->left);
 		recursively_free_nodes(node->right);
-		free(node);
+		xfree(node);
 	}
 	return;
 }
@@ -199,7 +199,7 @@ static splaytree_node* delete(splaytree *tree, splaytree_node *n, VALUE key, VAL
 			x = splay(tree, n->left, key);
 			x->right = n->right;
 		}
-		free(n);
+		xfree(n);
 		if (x) {
 			x->size = tsize-1;
 		}
@@ -282,7 +282,7 @@ static void splaytree_mark(void *ptr) {
 				}
 				old = current;
 				current = current->next;
-				free(old);
+				xfree(old);
 			}
 		}
 	}
@@ -292,7 +292,7 @@ static void splaytree_free(void *ptr) {
 	if (ptr) {
 		splaytree *tree = ptr;
 		recursively_free_nodes(tree->root);
-		free(tree);
+		xfree(tree);
 	}
 }
 

data/lib/algorithms/sort.rb

@@ -235,4 +235,134 @@ module Algorithms::Sort
     sorted + left + right
   end
 
+  # Dual-Pivot Quicksort is a variation of Quicksort by Vladimir Yaroslavskiy.
+  # This is an implementation of the algorithm as it was found in the original
+  # research paper:
+  # 
+  # http://iaroslavski.narod.ru/quicksort/DualPivotQuicksort.pdf
+  # 
+  # Mirror:
+  # http://codeblab.com/wp-content/uploads/2009/09/DualPivotQuicksort.pdf
+  #
+  # "This algorithm offers O(n log(n)) performance on many data sets that cause
+  # other quicksorts to degrade to quadratic performance, and is typically 
+  # faster than traditional (one-pivot) Quicksort implementations."
+  #   -- http://download.oracle.com/javase/7/docs/api/java/util/Arrays.html
+  #
+  # The algorithm was improved by Vladimir Yaroslavskiy, Jon Bentley, and 
+  # Joshua Bloch, and was implemented as the default sort algorithm for
+  # primatives in Java 7.
+  #
+  # Implementation in the Java JDK as of November, 2011:
+  # http://www.docjar.com/html/api/java/util/DualPivotQuicksort.java.html
+  #
+  # It is proved that for the Dual-Pivot Quicksort the average number 
+  # of comparisons is 2*n*ln(n), the average number of swaps is 
+  # 0.8*n*ln(n), whereas classical Quicksort algorithm has 2*n*ln(n) 
+  # and 1*n*ln(n) respectively. This has been fully examined mathematically
+  # and experimentally.
+  #
+  # Requirements: Container should implement #pop and include the Enumerable module.
+  # Time Complexity: О(n log n) average, О(n log n) worst-case
+  # Space Complexity: О(n) auxiliary
+  #
+  # Stable: No
+  # 
+  #   Algorithms::Sort.dualpivotquicksort [5, 4, 3, 1, 2] => [1, 2, 3, 4, 5]
+
+  def self.dualpivotquicksort(container)
+    return container if container.size <= 1
+    dualpivot(container, 0, container.size-1, 3)
+  end
+ 
+  def self.dualpivot(container, left=0, right=container.size-1, div=3)
+    length = right - left
+    if length < 27 # insertion sort for tiny array
+      container.each_with_index do |data,i|
+        j = i - 1
+        while j >= 0
+          break if container[j] <= data
+          container[j + 1] = container[j]
+          j = j - 1
+        end
+        container[j + 1] = data
+      end
+    else # full dual-pivot quicksort
+      third = length / div
+      # medians
+      m1 = left + third
+      m2 = right - third
+      if m1 <= left 
+        m1 = left + 1
+      end
+      if m2 >= right
+        m2 = right - 1
+      end
+      if container[m1] < container[m2]
+        dualpivot_swap(container, m1, left)
+        dualpivot_swap(container, m2, right)
+      else
+        dualpivot_swap(container, m1, right)
+        dualpivot_swap(container, m2, left)
+      end
+      # pivots
+      pivot1 = container[left]
+      pivot2 = container[right]
+      # pointers
+      less = left + 1
+      great = right - 1
+      # sorting
+      k = less
+      while k <= great
+        if container[k] < pivot1
+          dualpivot_swap(container, k, less += 1)
+        elsif container[k] > pivot2
+          while k < great && container[great] > pivot2
+            great -= 1
+          end
+          dualpivot_swap(container, k, great -= 1)
+          if container[k] < pivot1
+            dualpivot_swap(container, k, less += 1)
+          end
+        end
+        k += 1
+      end
+      # swaps
+      dist = great - less
+      if dist < 13
+        div += 1
+      end
+      dualpivot_swap(container, less-1, left)
+      dualpivot_swap(container, great+1, right)
+      # subarrays
+      dualpivot(container, left, less-2, div)
+      dualpivot(container, great+2, right, div)
+      # equal elements
+      if dist > length - 13 && pivot1 != pivot2
+        for k in less..great do
+          if container[k] == pivot1
+            dualpivot_swap(container, k, less)
+            less += 1
+          elsif container[k] == pivot2
+            dualpivot_swap(container, k, great)
+            great -= 1
+            if container[k] == pivot1
+              dualpivot_swap(container, k, less)
+              less += 1
+            end
+          end
+        end
+      end
+      # subarray
+      if pivot1 < pivot2
+        dualpivot(container, less, great, div)
+      end
+      container
+    end
+  end
+
+  def self.dualpivot_swap(container, i, j)
+    container[i],  container[j] = container[j],  container[i]
+  end
 end
+

data/lib/algorithms/string.rb

@@ -5,4 +5,5 @@
 
 begin
   require 'CString'
+rescue LoadError
 end

data/lib/algorithms.rb

@@ -43,6 +43,7 @@
     - Shell sort            - Algorithms::Sort.shell_sort
     - Quicksort             - Algorithms::Sort.quicksort
     - Mergesort             - Algorithms::Sort.mergesort
+    - Dual-Pivot Quicksort  - Algorithms::Sort.dualpivotquicksort
   * String algorithms
     - Levenshtein distance  - Algorithms::String.levenshtein_dist
 =end

data/lib/containers/heap.rb

@@ -10,7 +10,6 @@
     This library implements a Fibonacci heap, which allows O(1) complexity for most methods.
 =end
 class Containers::Heap
-  include Enumerable
   
   # call-seq:
   #     size -> int
@@ -75,13 +74,6 @@ class Containers::Heap
     end
     @size += 1
     
-    arr = []
-    w = @next.right
-    until w == @next do
-      arr << w.value
-      w = w.right
-    end
-    arr << @next.value
     @stored[key] ||= []
     @stored[key] << node
     value
@@ -376,7 +368,7 @@ class Containers::Heap
           degree += 1
         end
         degrees[degree] = root
-        min = root if min.key == root.key # this fixes a bug with duplicate keys not being in the right order
+        min = root if !@compare_fn[min.key, root.key] # this fixes a bug with duplicate keys not being in the right order
       end
     end
     @next = min

data/lib/containers/priority_queue.rb

@@ -10,7 +10,6 @@ require 'containers/heap'
     This container is implemented using the Fibonacci heap included in the Collections library.
 =end
 class Containers::PriorityQueue
-  include Enumerable
   
   # Create a new, empty PriorityQueue
   def initialize(&block)

data/lib/containers/rb_tree_map.rb

@@ -15,7 +15,7 @@ require 'containers/stack'
     explicitly used as well; their functionality is identical.
     
     Most methods have O(log n) complexity.
-    
+
 =end
 class Containers::RubyRBTreeMap
   include Enumerable
@@ -160,7 +160,7 @@ class Containers::RubyRBTreeMap
     result
   end
   
-  # Deletes the item with the smallest key and returns the item. Returns nil
+  # Deletes the item with the largest key and returns the item. Returns nil
   # if key is not present.
   #
   # Complexity: O(log n)

data/lib/containers/suffix_array.rb

@@ -12,10 +12,10 @@ class Containers::SuffixArray
   #
   # Complexity: O(n^2 log n)
   #
-  #   s_array = Containers::SuffixArray("abracadabra")
+  #   s_array = Containers::SuffixArray.new("abracadabra")
   #   s_array["abra"] #=> true
   #
-  #   number = Containers::SuffixArray(1234567)
+  #   number = Containers::SuffixArray.new(1234567)
   #   number[1] #=> true
   #   number[13] #=> false 
   def initialize(string)
@@ -65,4 +65,4 @@ class Containers::SuffixArray
     return false
   end
   alias_method :[], :has_substring?
-end
+end

data/lib/containers/trie.rb

@@ -13,7 +13,7 @@ class Containers::Trie
   #
   #   t = Containers::Trie.new
   #   t["hello"] = "world"
-  #   t["hello] #=> "world"
+  #   t["hello"] #=> "world"
   def initialize
     @root = nil
   end

data/spec/deque_gc_mark_spec.rb

@@ -12,7 +12,7 @@ if defined? Containers::CDeque
       # Check if any instances were swept
       count = 0
       ObjectSpace.each_object(anon_class) { |x| count += 1 }
-      count.should eql(100)
+      expect(count).to eql(100)
     end
   end
 end