refactor 423

fishercoder1534 · fishercoder1534 · commit 7ee8d0dd1f8a · 2019-03-25T08:16:24.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_423.java b/src/main/java/com/fishercoder/solutions/_423.java
@@ -22,60 +22,62 @@
  */
 public class _423 {
 
-    public String originalDigits(String s) {
-        /**we can use one char as a representative to uniquely stand for one number,
-         * for some numbers that we cannot find a unique representive, we can dedup.
-         * e.g. for number one, if we use 'o' as its representive, then 'o' also exists in numbers 2, 4 and 0, so
-         * we need to dedupe the 'o' in those numbers.
-         * Also, the order to dedupe matters:
-         * we'll have to dedupe for counts[3], counts[5], counts[7] first before we dedupe counts[1] and counts[9].*/
-        int[] counts = new int[10];
-        for (int i = 0; i < s.length(); i++) {
-            if (s.charAt(i) == 'o') {
-                counts[1]++;//2,4,0
+    public static class Solution1 {
+        public String originalDigits(String s) {
+            /**we can use one char as a representative to uniquely stand for one number,
+             * for some numbers that we cannot find a unique representive, we can dedup.
+             * e.g. for number one, if we use 'o' as its representive, then 'o' also exists in numbers 2, 4 and 0, so
+             * we need to dedupe the 'o' in those numbers.
+             * Also, the order to dedupe matters:
+             * we'll have to dedupe for counts[3], counts[5], counts[7] first before we dedupe counts[1] and counts[9].*/
+            int[] counts = new int[10];
+            for (int i = 0; i < s.length(); i++) {
+                if (s.charAt(i) == 'o') {
+                    counts[1]++;//2,4,0
+                }
+                if (s.charAt(i) == 'w') {
+                    counts[2]++;
+                }
+                if (s.charAt(i) == 'h') {
+                    counts[3]++;//8
+                }
+                if (s.charAt(i) == 'u') {
+                    counts[4]++;
+                }
+                if (s.charAt(i) == 'f') {
+                    counts[5]++;//4
+                }
+                if (s.charAt(i) == 'x') {
+                    counts[6]++;
+                }
+                if (s.charAt(i) == 'v') {
+                    counts[7]++;//5
+                }
+                if (s.charAt(i) == 'g') {
+                    counts[8]++;
+                }
+                if (s.charAt(i) == 'i') {
+                    counts[9]++;//5,6,8
+                }
+                if (s.charAt(i) == 'z') {
+                    counts[0]++;
+                }
             }
-            if (s.charAt(i) == 'w') {
-                counts[2]++;
-            }
-            if (s.charAt(i) == 'h') {
-                counts[3]++;//8
-            }
-            if (s.charAt(i) == 'u') {
-                counts[4]++;
-            }
-            if (s.charAt(i) == 'f') {
-                counts[5]++;//4
-            }
-            if (s.charAt(i) == 'x') {
-                counts[6]++;
-            }
-            if (s.charAt(i) == 'v') {
-                counts[7]++;//5
-            }
-            if (s.charAt(i) == 'g') {
-                counts[8]++;
-            }
-            if (s.charAt(i) == 'i') {
-                counts[9]++;//5,6,8
-            }
-            if (s.charAt(i) == 'z') {
-                counts[0]++;
-            }
-        }
 
-        counts[3] -= counts[8];
-        counts[5] -= counts[4];
-        counts[7] -= counts[5];
-        counts[1] = counts[1] - (counts[2] + counts[4] + counts[0]);
-        counts[9] = counts[9] - (counts[5] + counts[6] + counts[8]);
+            counts[3] -= counts[8];
+            counts[5] -= counts[4];
+            counts[7] -= counts[5];
+            counts[1] = counts[1] - (counts[2] + counts[4] + counts[0]);
+            counts[9] = counts[9] - (counts[5] + counts[6] + counts[8]);
 
-        StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < 10; i++) {
-            for (int j = 0; j < counts[i]; j++) {
-                stringBuilder.append(i);
+            StringBuilder stringBuilder = new StringBuilder();
+            for (int i = 0; i < 10; i++) {
+                for (int j = 0; j < counts[i]; j++) {
+                    stringBuilder.append(i);
+                }
             }
+            return stringBuilder.toString();
         }
-        return stringBuilder.toString();
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_423Test.java b/src/test/java/com/fishercoder/_423Test.java
@@ -6,25 +6,22 @@
 
 import static junit.framework.Assert.assertEquals;
 
-/**
- * Created by fishercoder on 4/27/17.
- */
 public class _423Test {
-    private static _423 test;
+    private static _423.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String s;
 
     @BeforeClass
     public static void setup() {
-        test = new _423();
+        solution1 = new _423.Solution1();
     }
 
     @Test
     public void test1() {
         s = "fviefuro";
         expected = "45";
-        actual = test.originalDigits(s);
+        actual = solution1.originalDigits(s);
         assertEquals(expected, actual);
     }
 }
