update lowest common parent of binary tree

xiaoningning · xiaoningning · commit 756dcb91db91 · 2012-07-29T22:16:12.000-07:00
diff --git a/BTree/src/BTree.java b/BTree/src/BTree.java
@@ -149,28 +149,23 @@ else if (t1 != null && t2 != null) {
     public static BTree commonRoot(BTree root, int p, int q) {
         if (root == null)
             return null;
-        if (root.value == p && root.value == q)
+        if (root.value == p || root.value == q)
             return root;
 
         BTree l = commonRoot(root.left, p, q);
         BTree r = commonRoot(root.right, p, q);
 
+        /*
         if (r != null && r.value != q && r.value != p)
             return r;
         if (l != null && l.value != q && l.value != p)
             return l;
-
-        if (root.value == p || root.value == q) {
-            if (l != null || r != null)
-                return root;
-
-        } else if (l != null && r != null && l.value != r.value)
+        */
+        if (l != null && r != null && l.value != r.value)
             return root;
         else
             return (l != null) ? l : r;
 
-        return null;
-
     }
 
     public static BTree coverNode(BTree root, int p) {
@@ -406,6 +401,8 @@ public static void main(String[] args) {
         if (cr != null && coverNode(t1, p) != null && coverNode(t1, q) != null)
             System.out.println(cr.value);
 
+        p = 12;
+        q = 13;
         BTree cr1 = commonRoot(t1, p, q);
         System.out.println("common root: " + p + " and  " + q);
         if (cr1 != null && coverNode(t1, p) != null && coverNode(t1, q) != null)
