refactor 358

fishercoder1534 · fishercoder1534 · commit 859adb335b92 · 2019-01-28T08:36:19.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_358.java b/src/main/java/com/fishercoder/solutions/_358.java
@@ -30,33 +30,36 @@
  */
 public class _358 {
 
-    public String rearrangeString(String s, int k) {
-        Map<Character, Integer> count = new HashMap<>();
-        for (char c : s.toCharArray()) {
-            count.put(c, count.getOrDefault(c, 0) + 1);
-        }
+    public static class Solution1 {
+        public String rearrangeString(String s, int k) {
+            Map<Character, Integer> count = new HashMap<>();
+            for (char c : s.toCharArray()) {
+                count.put(c, count.getOrDefault(c, 0) + 1);
+            }
 
-        PriorityQueue<Map.Entry<Character, Integer>> heap = new PriorityQueue<>((a, b) -> b.getValue() - a.getValue());
-        heap.addAll(count.entrySet());
+            PriorityQueue<Map.Entry<Character, Integer>> heap =
+                new PriorityQueue<>((a, b) -> b.getValue() - a.getValue());
+            heap.addAll(count.entrySet());
 
-        Queue<Map.Entry<Character, Integer>> waitQueue = new LinkedList<>();
+            Queue<Map.Entry<Character, Integer>> waitQueue = new LinkedList<>();
 
-        StringBuilder stringBuilder = new StringBuilder();
-        while (!heap.isEmpty()) {
-            Map.Entry<Character, Integer> entry = heap.poll();
-            stringBuilder.append(entry.getKey());
-            entry.setValue(entry.getValue() - 1);
-            waitQueue.offer(entry);
-            if (waitQueue.size() < k) {
-                continue; //there's only k-1 chars in the waitHeap, not full yet
-            }
-            Map.Entry<Character, Integer> front = waitQueue.poll();
-            if (front.getValue() > 0) {
-                heap.offer(front);
+            StringBuilder stringBuilder = new StringBuilder();
+            while (!heap.isEmpty()) {
+                Map.Entry<Character, Integer> entry = heap.poll();
+                stringBuilder.append(entry.getKey());
+                entry.setValue(entry.getValue() - 1);
+                waitQueue.offer(entry);
+                if (waitQueue.size() < k) {
+                    continue; //there's only k-1 chars in the waitHeap, not full yet
+                }
+                Map.Entry<Character, Integer> front = waitQueue.poll();
+                if (front.getValue() > 0) {
+                    heap.offer(front);
+                }
             }
-        }
 
-        return stringBuilder.length() == s.length() ? stringBuilder.toString() : "";
+            return stringBuilder.length() == s.length() ? stringBuilder.toString() : "";
+        }
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_358Test.java b/src/test/java/com/fishercoder/_358Test.java
@@ -9,25 +9,25 @@
  */
 public class _358Test {
 
-    private static _358 test;
+  private static _358.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
-        test = new _358();
-    }
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _358.Solution1();
+  }
 
-    @Test
-    public void test1() {
-        System.out.println(test.rearrangeString("aabbcc", 3));
-    }
+  @Test
+  public void test1() {
+    System.out.println(solution1.rearrangeString("aabbcc", 3));
+  }
 
-    @Test
-    public void test2() {
-        System.out.println(test.rearrangeString("aaabc", 3));
-    }
+  @Test
+  public void test2() {
+    System.out.println(solution1.rearrangeString("aaabc", 3));
+  }
 
-    @Test
-    public void test3() {
-        System.out.println(test.rearrangeString("aaadbbcc", 2));
-    }
+  @Test
+  public void test3() {
+    System.out.println(solution1.rearrangeString("aaadbbcc", 2));
+  }
 }
