refactor 653

fishercoder1534 · fishercoder1534 · commit 48b128a4a8f5 · 2019-08-29T07:20:49.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_653.java b/src/main/java/com/fishercoder/solutions/_653.java
@@ -1,12 +1,9 @@
 package com.fishercoder.solutions;
 
 import com.fishercoder.common.classes.TreeNode;
-import com.fishercoder.common.utils.Notes;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 653. Two Sum IV - Input is a BST
@@ -39,7 +36,7 @@
  */
 public class _653 {
 
-    public static class ListSolution {
+    public static class Solution1 {
         public boolean findTarget(TreeNode root, int k) {
             if (root == null) {
                 return false;
@@ -66,36 +63,4 @@ private void dfs(TreeNode root, List<Integer> list) {
             }
         }
     }
-
-    @Notes(todo = "This solution fails by _653Test.test6(), need to fix it.")
-    public static class MapSolution {
-        public boolean findTarget(TreeNode root, int k) {
-            if (root == null) {
-                return false;
-            }
-            Map<Integer, Integer> map = new HashMap();//value is index
-            int index = 0;
-            preorder(root, map, index);
-            for (Map.Entry<Integer, Integer> entry : map.entrySet()) {
-                if (map.containsKey(k - entry.getKey()) && map.get(k - entry.getKey()) != entry.getValue()) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private void preorder(TreeNode root, Map<Integer, Integer> map, int index) {
-            if (root == null) {
-                return;
-            }
-            map.put(root.val, index++);
-            if (root.left != null) {
-                preorder(root.left, map, ++index);
-            }
-            if (root.right != null) {
-                preorder(root.right, map, ++index);
-            }
-        }
-
-    }
 }
diff --git a/src/test/java/com/fishercoder/_653Test.java b/src/test/java/com/fishercoder/_653Test.java
@@ -13,15 +13,13 @@
 import static junit.framework.Assert.assertEquals;
 
 public class _653Test {
-    private static _653.ListSolution listSolution;
-    private static _653.MapSolution mapSolution;
+    private static _653.Solution1 solution1;
     private static boolean expected;
     private static TreeNode root;
 
     @BeforeClass
     public static void setup() {
-        listSolution = new _653.ListSolution();
-        mapSolution = new _653.MapSolution();
+        solution1 = new _653.Solution1();
     }
 
     @Before
@@ -33,24 +31,21 @@ public void setupForEachTest() {
     public void test1() {
         root = TreeUtils.constructBinaryTree(new ArrayList<>(Arrays.asList(5, 3, 2, 4, 6, 7)));
         expected = true;
-        assertEquals(expected, listSolution.findTarget(root, 9));
-        assertEquals(expected, mapSolution.findTarget(root, 9));
+        assertEquals(expected, solution1.findTarget(root, 9));
     }
 
     @Test
     public void test2() {
         root = TreeUtils.constructBinaryTree(new ArrayList<>(Arrays.asList(2, 1, 3)));
         expected = true;
-        assertEquals(expected, listSolution.findTarget(root, 4));
-        assertEquals(expected, mapSolution.findTarget(root, 4));
+        assertEquals(expected, solution1.findTarget(root, 4));
     }
 
     @Test
     public void test3() {
         root = new TreeNode(1);
         expected = false;
-        assertEquals(expected, listSolution.findTarget(root, 2));
-        assertEquals(expected, mapSolution.findTarget(root, 2));
+        assertEquals(expected, solution1.findTarget(root, 2));
     }
 
     @Test
@@ -68,16 +63,14 @@ public void test4() {
 
         root = TreeUtils.constructBinaryTree(new ArrayList<>(Arrays.asList(2, 0, -4, 1, 3)));
         expected = true;
-        assertEquals(expected, listSolution.findTarget(root, -1));
-        assertEquals(expected, mapSolution.findTarget(root, -1));
+        assertEquals(expected, solution1.findTarget(root, -1));
     }
 
     @Test
     public void test5() {
         root = TreeUtils.constructBinaryTree(new ArrayList<>(Arrays.asList(2, 1, 3, -4, 0)));
         expected = true;
-        assertEquals(expected, listSolution.findTarget(root, 2));
-        assertEquals(expected, mapSolution.findTarget(root, 2));
+        assertEquals(expected, solution1.findTarget(root, 2));
     }
 
     @Test
@@ -93,7 +86,7 @@ public void test6() {
                 null, null, 170, 376, 1421, 1613, null, null, 2534, null,
                 null, null, 96, null, null, null, 1303)));
         expected = true;
-        assertEquals(expected, listSolution.findTarget(root, 5831));
+        assertEquals(expected, solution1.findTarget(root, 5831));
 //        TreeUtils.printBinaryTree(root);
 //        assertEquals(expected, mapSolution.findTarget(root, 5831));
     }
