return node on Search

Author: jasmith86

bst.go

@@ -57,21 +57,6 @@ func (n *Node) Insert(v Item) error {
 	return n.right.Insert(v)
 }
 
-//// Insert multiple nodes. If duplicate values specified, will keep inserting and return a single Error
-//func (n *Node) insertBulk(values []Item) (int, error) { // todo Remove?
-//	var numInserted int
-//	for _, v := range values {
-//		err := n.Insert(v)
-//		if err == nil {
-//			numInserted += 1
-//		}
-//	}
-//	if numInserted != len(values) {
-//		return numInserted, errors.New("failed trying to Insert duplicate value(s)")
-//	}
-//	return numInserted, nil
-//}
-
 // Get number of nodes from Node n (inclusive)
 func (n *Node) Count() int {
 	if !n.isReady {
@@ -140,12 +125,12 @@ func (n *Node) InOrder() []Item { // TODO take func as arg?
 }
 
 // Search for a value starting at Node n (inclusive)
-func (n *Node) Search(searchVal Item) (bool, error) {
+func (n *Node) Search(searchVal Item) (bool, error, *Node) {
 	if !n.isReady {
-		return false, errors.New("cannot search empty tree")
+		return false, errors.New("cannot search empty tree"), nil
 	}
 	if searchVal.Equals(n.val) {
-		return true, nil
+		return true, nil, n
 	}
 	if searchVal.Less(n.val) {
 		// search left
@@ -157,8 +142,7 @@ func (n *Node) Search(searchVal Item) (bool, error) {
 	if n.right != nil {
 		return n.right.Search(searchVal)
 	}
-	//
-	return false, nil
+	return false, nil, nil
 }
 
 // Remove node with specified value. Returns a new root node.

bst_test.go

@@ -211,7 +211,7 @@ func TestSearch(t *testing.T) {
 			test.tree = &Node{}
 			_, _ = insertBulk(test.tree, test.input)
 			// Test Search
-			wasFound, err := test.tree.Search(test.searchVal)
+			wasFound, err, _ := test.tree.Search(test.searchVal) // todo check returned node
 			if (err != nil) && len(test.input) > 0 {
 				t.Errorf("search %v failed on %v, wanted %v. got %v. %v", test.searchVal, test.input, test.wantFound, wasFound, err)
 			}
@@ -249,7 +249,7 @@ func TestRemove(t *testing.T) {
 			test.tree = test.tree.Remove(test.removeVal)
 			// test that only the specified node was removed
 			for _, inputVal := range test.input {
-				stillPresent, _ := test.tree.Search(inputVal)
+				stillPresent, _, _ := test.tree.Search(inputVal) // TODO check returned node?
 				if stillPresent && inputVal == test.removeVal {
 					t.Errorf("Remove(%v) failed on %v. wanted %v. got stillPresent=%v", test.removeVal, test.input, test.wantSucceed, stillPresent)
 				}
@@ -277,7 +277,7 @@ func TestRemove(t *testing.T) {
 	}
 }
 
-// Utility max/min function for myInt
+// Utility max/min function for mysInt
 func maxMyInt(x ...MyInt) MyInt {
 	max := x[0]
 	for _, v := range x {