diff --git a/datastructure/tree/bstree.go b/datastructure/tree/bstree.go index fd63011..938e5a4 100644 --- a/datastructure/tree/bstree.go +++ b/datastructure/tree/bstree.go @@ -40,7 +40,7 @@ func (t *BSTree[T]) Insert(data T) { // DeletetNode delete data into BSTree func (t *BSTree[T]) Delete(data T) { - deleteTreeNode(t.root, data, t.comparator) + t.root = deleteTreeNode(t.root, data, t.comparator) } // NodeLevel get node level in BSTree diff --git a/datastructure/tree/root_deletion_test.go b/datastructure/tree/root_deletion_test.go new file mode 100644 index 0000000..37562e1 --- /dev/null +++ b/datastructure/tree/root_deletion_test.go @@ -0,0 +1,66 @@ +package datastructure + +import ( + "sort" + "strconv" + "testing" +) + +func TestBSTreeDeleteReplacesRoot(t *testing.T) { + for i, tt := range []struct { + values []int + remove int + want []int + }{ + {nil, 4, nil}, + {[]int{2, 1, 3}, 4, []int{1, 2, 3}}, + {[]int{6, 5, 7}, 4, []int{5, 6, 7}}, + {[]int{2, 6, 1, 3, 5, 7}, 4, []int{1, 2, 3, 5, 6, 7}}, + {[]int{2, 6}, 9, []int{2, 4, 6}}, + {[]int{2, 6}, 2, []int{4, 6}}, + {[]int{2, 6, 1}, 2, []int{1, 4, 6}}, + {[]int{2, 6, 1, 3}, 2, []int{1, 3, 4, 6}}, + } { + t.Run(strconv.Itoa(i), func(t *testing.T) { + tree := NewBSTree(4, &intComparator{}) + for _, value := range tt.values { + tree.Insert(value) + } + tree.Delete(tt.remove) + checkBSTValues(t, tree, tt.want) + tree.Delete(tt.remove) + checkBSTValues(t, tree, tt.want) + tree.Insert(8) + want := append(append([]int(nil), tt.want...), 8) + sort.Ints(want) + checkBSTValues(t, tree, want) + }) + } +} + +func checkBSTValues(t *testing.T, tree *BSTree[int], want []int) { + t.Helper() + inOrder := tree.InOrderTraverse() + if !sort.IntsAreSorted(inOrder) { + t.Fatalf("in-order traversal is not sorted: %v", inOrder) + } + for name, got := range map[string][]int{ + "in-order": inOrder, + "pre-order": tree.PreOrderTraverse(), + "post-order": tree.PostOrderTraverse(), + "level-order": tree.LevelOrderTraverse(), + } { + sort.Ints(got) + if len(got) != len(want) { + t.Fatalf("%s traversal = %v, want values %v", name, got, want) + } + for i := range want { + if got[i] != want[i] { + t.Fatalf("%s traversal = %v, want values %v", name, got, want) + } + } + } + if len(want) == 0 && tree.Depth() != 0 { + t.Fatalf("empty tree depth = %d", tree.Depth()) + } +} diff --git a/datastructure/tree/tree_internal.go b/datastructure/tree/tree_internal.go index 424d34d..558a190 100644 --- a/datastructure/tree/tree_internal.go +++ b/datastructure/tree/tree_internal.go @@ -69,6 +69,9 @@ func inOrderTraverse[T any](node *datastructure.TreeNode[T]) []T { // } func levelOrderTraverse[T any](root *datastructure.TreeNode[T], traversal *[]T) { + if root == nil { + return + } var q []*datastructure.TreeNode[T] // queue var n *datastructure.TreeNode[T] // temp node @@ -102,7 +105,6 @@ func insertTreeNode[T any](rootNode, newNode *datastructure.TreeNode[T], compara } } -// todo, delete root node failed func deleteTreeNode[T any](node *datastructure.TreeNode[T], data T, comparator constraints.Comparator) *datastructure.TreeNode[T] { if node == nil { return nil