update binary tree ops

xiaoningning · xiaoningning · commit 35bc2e49150c · 2012-07-24T21:56:03.000-07:00
diff --git a/BTree/src/BTree.java b/BTree/src/BTree.java
@@ -23,7 +23,6 @@ public BTree(int v) {
     public static BTree createMinimalBT(BTree root, int[] array, int s, int e) {
         if (s >= 0 && e <= array.length - 1 && s <= e) {
             int m = (e + s) / 2;
-
             root = new BTree(array[m]);
 
             root.left = createMinimalBT(root.left, array, s, m - 1);
@@ -74,13 +73,11 @@ public static void showByLevel(BTree root) {
                 System.out.print(node.right.value + "\t");
             }
             if (current.isEmpty()) {
-                current = next;
+                current.addAll(next);
                 next.clear();
                 System.out.println();
             }
-
         }
-
     }
 
     public static int width(BTree root) {
@@ -392,7 +389,6 @@ public static void main(String[] args) {
         System.out.println("tree size: " + treeSize(t1));
         System.out.println("tree 4 smallest: " + k_smallest_element(t1, 4).value);
         k_smallest_element1(t1,3);
-        //System.out.println("tree 4 smallest: " + k_smallest_element1(t1, 2).value);
 
         showByLevel(t1);
 
@@ -465,7 +461,6 @@ public static void main(String[] args) {
         if (nextNode2 != null)
             System.out.println(nextNode2.value);
 
-
     }
 
 }
diff --git a/MathOps/src/MathOps.java b/MathOps/src/MathOps.java
@@ -69,7 +69,6 @@ public static int divide(int dividend, int divisor) {
         while (dividend >= divisor) {
             dividend -= divisor;
             result++;
-
         }
 
         if (neg_dividend ^ neg_divisor)
@@ -83,8 +82,10 @@ public static int divide1(int dividend, int divisor) {
         assert (divisor != 0);
 
         boolean bNeg = false;
+
         if ((dividend < 0 && divisor > 0) || (dividend > 0 && divisor < 0))
             bNeg = true;
+
         long la = dividend;
         long ula = la < 0 ? -la : la;
         long lb = divisor;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public BTree(int v) {`
`23`	`23`	`public static BTree createMinimalBT(BTree root, int[] array, int s, int e) {`
`24`	`24`	`if (s >= 0 && e <= array.length - 1 && s <= e) {`
`25`	`25`	`int m = (e + s) / 2;`
`26`		`-`
`27`	`26`	`root = new BTree(array[m]);`
`28`	`27`
`29`	`28`	`root.left = createMinimalBT(root.left, array, s, m - 1);`
`@@ -74,13 +73,11 @@ public static void showByLevel(BTree root) {`
`74`	`73`	`System.out.print(node.right.value + "\t");`
`75`	`74`	`}`
`76`	`75`	`if (current.isEmpty()) {`
`77`		`- current = next;`
	`76`	`+ current.addAll(next);`
`78`	`77`	`next.clear();`
`79`	`78`	`System.out.println();`
`80`	`79`	`}`
`81`		`-`
`82`	`80`	`}`
`83`		`-`
`84`	`81`	`}`
`85`	`82`
`86`	`83`	`public static int width(BTree root) {`
`@@ -392,7 +389,6 @@ public static void main(String[] args) {`
`392`	`389`	`System.out.println("tree size: " + treeSize(t1));`
`393`	`390`	`System.out.println("tree 4 smallest: " + k_smallest_element(t1, 4).value);`
`394`	`391`	`k_smallest_element1(t1,3);`
`395`		`- //System.out.println("tree 4 smallest: " + k_smallest_element1(t1, 2).value);`
`396`	`392`
`397`	`393`	`showByLevel(t1);`
`398`	`394`
`@@ -465,7 +461,6 @@ public static void main(String[] args) {`
`465`	`461`	`if (nextNode2 != null)`
`466`	`462`	`System.out.println(nextNode2.value);`
`467`	`463`
`468`		`-`
`469`	`464`	`}`
`470`	`465`
`471`	`466`	`}`