refactor 273

fishercoder1534 · fishercoder1534 · commit a7a4b6aaede3 · 2018-11-17T08:30:43.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_273.java b/src/main/java/com/fishercoder/solutions/_273.java
@@ -1,63 +1,66 @@
 package com.fishercoder.solutions;
 
 /**
+ * 273. Integer to English Words
+ *
  * Convert a non-negative integer to its english words representation. Given input is guaranteed to be less than 231 - 1.
 
  For example,
  123 -> "One Hundred Twenty Three"
  12345 -> "Twelve Thousand Three Hundred Forty Five"
  1234567 -> "One Million Two Hundred Thirty Four Thousand Five Hundred Sixty Seven"
- Hint:
 
+ Hint:
  Did you see a pattern in dividing the number into chunk of words? For example, 123 and 123000.
  Group the number by thousands (3 digits). You can write a helper function that takes a number less than 1000 and convert just that chunk to words.
  There are many edge cases. What are some good test cases? Does your code work with input such as 0? Or 1000010? (middle chunk is zero and should not be printed out)
  */
 public class _273 {
 
-    private String[] belowTen = new String[]{"Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine"};
-    private String[] belowTwenty = new String[]{"Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"};
-    private String[] belowHundred = new String[]{"Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"};
-    private String[] overThousand = new String[]{"Thousand", "Million", "Billion"};
-
-    public String numberToWords(int num) {
-        String result;
-        if (num == 0) {
-            return belowTen[num];
-        }
+    public static class Solution1 {
+        private String[] belowTen = new String[]{"Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine"};
+        private String[] belowTwenty = new String[]{"Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"};
+        private String[] belowHundred = new String[]{"Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"};
+        private String[] overThousand = new String[]{"Thousand", "Million", "Billion"};
 
-        result = hundredHelper(num % 1000);
-        num = num / 1000;
-        int i = 0;
-        while (i < 3 && num > 0) {
-            if (num % 1000 > 0) {
-                result = hundredHelper(num % 1000) + overThousand[i] + " " + result;
+        public String numberToWords(int num) {
+            String result;
+            if (num == 0) {
+                return belowTen[num];
             }
-            num = num / 1000;
-            i++;
-        }
 
-        return result.trim();
-    }
+            result = hundredHelper(num % 1000);
+            num = num / 1000;
+            int i = 0;
+            while (i < 3 && num > 0) {
+                if (num % 1000 > 0) {
+                    result = hundredHelper(num % 1000) + overThousand[i] + " " + result;
+                }
+                num = num / 1000;
+                i++;
+            }
 
-    public String hundredHelper(int num) {
-        String nstr = "";
-        if (num >= 100) {
-            nstr = belowTen[num / 100] + " Hundred ";
+            return result.trim();
         }
-        num = num % 100;
-        if (num >= 20) {
-            if (num % 10 != 0) {
-                nstr = nstr + belowHundred[num / 10 - 2] + " " + belowTen[num % 10] + " ";
-            } else {
-                nstr = nstr + belowHundred[num / 10 - 2] + " ";
+
+        private String hundredHelper(int num) {
+            String nstr = "";
+            if (num >= 100) {
+                nstr = belowTen[num / 100] + " Hundred ";
+            }
+            num = num % 100;
+            if (num >= 20) {
+                if (num % 10 != 0) {
+                    nstr = nstr + belowHundred[num / 10 - 2] + " " + belowTen[num % 10] + " ";
+                } else {
+                    nstr = nstr + belowHundred[num / 10 - 2] + " ";
+                }
+            } else if (num >= 10) {
+                nstr = nstr + belowTwenty[num % 10] + " ";
+            } else if (num > 0) {
+                nstr = nstr + belowTen[num] + " ";
             }
-        } else if (num >= 10) {
-            nstr = nstr + belowTwenty[num % 10] + " ";
-        } else if (num > 0) {
-            nstr = nstr + belowTen[num] + " ";
+            return nstr;
         }
-        return nstr;
     }
-
 }
diff --git a/src/test/java/com/fishercoder/_273Test.java b/src/test/java/com/fishercoder/_273Test.java
@@ -6,33 +6,30 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by fishercoder on 5/13/17.
- */
 public class _273Test {
-    private static _273 test;
+    private static _273.Solution1 solution1;
     private static int num;
 
     @BeforeClass
     public static void setup() {
-        test = new _273();
+        solution1 = new _273.Solution1();
     }
 
     @Test
     public void test1() {
         num = 123;
-        assertEquals("One Hundred Twenty Three", test.numberToWords(num));
+        assertEquals("One Hundred Twenty Three", solution1.numberToWords(num));
     }
 
     @Test
     public void test2() {
         num = 12345;
-        assertEquals("Twelve Thousand Three Hundred Forty Five", test.numberToWords(num));
+        assertEquals("Twelve Thousand Three Hundred Forty Five", solution1.numberToWords(num));
     }
 
     @Test
     public void test3() {
         num = 1234567;
-        assertEquals("One Million Two Hundred Thirty Four Thousand Five Hundred Sixty Seven", test.numberToWords(num));
+        assertEquals("One Million Two Hundred Thirty Four Thousand Five Hundred Sixty Seven", solution1.numberToWords(num));
     }
 }
