refactor 26

Author: fishercoder1534

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

@@ -1,59 +1,58 @@
 package com.fishercoder.solutions;
 
-/** Given a sorted array, remove the duplicates
+/**
+ * 26. Remove Duplicates from Sorted Array
+ *
+ * Given a sorted array, remove the duplicates
  * in place such that each element appear only once and return the new length.
  * Do not allocate extra space for another array, you must do this in place with constant memory.
-
- For example,
- Given input array A = [1,1,2],
-
- Your function should return length = 2, and A is now [1,2].*/
+ *
+ * For example,
+ * Given input array A = [1,1,2],
+ * Your function should return length = 2, and A is now [1,2].
+ * */
 
 public class _26 {
 
-    public static int removeDuplicates_editorial_solution(int[] nums) {
-        int i = 0;
-        for (int j = 1; j < nums.length; j++) {
-            if (nums[i] != nums[j]) {
-                i++;
-                nums[i] = nums[j];
-            }
+  public static class Solution1 {
+    public int removeDuplicates(int[] nums) {
+      int i = 0;
+      for (int j = 1; j < nums.length; j++) {
+        if (nums[i] != nums[j]) {
+          i++;
+          nums[i] = nums[j];
         }
-        return i + 1;
-    }
-
-
-    public static void main(String... strings) {
-        int[] nums = new int[]{1, 1, 2};
-//        int[] nums = new int[]{1,1,2,2,3};
-//        int[] nums = new int[]{1,1};
-        System.out.println(removeDuplicates_editorial_solution(nums));
+      }
+      return i + 1;
     }
+  }
 
+  public static class Solution2 {
     /**
      * Same idea as the editorial solution, mine just got more verbose.
      */
-    public static int removeDuplicates_my_original(int[] nums) {
-        int i = 0;
-        for (int j = i + 1; i < nums.length && j < nums.length; ) {
-            while (j < nums.length && nums[i] == nums[j]) {
-                j++;
-            }
-            if (j == nums.length) {
-                j--;
-            }
-            int temp = nums[j];
-            nums[j] = nums[i + 1];
-            nums[i + 1] = temp;
-            if (nums[i] != nums[i + 1]) {
-                i++;
-            }
-            if (j == nums.length) {
-                break;
-            }
-            j++;
+    public static int removeDuplicates(int[] nums) {
+      int i = 0;
+      for (int j = i + 1; i < nums.length && j < nums.length; ) {
+        while (j < nums.length && nums[i] == nums[j]) {
+          j++;
+        }
+        if (j == nums.length) {
+          j--;
+        }
+        int temp = nums[j];
+        nums[j] = nums[i + 1];
+        nums[i + 1] = temp;
+        if (nums[i] != nums[i + 1]) {
+          i++;
+        }
+        if (j == nums.length) {
+          break;
         }
-        return i + 1;
+        j++;
+      }
+      return i + 1;
     }
+  }
 
 }

src/test/java/com/fishercoder/_26Test.java

@@ -0,0 +1,55 @@
+package com.fishercoder;
+
+import com.fishercoder.solutions._26;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class _26Test {
+  private static _26.Solution1 solution1;
+  private static _26.Solution2 solution2;
+  private static int[] nums;
+
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _26.Solution1();
+    solution2 = new _26.Solution2();
+  }
+
+  @Test
+  public void test1() {
+    nums = new int[] {1, 1, 2};
+    assertEquals(2, solution1.removeDuplicates(nums));
+  }
+
+  @Test
+  public void test2() {
+    nums = new int[] {1, 1, 2};
+    assertEquals(2, solution2.removeDuplicates(nums));
+  }
+
+  @Test
+  public void test3() {
+    nums = new int[] {1,1,2,2,3};
+    assertEquals(3, solution1.removeDuplicates(nums));
+  }
+
+  @Test
+  public void test4() {
+    nums = new int[] {1,1,2,2,3};
+    assertEquals(3, solution2.removeDuplicates(nums));
+  }
+
+  @Test
+  public void test5() {
+    nums = new int[] {1, 1};
+    assertEquals(1, solution1.removeDuplicates(nums));
+  }
+
+  @Test
+  public void test6() {
+    nums = new int[] {1, 1};
+    assertEquals(1, solution2.removeDuplicates(nums));
+  }
+}