Binary tree until now returns binarytree structure that includes parents

Author: gardncl

Diff for: binarytrees/src/main/java/ImplementInorderSpaceEfficient.java

@@ -7,7 +7,7 @@ public class ImplementInorderSpaceEfficient {
     10.11
     */
 
-    public static List<Integer> inorderTraversal(BinaryTree<Integer> tree) {
+    public static List<Integer> inorderTraversal(BinaryTreeParent<Integer> tree) {
 
         return Collections.emptyList();
     }

Diff for: binarytrees/src/test/java/ComputeSuccessorTest.java

@@ -5,78 +5,36 @@
 public class ComputeSuccessorTest {
 
     private BinaryTreeParent<Integer> expected;
-    private static BinaryTreeParent node;
+    private static BinaryTreeParent<Integer> node;
 
     @Test
     public void findSuccessor1() throws Exception {
-        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(0);
-        tree.setLeft(new BinaryTreeParent<>(1));
-        tree.setRight(new BinaryTreeParent<>(2));
-        expected = tree;
-        node = tree.left;
+        expected = BinaryTreeUtil.getOddTreeWithParent();
+        node = expected.left;
 
         test(expected, node);
     }
 
     @Test
     public void findSuccessor2() throws Exception {
-        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(4);
-        tree.setLeft(new BinaryTreeParent<>(2));
-        tree.left.setLeft(new BinaryTreeParent<>(1));
-        tree.left.setRight(new BinaryTreeParent<>(3));
-        tree.setRight(new BinaryTreeParent<>(6));
-        tree.right.setLeft(new BinaryTreeParent<>(5));
-        tree.right.setRight(new BinaryTreeParent<>(7));
-        expected = tree;
-        node = tree.left.right;
+        expected = BinaryTreeUtil.getFullTreeWithParent();
+        node = expected.left.right;
 
         test(expected, node);
     }
 
     @Test
     public void findSuccessor3() throws Exception {
-        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(314);
-        tree.setLeft(new BinaryTreeParent<>(6));
-        tree.left.setLeft(new BinaryTreeParent<>(271));
-        tree.left.left.setLeft(new BinaryTreeParent<>(28));
-        tree.left.left.setRight(new BinaryTreeParent<>(0));
-        tree.left.setRight(new BinaryTreeParent<>(561));
-        tree.left.right.setRight(new BinaryTreeParent<>(3));
-        tree.left.right.right.setLeft(new BinaryTreeParent<>(17));
-        tree.setRight(new BinaryTreeParent<>(6));
-        tree.right.setLeft(new BinaryTreeParent<>(2));
-        tree.right.left.setRight(new BinaryTreeParent<>(1));
-        tree.right.left.right.setLeft(new BinaryTreeParent<>(401));
-        tree.right.left.right.left.setRight(new BinaryTreeParent<>(641));
-        tree.right.left.right.setRight(new BinaryTreeParent<>(257));
-        tree.right.setRight(new BinaryTreeParent<>(271));
-        tree.right.right.setRight(new BinaryTreeParent<>(28));
-        expected = tree;
-        node = tree.left.right.right;
+        expected = BinaryTreeUtil.getFigureTenDotOneWithParent();
+        node = expected.left.right.right;
 
         test(expected, node);
     }
 
     @Test
     public void findSuccessor4() throws Exception {
-        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(19);
-        tree.setLeft(new BinaryTreeParent<>(7));
-        tree.left.setLeft(new BinaryTreeParent<>(3));
-        tree.left.left.setLeft(new BinaryTreeParent<>(2));
-        tree.left.left.setRight(new BinaryTreeParent<>(5));
-        tree.left.setRight(new BinaryTreeParent<>(11));
-        tree.left.right.setRight(new BinaryTreeParent<>(17));
-        tree.left.right.right.setLeft(new BinaryTreeParent<>(13));
-        tree.setRight(new BinaryTreeParent<>(43));
-        tree.right.setLeft(new BinaryTreeParent<>(23));
-        tree.right.left.setRight(new BinaryTreeParent<>(37));
-        tree.right.left.right.setLeft(new BinaryTreeParent<>(29));
-        tree.right.left.right.left.setRight(new BinaryTreeParent<>(31));
-        tree.right.left.right.setRight(new BinaryTreeParent<>(41));
-        tree.right.setRight(new BinaryTreeParent<>(47));
-        tree.right.right.setRight(new BinaryTreeParent<>(53));
-        expected = tree.right.left;
-        node = tree;
+        node = BinaryTreeUtil.getFigureFifteenDotOneWithParent();
+        expected = node.right.left;
 
         test(expected, node);
     }

Diff for: binarytrees/src/test/java/ImplementInorderSpaceEfficientTest.java

@@ -8,33 +8,33 @@
 public class ImplementInorderSpaceEfficientTest {
 
     private List<Integer> expected;
-    private BinaryTree<Integer> tree;
+    private BinaryTreeParent<Integer> tree;
 
     @Test
     public void inorderTraversal1() throws Exception {
-        expected = Arrays.asList(2,1,0);
-        tree = BinaryTreeUtil.getOddTree();
+        expected = Arrays.asList(1,0,2);
+        tree = BinaryTreeUtil.getOddTreeWithParent();
 
         test(expected, tree);
     }
 
     @Test
     public void inorderTraversal2() throws Exception {
-        expected = Arrays.asList(2,1,3,0,5,4,6);
-        tree = BinaryTreeUtil.getFullTree();
+        expected = Arrays.asList(1,2,3,4,5,6,7);
+        tree = BinaryTreeUtil.getFullTreeWithParent();
 
         test(expected, tree);
     }
 
     @Test
     public void inorderTraversal3() throws Exception {
-        expected = Arrays.asList(28,271,0,6,561,17,3,314,2,401,614,1,257,6,271,28);
-        tree = BinaryTreeUtil.getFigureTenDotOne();
+        expected = Arrays.asList(28,271,0,6,561,17,3,314,2,401,641,1,257,6,271,28);
+        tree = BinaryTreeUtil.getFigureTenDotOneWithParent();
 
         test(expected, tree);
     }
 
-    private void test(List<Integer> expected, BinaryTree<Integer> tree) {
+    private void test(List<Integer> expected, BinaryTreeParent<Integer> tree) {
         assertEquals(expected, ImplementInorderSpaceEfficient.inorderTraversal(tree));
     }
 

Diff for: utils/src/main/java/BinaryTreeUtil.java

@@ -21,6 +21,13 @@ public static BinaryTree<Integer> getOddTree() {
         return tree;
     }
 
+    public static BinaryTreeParent<Integer> getOddTreeWithParent() {
+        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(0);
+        tree.setLeft(new BinaryTreeParent<>(1));
+        tree.setRight(new BinaryTreeParent<>(2));
+        return tree;
+    }
+
     public static BinaryTree<Integer> getFullTree() {
         BinaryTree<Integer> tree = new BinaryTree<>(4);
         tree.left = new BinaryTree<>(2);
@@ -32,6 +39,17 @@ public static BinaryTree<Integer> getFullTree() {
         return tree;
     }
 
+    public static BinaryTreeParent<Integer> getFullTreeWithParent() {
+        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(4);
+        tree.setLeft(new BinaryTreeParent<>(2));
+        tree.left.setLeft(new BinaryTreeParent<>(1));
+        tree.left.setRight(new BinaryTreeParent<>(3));
+        tree.setRight(new BinaryTreeParent<>(6));
+        tree.right.setLeft(new BinaryTreeParent<>(5));
+        tree.right.setRight(new BinaryTreeParent<>(7));
+        return tree;
+    }
+
     public static BinaryTree<Integer> getFullBST() {
         BinaryTree<Integer> tree = new BinaryTree<>(0);
         tree.left = new BinaryTree<>(1);
@@ -64,6 +82,26 @@ public static BinaryTree<Integer> getFigureTenDotOne() {
         return tree;
     }
 
+    public static BinaryTreeParent<Integer> getFigureTenDotOneWithParent() {
+        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(314);
+        tree.setLeft(new BinaryTreeParent<>(6));
+        tree.left.setLeft(new BinaryTreeParent<>(271));
+        tree.left.left.setLeft(new BinaryTreeParent<>(28));
+        tree.left.left.setRight(new BinaryTreeParent<>(0));
+        tree.left.setRight(new BinaryTreeParent<>(561));
+        tree.left.right.setRight(new BinaryTreeParent<>(3));
+        tree.left.right.right.setLeft(new BinaryTreeParent<>(17));
+        tree.setRight(new BinaryTreeParent<>(6));
+        tree.right.setLeft(new BinaryTreeParent<>(2));
+        tree.right.left.setRight(new BinaryTreeParent<>(1));
+        tree.right.left.right.setLeft(new BinaryTreeParent<>(401));
+        tree.right.left.right.left.setRight(new BinaryTreeParent<>(641));
+        tree.right.left.right.setRight(new BinaryTreeParent<>(257));
+        tree.right.setRight(new BinaryTreeParent<>(271));
+        tree.right.right.setRight(new BinaryTreeParent<>(28));
+        return tree;
+    }
+
     public static BinaryTree<Integer> getFigureFifteenDotOne() {
         BinaryTree<Integer> tree = new BinaryTree<>(19);
         tree.left = new BinaryTree<>(7);
@@ -84,6 +122,26 @@ public static BinaryTree<Integer> getFigureFifteenDotOne() {
         return tree;
     }
 
+    public static BinaryTreeParent<Integer> getFigureFifteenDotOneWithParent() {
+        BinaryTreeParent<Integer> tree = new BinaryTreeParent<>(19);
+        tree.setLeft(new BinaryTreeParent<>(7));
+        tree.left.setLeft(new BinaryTreeParent<>(3));
+        tree.left.left.setLeft(new BinaryTreeParent<>(2));
+        tree.left.left.setRight(new BinaryTreeParent<>(5));
+        tree.left.setRight(new BinaryTreeParent<>(11));
+        tree.left.right.setRight(new BinaryTreeParent<>(17));
+        tree.left.right.right.setLeft(new BinaryTreeParent<>(13));
+        tree.setRight(new BinaryTreeParent<>(43));
+        tree.right.setLeft(new BinaryTreeParent<>(23));
+        tree.right.left.setRight(new BinaryTreeParent<>(37));
+        tree.right.left.right.setLeft(new BinaryTreeParent<>(29));
+        tree.right.left.right.left.setRight(new BinaryTreeParent<>(31));
+        tree.right.left.right.setRight(new BinaryTreeParent<>(41));
+        tree.right.setRight(new BinaryTreeParent<>(47));
+        tree.right.right.setRight(new BinaryTreeParent<>(53));
+        return tree;
+    }
+
     public static BinaryTree<Integer> getFigureFifteenDotTwo() {
         BinaryTree<Integer> tree = new BinaryTree<>(108);
         tree.left = new BinaryTree<>(108);