refactor 283

fishercoder1534 · fishercoder1534 · commit 66fb6b906283 · 2020-01-07T08:44:04.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_283.java b/src/main/java/com/fishercoder/solutions/_283.java
@@ -31,12 +31,11 @@ public static class Solution2 {
         public void moveZeroes(int[] nums) {
             //this solutoin is the most optimal since it minimizes the number of operations
             //the idea is to swap the non-zero element to the first zero number position
-            for (int i = 0, j = 0; i < nums.length && j < nums.length; i++) {
-                if (nums[i] != 0) {
+            for (int i = 0, j = 0; i < nums.length && j < nums.length; j++) {
+                if (nums[j] != 0) {
                     int temp = nums[i];
-                    nums[i] = nums[j];
+                    nums[i++] = nums[j];
                     nums[j] = temp;
-                    j++;
                 }
             }
         }
diff --git a/src/test/java/com/fishercoder/_283Test.java b/src/test/java/com/fishercoder/_283Test.java
@@ -5,6 +5,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class _283Test {
     private static _283.Solution1 solution1;
     private static _283.Solution2 solution2;
@@ -38,4 +40,67 @@ public void test3() {
         solution3.moveZeroes(nums);
         CommonUtils.printArray(nums);
     }
+
+    @Test
+    public void test4() {
+        nums = new int[]{1, 0};
+        solution1.moveZeroes(nums);
+        CommonUtils.printArray(nums);
+    }
+
+    @Test
+    public void test5() {
+        nums = new int[]{0, 1, 0, 3, 12};
+        solution1.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 3, 12, 0, 0}, nums);
+    }
+
+    @Test
+    public void test6() {
+        nums = new int[]{1, 0, 0};
+        solution1.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 0, 0}, nums);
+    }
+
+    @Test
+    public void test7() {
+        nums = new int[]{1, 0};
+        solution2.moveZeroes(nums);
+        CommonUtils.printArray(nums);
+    }
+
+    @Test
+    public void test8() {
+        nums = new int[]{0, 1, 0, 3, 12};
+        solution2.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 3, 12, 0, 0}, nums);
+    }
+
+    @Test
+    public void test9() {
+        nums = new int[]{1, 0, 0};
+        solution2.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 0, 0}, nums);
+    }
+
+    @Test
+    public void test10() {
+        nums = new int[]{1, 0};
+        solution3.moveZeroes(nums);
+        CommonUtils.printArray(nums);
+    }
+
+    @Test
+    public void test11() {
+        nums = new int[]{0, 1, 0, 3, 12};
+        solution3.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 3, 12, 0, 0}, nums);
+    }
+
+    @Test
+    public void test12() {
+        nums = new int[]{1, 0, 0};
+        solution3.moveZeroes(nums);
+        assertArrayEquals(new int[]{1, 0, 0}, nums);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,11 @@ public static class Solution2 {`
`31`	`31`	`public void moveZeroes(int[] nums) {`
`32`	`32`	`//this solutoin is the most optimal since it minimizes the number of operations`
`33`	`33`	`//the idea is to swap the non-zero element to the first zero number position`
`34`		`- for (int i = 0, j = 0; i < nums.length && j < nums.length; i++) {`
`35`		`- if (nums[i] != 0) {`
	`34`	`+ for (int i = 0, j = 0; i < nums.length && j < nums.length; j++) {`
	`35`	`+ if (nums[j] != 0) {`
`36`	`36`	`int temp = nums[i];`
`37`		`- nums[i] = nums[j];`
	`37`	`+ nums[i++] = nums[j];`
`38`	`38`	`nums[j] = temp;`
`39`		`- j++;`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`	`}`