Kinda some changes

Author: Neverik

contents/tree_traversal/code/smalltalk/tree_traversal.st

@@ -19,83 +19,78 @@ Node>>data: newData
     "Data setter"
     data := newData.
 
-Node>>dfsRecursive
+Node>>dfsRecursive: value
     "Recursive depth first search."
-    data isNil ifFalse: [ 
-        Transcript show: data.
-        Transcript cr.
+    data = value ifTrue: [ 
+    	^true.
     ].
-    children collect: [ :each | each dfsRecursive].
+    children collect: [ :child |
+        (child dfsRecursive: value) ifTrue: [ ^true. ]
+    ]
+    ^false.
 
-Node>>dfsRecursivePostorder
+Node>>dfsRecursivePostOrder: value
     "Recursive depth first search (post-order)."
-    children collect: [ :each | each dfsRecursivePostorder ].
-    data isNil ifTrue: [ ^ self ].
-    Transcript show: data.
-    Transcript cr.
-
-Node>>dfsInOrderBinaryTree
+    children collect: [ :child |
+        (child dfsRecursive: value) ifTrue: [ ^true. ]
+    ].
+    ^(data = value).
+ 
+Node>>dfsInOrderBinaryTree: value
     "Recursive depth first search on a binary tree in order."
-    children size = 2 ifTrue: [ 
-    (children at: 1) dfsInOrderBinaryTree.
-        Transcript show: data.
-        Transcript cr.
-        (children at: 2) dfsInOrderBinaryTree.
+    children size > 2 ifTrue: [
+        Transcript show: 'This is not a binary tree!'; cr.
         ^self.
     ].
-    children size = 1 ifTrue: [ 
-        (children at: 1) dfsInOrderBinaryTree.
-        Transcript show: data.
-	Transcript cr.
-	^self.
-     ].
-     children size = 0 ifTrue: [ 
-        Transcript show: data.
-        Transcript cr.
-        ^self.
-     ].
-     Transcript show: 'This is not a binary tree!'.
-     Transcript cr.
-     children length 
+    children size = 2 ifTrue: [
+        (children at: 1) dfsInOrderBinaryTree: value.
+    ]
+    data = value ifTrue: [
+        Transcript show: data; cr.
+    ]
+    children size >= 1 ifTrue: [
+        (children at: 0) dfsInOrderBinaryTree: value.
+    ]
+    ^self.
 
-Node>>dfsStack
+Node>>dfsStack: value
     "Depth-first search with a stack."
     | stack top |
     stack := Stack new.
     stack push: self.
         [stack size > 0] whileTrue: [
         top := stack pop.
-        Transcript show: top data.
-        Transcript cr.
+	top data = value ifTrue: [
+            ^true.
+	].
         top children reverseDo: [ :child |
-            stack push: child
+            stack push: child.
         ].
     ].
+    ^false
 
-Node>>bfs
+Node>>bfs: value
     "A breadth-first tree search using queues."
     | queue current |
     queue := LinkedList with: self.
     [ queue size > 0 ] whileTrue: [
         current := queue first.
 	queue removeFirst.
-	Transcript show: current.
-	Transcript cr.
+	current data = value ifTrue: [
+            ^true.
+	]
 	current children collect: [ :child |
 	    queue addLast: child
         ].
-     ]
+     ].
+     ^false
 
 | test |
 test := Node new: 1 children: { Node new: 2.
                                 Node new: 3 children: { Node new: 4.
                                                         Node new: 5. } }.
-test dfsRecursive.
-Transcript cr.
-test dfsRecursivePostorder.
-Transcript cr.
-test dfsInOrderBinaryTree.
-Transcript cr.
-test dfsStack.
-Transcript cr.
-test bfs.
+Transcript show: (test dfsRecursive: 6); cr.
+Transcript show: (test dfsRecursivePostorder: 4); cr.
+test dfsInOrderBinaryTree: 7.
+Transcript show: (test dfsStack: 2); cr.
+Transcript show: (test bfs: 4); cr.