red-black-tree 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e772062ad3ed9928eff044fa4e40bbd80dd0ab121a0c9cb2982969159bcf1ef
-  data.tar.gz: ad53b47275b4c5ad04a80faf5e05a06e5e7576cb33f7d232e502c30b1a4455c8
+  metadata.gz: da41036d61ffc0739627740b631dbb00df76ee87a5db6145ad508569552703c3
+  data.tar.gz: 99172cd947f7714788dadd94068ff637bdfa510ae78367a4689a892dc4ad1a05
 SHA512:
-  metadata.gz: 856164178d9887beec334f8a2fea1a51f60cf3f822a427a2a232847720a9c016250404e2af244962fe4033dbfaecfb447c3e746c3ebbe6861c77dab3ed6b3216
-  data.tar.gz: c1a13b5313f3b31c9a0aab24e708e556ac9b707ea53ed539f7aaaa7fa6264eb17ca2205be6efdc1690277acb3d8ea09536590d1b5864e133fa9d649740d1fc51
+  metadata.gz: 96e4b84d481b71cf8f3e45b728d19c1417f50c68ea9a9b8acdbd35a3514c8ab154df42ef7b3542ff0655e45c76a2f39b2a4a7ad6131a2c238fd7b126bddc29bd
+  data.tar.gz: 54a7743f84d5748e830dee7ed27c66f34c9517d4977b496c74cc6aa194b0fbef175f5ad7bd3d7420ce64f68298ff4bf529b9d1664966c94007db5fd1cc76d35d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.1.6] - 2025-01-01
+
+- Prefer node deletion over data swapping
+
+## [0.1.5] - 2024-10-28
+
+- Alias `RedBlackTree#search` as `RedBlackTree#find`
+- Add `RedBlackTree#select`, aliased as `RedBlackTree#filter` and `RedBlackTree#find_all`
+
 ## [0.1.4] - 2024-10-27
 
 - Fix incorrect `super` fallback in `RedBlackTree::DataDelegation#respond_to_missing?`

data/README.md

@@ -83,20 +83,20 @@ Benchmark.ips do |x|
   x.compare!
 end
 
-#=> ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [arm64-darwin24]
+#=> ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +YJIT +PRISM [arm64-darwin24]
 #=> Warming up --------------------------------------
 #=>         RedBlackTree     1.000 i/100ms
 #=> Array (gradual sort)     1.000 i/100ms
-#=>  Array (single sort)    78.000 i/100ms
+#=>  Array (single sort)   100.000 i/100ms
 #=> Calculating -------------------------------------
-#=>         RedBlackTree      5.417 (± 0.0%) i/s  (184.61 ms/i) -     28.000 in   5.172532s
-#=> Array (gradual sort)      0.268 (± 0.0%) i/s     (3.74 s/i) -      2.000 in   7.473005s
-#=>  Array (single sort)    768.691 (± 2.2%) i/s    (1.30 ms/i) -      3.900k in   5.076337s
+#=>         RedBlackTree     16.684 (± 6.0%) i/s   (59.94 ms/i) -     84.000 in   5.053688s
+#=> Array (gradual sort)      0.270 (± 0.0%) i/s     (3.71 s/i) -      2.000 in   7.418650s
+#=>  Array (single sort)     1.006k (± 2.4%) i/s  (994.28 μs/i) -      5.100k in   5.073834s
 #=>
 #=> Comparison:
-#=>  Array (single sort):      768.7 i/s
-#=>         RedBlackTree:        5.4 i/s - 141.91x  slower
-#=> Array (gradual sort):        0.3 i/s - 2872.03x  slower
+#=>  Array (single sort):     1005.8 i/s
+#=>         RedBlackTree:       16.7 i/s - 60.28x  slower
+#=> Array (gradual sort):        0.3 i/s - 3729.44x  slower
 ```
 
 ### Sort and search 10,000 elements
@@ -153,34 +153,34 @@ Benchmark.ips do |x|
   x.compare!
 end
 
-#=> ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [arm64-darwin24]
+#=> ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +YJIT +PRISM [arm64-darwin24]
 #=> Warming up --------------------------------------
-#=>  RedBlackTree#search     1.000 i/100ms
+#=>  RedBlackTree#search     3.000 i/100ms
 #=> Array#find (gradual sort)
 #=>                          1.000 i/100ms
 #=> Array#find (single sort)
-#=>                         69.000 i/100ms
+#=>                         95.000 i/100ms
 #=> Array#bsearch (gradual sort)
 #=>                          1.000 i/100ms
 #=> Array#bsearch (single sort)
-#=>                         89.000 i/100ms
+#=>                        108.000 i/100ms
 #=> Calculating -------------------------------------
-#=>  RedBlackTree#search     12.926 (± 0.0%) i/s   (77.36 ms/i) -     65.000 in   5.030736s
+#=>  RedBlackTree#search     42.850 (± 4.7%) i/s   (23.34 ms/i) -    216.000 in   5.049896s
 #=> Array#find (gradual sort)
-#=>                           0.262 (± 0.0%) i/s     (3.81 s/i) -      2.000 in   7.623953s
+#=>                           0.274 (± 0.0%) i/s     (3.65 s/i) -      2.000 in   7.302412s
 #=> Array#find (single sort)
-#=>                         690.631 (± 1.0%) i/s    (1.45 ms/i) -      3.519k in   5.095823s
+#=>                         935.492 (± 2.7%) i/s    (1.07 ms/i) -      4.750k in   5.081415s
 #=> Array#bsearch (gradual sort)
-#=>                           0.267 (± 0.0%) i/s     (3.75 s/i) -      2.000 in   7.492482s
+#=>                           0.275 (± 0.0%) i/s     (3.63 s/i) -      2.000 in   7.269027s
 #=> Array#bsearch (single sort)
-#=>                         895.413 (± 1.7%) i/s    (1.12 ms/i) -      4.539k in   5.070590s
+#=>                          1.104k (± 2.0%) i/s  (905.52 μs/i) -      5.616k in   5.087395s
 #=>
 #=> Comparison:
-#=> Array#bsearch (single sort):      895.4 i/s
-#=> Array#find (single sort):         690.6 i/s - 1.30x  slower
-#=> RedBlackTree#search:               12.9 i/s - 69.27x  slower
-#=> Array#bsearch (gradual sort):       0.3 i/s - 3354.39x  slower
-#=> Array#find (gradual sort):          0.3 i/s - 3412.57x  slower
+#=>  Array#bsearch (single sort):     1104.3 i/s
+#=>     Array#find (single sort):      935.5 i/s - 1.18x  slower
+#=>          RedBlackTree#search:       42.9 i/s - 25.77x  slower
+#=> Array#bsearch (gradual sort):        0.3 i/s - 4013.67x  slower
+#=>    Array#find (gradual sort):        0.3 i/s - 4031.85x  slower
 ```
 
 ## WIP Features

data/lib/red-black-tree.rb

@@ -145,21 +145,38 @@ class RedBlackTree
     original_node = node
 
     if node.children_are_valid?
+      is_root = is_root? node
+
       successor = node.left
       successor = successor.left until successor.left.leaf?
-      node.swap_data_with! successor
+      node.swap_colour_with! successor
+      node.swap_position_with! successor
+      node.swap_position_with! LeafNode.new
+
+      @root = successor if is_root
+
+      original_node.validate_free!
 
-      return delete! successor
+      decrement_size!
+      update_left_most_node!
+
+      return self
     elsif node.single_child_is_valid?
       is_root = is_root? node
 
       valid_child = node.children.find(&:valid?)
-      node.swap_data_with! valid_child
-      node.black!
+      valid_child.black!
+      node.swap_position_with! valid_child
+      node.swap_position_with! LeafNode.new
+
+      @root = valid_child if is_root
 
-      @root = node if is_root
+      original_node.validate_free!
 
-      return delete! valid_child
+      decrement_size!
+      update_left_most_node!
+
+      return self
     elsif node.children_are_leaves?
       if is_root? node
         @root = nil
@@ -224,7 +241,7 @@ class RedBlackTree
   # @return [RedBlackTree::Node, nil] the matching node
   def search data = nil, &block
     if block_given?
-      raise ArgumentError, "provide either data or block, not both" if data
+      raise ArgumentError, "provide either data or block, not both for search" if data
 
       _search_by_block block, @root
     else
@@ -233,6 +250,15 @@ class RedBlackTree
       _search_by_data data, @root
     end
   end
+  alias_method :find, :search
+
+  def select &block
+    raise ArgumentError, "block must be provided for select" unless block
+
+    _select_by_block block, @root
+  end
+  alias_method :filter, :select
+  alias_method :find_all, :select
 
   # Returns true if there is a node which matches the given data/value, and false if there is not.
   #
@@ -327,14 +353,6 @@ class RedBlackTree
     opp_direction_child
   end
 
-  def _search_by_block block, node
-    traverse node do |current|
-      next if current.leaf?
-
-      return current if block.call current
-    end
-  end
-
   def _search_by_data data, node
     return if node.nil? || node.leaf?
     return node if data == node.data
@@ -347,6 +365,24 @@ class RedBlackTree
     end
   end
 
+  def _search_by_block block, node
+    traverse node do |current|
+      next if current.leaf?
+
+      return current if block.call current
+    end
+  end
+
+  def _select_by_block block, node
+    [].tap do |result|
+      traverse node do |current|
+        next if current.leaf?
+
+        result << current if block.call current
+      end
+    end
+  end
+
   def is_root? node
     node && @root && node.object_id == @root.object_id
   end

data/lib/red_black_tree/node/left_right_element_referencers.rb

@@ -7,7 +7,7 @@ class RedBlackTree
         case direction
         when Node::LEFT then @left
         when Node::RIGHT then @right
-        else raise ArgumentError, "Direction must be one of #{Implementation::DIRECTIONS}"
+        else raise ArgumentError, "Direction must be one of #{Implementation::DIRECTIONS}, got #{direction}"
         end
       end
 
@@ -15,7 +15,7 @@ class RedBlackTree
         case direction
         when Node::LEFT then @left = node
         when Node::RIGHT then @right = node
-        else raise ArgumentError, "Direction must be one of #{Implementation::DIRECTIONS}"
+        else raise ArgumentError, "Direction must be one of #{Implementation::DIRECTIONS}, got #{direction}"
         end
       end
     end

data/lib/red_black_tree/node.rb

@@ -125,12 +125,6 @@ class RedBlackTree
         raise StructuralError, "Node is still chained to #{anchors.join(", ")}"
       end
 
-      def swap_data_with! other_node
-        temp_data = @data
-        @data = other_node.data
-        other_node.data = temp_data
-      end
-
       def swap_colour_with! other_node
         temp_colour = @colour
 
@@ -148,27 +142,47 @@ class RedBlackTree
       def swap_position_with! other_node
         self_position = position
         other_position = other_node.position
+        opp_other_position = opposite_direction other_position if other_position
 
         if other_node.parent.object_id == self.object_id
           self[other_position] = other_node[other_position]
           other_node[other_position] = self
 
+          self[other_position].parent = self
           other_node.parent = @parent
+
+          @parent[self_position] = other_node if self_position
           @parent = other_node
-        elsif other_node.object_id == @parent.object_id
-          other_node[self_position] = self[self_position]
-          self[self_position] = other_node
 
-          temp_parent = other_node.parent
-          other_node.parent = self
-          @parent = temp_parent
+          temp_node = self[opp_other_position]
+          self[opp_other_position] = other_node[opp_other_position]
+          other_node[opp_other_position] = temp_node
+
+          self[opp_other_position].parent = self
+          other_node[opp_other_position].parent = other_node
+        elsif other_node.object_id == @parent.object_id
+          other_node.swap_position_with! self
         else
           other_node.parent[other_position] = self if other_node.parent
           @parent[self_position] = other_node if @parent
 
-          temp_parent = other_node.parent
+          temp_node = other_node.parent
           other_node.parent = @parent
-          @parent = temp_parent
+          @parent = temp_node
+
+          temp_node = other_node.left
+          other_node.left = @left
+          @left = temp_node
+
+          @left.parent = self if @left
+          other_node.left.parent = other_node if other_node.left
+
+          temp_node = other_node.right
+          other_node.right = @right
+          @right = temp_node
+
+          @right.parent = self if @right
+          other_node.right.parent = other_node if other_node.right
         end
       end
     end

data/lib/red_black_tree/version.rb

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

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-black-tree
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Joshua Young
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-27 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies: []
-description:
 email:
 - djry1999@gmail.com
 executables: []
@@ -37,7 +35,6 @@ metadata:
   documentation_uri: https://joshuay03.github.io/red-black-tree/
   source_code_uri: https://github.com/joshuay03/red-black-tree
   changelog_uri: https://github.com/joshuay03/red-black-tree/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Red-Black Tree Data Structure for Ruby
 test_files: []