refactor 98

Author: fishercoder1534

src/main/java/com/fishercoder/solutions/_98.java

@@ -26,36 +26,39 @@
  Binary tree [1,2,3], return false.
  */
 public class _98 {
-    class MoreConciseSolution {
+
+    public static class Solution1 {
 
         public boolean isValidBST(TreeNode root) {
             return valid(root, null, null);
         }
 
-        private boolean valid(TreeNode root, Integer min, Integer max) {
-            if (root == null) return true;
-            if ((min != null && root.val <= min)
-                    || (max != null && root.val >= max)) return false;
+        boolean valid(TreeNode root, Integer min, Integer max) {
+            if (root == null) {
+                return true;
+            }
+            if ((min != null && root.val <= min) || (max != null && root.val >= max)) {
+                return false;
+            }
             return valid(root.left, min, root.val) && valid(root.right, root.val, max);
         }
     }
 
 
-    public boolean isValidBST(TreeNode root) {
-        if (root == null) return true;
-        return dfs(root.left, Long.MIN_VALUE, root.val) && dfs(root.right, root.val, Long.MAX_VALUE);
-    }
+    public static class Solution2 {
+        public boolean isValidBST(TreeNode root) {
+            if (root == null) return true;
+            return dfs(root.left, Long.MIN_VALUE, root.val) && dfs(root.right, root.val, Long.MAX_VALUE);
+        }
 
-    private boolean dfs(TreeNode root, long minValue, long maxValue) {
-        if (root == null) return true;
-        if (root != null && (root.val <= minValue || root.val >= maxValue)) return false;
-        boolean leftResult = true, rightResult = true;
-        if (root.left != null) leftResult = dfs(root.left, minValue, root.val);
-        if (root.right != null) rightResult = dfs(root.right, root.val, maxValue);
-        return leftResult && rightResult;
+        private boolean dfs(TreeNode root, long minValue, long maxValue) {
+            if (root == null) return true;
+            if (root != null && (root.val <= minValue || root.val >= maxValue)) return false;
+            boolean leftResult = true, rightResult = true;
+            if (root.left != null) leftResult = dfs(root.left, minValue, root.val);
+            if (root.right != null) rightResult = dfs(root.right, root.val, maxValue);
+            return leftResult && rightResult;
+        }
     }
 
-    public static void main(String... args) {
-        System.out.println(Integer.MAX_VALUE == 2147483647);
-    }
 }

src/test/java/com/fishercoder/_98Test.java

@@ -11,32 +11,32 @@
  * Created by fishercoder on 5/17/17.
  */
 public class _98Test {
-    private static _98 test;
+    private static _98.Solution1 solution1;
     private static TreeNode root;
 
     @BeforeClass
     public static void setup(){
-        test = new _98();
+        solution1 = new _98.Solution1();
     }
 
     @Test
     public void test1(){
         root = new TreeNode(2);
         root.left = new TreeNode(1);
         root.right = new TreeNode(3);
-        assertEquals(true, test.isValidBST(root));
+        assertEquals(true, solution1.isValidBST(root));
     }
 
     @Test
     public void test2(){
         root = new TreeNode(0);
-        assertEquals(true, test.isValidBST(root));
+        assertEquals(true, solution1.isValidBST(root));
     }
 
     @Test
     public void test3(){
         root = new TreeNode(1);
         root.left = new TreeNode(1);
-        assertEquals(false, test.isValidBST(root));
+        assertEquals(false, solution1.isValidBST(root));
     }
 }