From 5aabf2dd3e8605fe679363748034a1ec785465f4 Mon Sep 17 00:00:00 2001 From: c-lsalazar Date: Mon, 31 Aug 2020 12:49:04 -0700 Subject: [PATCH 1/5] fingers crossed it works because I won't find out until later --- lib/tree.rb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/tree.rb b/lib/tree.rb index c0d4b51..fb560c6 100644 --- a/lib/tree.rb +++ b/lib/tree.rb @@ -16,16 +16,34 @@ def initialize @root = nil end + + ##recursive because i know how to do it this way (source: youtube) + def add_helper(current, key, value) + return TreeNode.new(key, value) if current.nil? + + if key < current.key + current.left = add_helper(current.left, key, value) + else + current.right = add_helper(current.right, key, value) + end + return current + end + # Time Complexity: # Space Complexity: def add(key, value) - raise NotImplementedError + @root = add_helper(@root, key, value) end # Time Complexity: # Space Complexity: def find(key) - raise NotImplementedError + if current.node.nil? + return TreeNode.new(key,value) + elsif current.node == key + return true + end + end # Time Complexity: From 5d4335de990e8bf71e622c017c0a3f8e61b6bce2 Mon Sep 17 00:00:00 2001 From: c-lsalazar Date: Mon, 31 Aug 2020 13:03:01 -0700 Subject: [PATCH 2/5] updated syntax to ternary --- lib/tree.rb | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/lib/tree.rb b/lib/tree.rb index fb560c6..5fc7ac0 100644 --- a/lib/tree.rb +++ b/lib/tree.rb @@ -16,19 +16,6 @@ def initialize @root = nil end - - ##recursive because i know how to do it this way (source: youtube) - def add_helper(current, key, value) - return TreeNode.new(key, value) if current.nil? - - if key < current.key - current.left = add_helper(current.left, key, value) - else - current.right = add_helper(current.right, key, value) - end - return current - end - # Time Complexity: # Space Complexity: def add(key, value) @@ -38,18 +25,20 @@ def add(key, value) # Time Complexity: # Space Complexity: def find(key) - if current.node.nil? - return TreeNode.new(key,value) - elsif current.node == key - return true - end - + current = @root + return nil if current.nil? + + until current.key == key + (current.key > key) ? (current = current.left) : (current = current.right) + end + + return current.value end # Time Complexity: # Space Complexity: def inorder - raise NotImplementedError + return list if node.nil end # Time Complexity: @@ -81,4 +70,19 @@ def bfs def to_s return "#{self.inorder}" end + + + ##HELPERS + def add_helper(node, key, value) + return TreeNode.new(key, value) if node.nil? + + if key < node.key + node.left = add_helper(node.left, key, value) + else + node.right = add_helper(node.right, key, value) + end + return node + end + + end From 13927d03e551902bb281ef70a4e26c9e8a6312f0 Mon Sep 17 00:00:00 2001 From: c-lsalazar Date: Tue, 1 Sep 2020 11:59:46 -0700 Subject: [PATCH 3/5] commit --- lib/tree.rb | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/lib/tree.rb b/lib/tree.rb index 5fc7ac0..012f6bb 100644 --- a/lib/tree.rb +++ b/lib/tree.rb @@ -38,19 +38,19 @@ def find(key) # Time Complexity: # Space Complexity: def inorder - return list if node.nil + return inorder_helper(@root, []) end # Time Complexity: # Space Complexity: def preorder - raise NotImplementedError + preorder_helper(@root, []) end # Time Complexity: # Space Complexity: def postorder - raise NotImplementedError + postorder_helper(@root, []) end # Time Complexity: @@ -81,8 +81,47 @@ def add_helper(node, key, value) else node.right = add_helper(node.right, key, value) end + return node end + def inorder_helper(current, list) + return list if current.nil? + + inorder_helper(current.left, list) + list << { key: current.key, value: current.value} + inorder_helper(current.right, list) + + return list + end + + def preorder_helper(current, list) + return list if current.nil? + + list << {key: current.key, value: current.value} + preorder_helper(current.left, list) + preorder_helper(currentright, list) + + return list + end + + def postorder_helper(current, list) + return list if current.nil? + + postorder_helper(current.left, list) + postorder_helper(current.right, list) + list << {key: current.key, value: current.value} + + return list + end + + def height_helper(current) + return 0 if current.nil? + + left = height_helper(current.left) + right = height_helper(current.right) + + left > right ? (left + 1) : (right + 1) + end end From 5014552fc2f86a7647a14f246009b7e844d5573b Mon Sep 17 00:00:00 2001 From: mulhoo Date: Tue, 1 Sep 2020 13:43:39 -0700 Subject: [PATCH 4/5] tests pass, code clean up --- lib/tree.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tree.rb b/lib/tree.rb index 012f6bb..36b2106 100644 --- a/lib/tree.rb +++ b/lib/tree.rb @@ -56,7 +56,7 @@ def postorder # Time Complexity: # Space Complexity: def height - raise NotImplementedError + return height_helper(@root) end # Optional Method @@ -73,6 +73,7 @@ def to_s ##HELPERS + def add_helper(node, key, value) return TreeNode.new(key, value) if node.nil? @@ -100,7 +101,7 @@ def preorder_helper(current, list) list << {key: current.key, value: current.value} preorder_helper(current.left, list) - preorder_helper(currentright, list) + preorder_helper(current.right, list) return list end @@ -123,5 +124,4 @@ def height_helper(current) left > right ? (left + 1) : (right + 1) end - end From 2f03d4cffc454a2725ff806651e795c4df029a9f Mon Sep 17 00:00:00 2001 From: mulhoo Date: Tue, 1 Sep 2020 13:48:21 -0700 Subject: [PATCH 5/5] forgot BigO stuff, added) --- lib/tree.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/tree.rb b/lib/tree.rb index 36b2106..bf3c478 100644 --- a/lib/tree.rb +++ b/lib/tree.rb @@ -16,14 +16,14 @@ def initialize @root = nil end - # Time Complexity: - # Space Complexity: + # Time Complexity: o(logn) + # Space Complexity: o(logn) def add(key, value) @root = add_helper(@root, key, value) end - # Time Complexity: - # Space Complexity: + # Time Complexity: o(logn) + # Space Complexity: o(logn) def find(key) current = @root return nil if current.nil? @@ -35,26 +35,26 @@ def find(key) return current.value end - # Time Complexity: - # Space Complexity: + # Time Complexity: on + # Space Complexity: on def inorder return inorder_helper(@root, []) end - # Time Complexity: - # Space Complexity: + # Time Complexity: on + # Space Complexity: on def preorder preorder_helper(@root, []) end - # Time Complexity: - # Space Complexity: + # Time Complexity: on + # Space Complexity: on def postorder postorder_helper(@root, []) end - # Time Complexity: - # Space Complexity: + # Time Complexity: on + # Space Complexity: on def height return height_helper(@root) end