refactor 658

fishercoder1534 · fishercoder1534 · commit 4cb151c5c421 · 2019-09-02T02:55:19.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_658.java b/src/main/java/com/fishercoder/solutions/_658.java
@@ -25,50 +25,52 @@
  Absolute value of elements in the array and x will not exceed 104
  */
 public class _658 {
-    public List<Integer> findClosestElements(List<Integer> arr, int k, int x) {
-        List<Integer> result = new ArrayList<>();
-        int index = findInsertPosition(arr, x);
-        int right = 0;
-        if (arr.get(index) == x) {
-            result.add(arr.get(index));
-            right = index + 1;
-            k--;
-        } else {
-            right = index;
-        }
-        int left = index - 1;
-        while (k-- > 0) {
-            if (left >= 0 && right < arr.size()) {
-                if (x - arr.get(left) <= arr.get(right) - x) {
+    public static class Solution1 {
+        public List<Integer> findClosestElements(List<Integer> arr, int k, int x) {
+            List<Integer> result = new ArrayList<>();
+            int index = findInsertPosition(arr, x);
+            int right = 0;
+            if (arr.get(index) == x) {
+                result.add(arr.get(index));
+                right = index + 1;
+                k--;
+            } else {
+                right = index;
+            }
+            int left = index - 1;
+            while (k-- > 0) {
+                if (left >= 0 && right < arr.size()) {
+                    if (x - arr.get(left) <= arr.get(right) - x) {
+                        result.add(0, arr.get(left--));
+                    } else {
+                        result.add(result.size(), arr.get(right++));
+                    }
+                } else if (left >= 0) {
                     result.add(0, arr.get(left--));
-                } else {
+                } else if (right < arr.size()) {
                     result.add(result.size(), arr.get(right++));
                 }
-            } else if (left >= 0) {
-                result.add(0, arr.get(left--));
-            } else if (right < arr.size()) {
-                result.add(result.size(), arr.get(right++));
             }
+            return result;
         }
-        return result;
-    }
 
-    private int findInsertPosition(List<Integer> arr, int x) {
-        if (arr == null || arr.size() == 0) {
-            return 0;
-        }
-        int len = arr.size();
-        for (int i = 0; i < len; i++) {
-            if (arr.get(0) > x) {
+        private int findInsertPosition(List<Integer> arr, int x) {
+            if (arr == null || arr.size() == 0) {
                 return 0;
-            } else if (arr.get(len - 1) < x) {
-                return len;
-            } else if (arr.get(i) < x && arr.get(i + 1) > x) {
-                return i + 1;
-            } else if (arr.get(i) == x) {
-                return i;
             }
+            int len = arr.size();
+            for (int i = 0; i < len; i++) {
+                if (arr.get(0) > x) {
+                    return 0;
+                } else if (arr.get(len - 1) < x) {
+                    return len;
+                } else if (arr.get(i) < x && arr.get(i + 1) > x) {
+                    return i + 1;
+                } else if (arr.get(i) == x) {
+                    return i;
+                }
+            }
+            return len;
         }
-        return len;
     }
 }
diff --git a/src/test/java/com/fishercoder/_658Test.java b/src/test/java/com/fishercoder/_658Test.java
@@ -11,15 +11,15 @@
 import static junit.framework.Assert.assertEquals;
 
 public class _658Test {
-    private static _658 test;
+    private static _658.Solution1 solution1;
     private static List<Integer> arr;
     private static List<Integer> expected;
     private static int k;
     private static int x;
 
     @BeforeClass
     public static void setup() {
-        test = new _658();
+        solution1 = new _658.Solution1();
     }
 
     @Test
@@ -28,7 +28,7 @@ public void test1() {
         x = 3;
         expected = new ArrayList<>(Arrays.asList(1, 2, 3, 4));
         arr = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
-        assertEquals(expected, test.findClosestElements(arr, k, x));
+        assertEquals(expected, solution1.findClosestElements(arr, k, x));
     }
 
     @Test
@@ -37,7 +37,7 @@ public void test2() {
         x = -1;
         expected = new ArrayList<>(Arrays.asList(1, 2, 3, 4));
         arr = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
-        assertEquals(expected, test.findClosestElements(arr, k, x));
+        assertEquals(expected, solution1.findClosestElements(arr, k, x));
     }
 
     @Test
@@ -46,6 +46,6 @@ public void test3() {
         x = 5;
         arr = new ArrayList<>(Arrays.asList(0, 0, 1, 2, 3, 3, 4, 7, 7, 8));
         expected = new ArrayList<>(Arrays.asList(3, 3, 4));
-        assertEquals(expected, test.findClosestElements(arr, k, x));
+        assertEquals(expected, solution1.findClosestElements(arr, k, x));
     }
 }
