add comments on b-tree

xiaoningning · xiaoningning · commit 9e67abac2027 · 2012-07-21T17:51:39.000-07:00
diff --git a/BTree/src/BTree.java b/BTree/src/BTree.java
@@ -255,6 +255,7 @@ public static BTree leftMostNode(BTree node) {
         return node;
     }
 
+    // left, root, right
     public static BTree inorderSuc(BTree root, int k) {
         if (root == null)
             return null;
@@ -282,7 +283,7 @@ public static BTree inorderSuc(BTree root, int k) {
 
         }
     }
-
+    //root, left, right
     public static BTree preorderSuc(BTree node, int k) {
         if (node == null)
             return null;
@@ -322,7 +323,7 @@ else if (node.right != null)
 
 
     }
-
+    // left, right, root
     public static BTree postorderSuc(BTree root, int k) {
         if (root == null)
             return null;
diff --git a/PuzzleCoding/src/MergeSortedArray.java b/PuzzleCoding/src/MergeSortedArray.java
@@ -68,6 +68,7 @@ private void shiftDown(int k) {
             while (2 * k <= heap.size() - 1) {
                 int i = 2 * k; //left
                 int j = i + 1; //right
+                //find the smallest of left and right
                 if (i < heap.size() - 1 && greater(i, j)) {
                     i++;
                 }
diff --git a/StringOps/src/StringOps.java b/StringOps/src/StringOps.java
@@ -204,7 +204,7 @@ public static String rotateString(String s, int k) {
     }
 
     public static boolean isRexMatch(String s1, String s2) {
-        if (s1 == null || s1.isEmpty() || s2 == null) return false;
+        if (s1 == null || s2 == null) return false;
         if (s2.isEmpty()) return s2.isEmpty();    // "" , ""
 
 

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ public static BTree leftMostNode(BTree node) {`
`255`	`255`	`return node;`
`256`	`256`	`}`
`257`	`257`
	`258`	`+ // left, root, right`
`258`	`259`	`public static BTree inorderSuc(BTree root, int k) {`
`259`	`260`	`if (root == null)`
`260`	`261`	`return null;`
`@@ -282,7 +283,7 @@ public static BTree inorderSuc(BTree root, int k) {`
`282`	`283`
`283`	`284`	`}`
`284`	`285`	`}`
`285`		`-`
	`286`	`+ //root, left, right`
`286`	`287`	`public static BTree preorderSuc(BTree node, int k) {`
`287`	`288`	`if (node == null)`
`288`	`289`	`return null;`
`@@ -322,7 +323,7 @@ else if (node.right != null)`
`322`	`323`
`323`	`324`
`324`	`325`	`}`
`325`		`-`
	`326`	`+ // left, right, root`
`326`	`327`	`public static BTree postorderSuc(BTree root, int k) {`
`327`	`328`	`if (root == null)`
`328`	`329`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ private void shiftDown(int k) {`
`68`	`68`	`while (2 * k <= heap.size() - 1) {`
`69`	`69`	`int i = 2 * k; //left`
`70`	`70`	`int j = i + 1; //right`
	`71`	`+ //find the smallest of left and right`
`71`	`72`	`if (i < heap.size() - 1 && greater(i, j)) {`
`72`	`73`	`i++;`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public static String rotateString(String s, int k) {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`public static boolean isRexMatch(String s1, String s2) {`
`207`		`- if (s1 == null \|\| s1.isEmpty() \|\| s2 == null) return false;`
	`207`	`+ if (s1 == null \|\| s2 == null) return false;`
`208`	`208`	`if (s2.isEmpty()) return s2.isEmpty(); // "" , ""`
`209`	`209`
`210`	`210`