refactor 418

fishercoder1534 · fishercoder1534 · commit 4556542ebd2f · 2019-03-19T07:44:49.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_418.java b/src/main/java/com/fishercoder/solutions/_418.java
@@ -62,29 +62,31 @@
  */
 public class _418 {
 
-    /**credit: https://discuss.leetcode.com/topic/62455/21ms-18-lines-java-solution
-     *
-     1. String s = String.join(" ", sentence) + " " ;. This line gives us a formatted sentence to be put to our screen.
-     2. start is the counter for how many valid characters from s have been put to our screen.
-     3. if (s.charAt(start % l) == ' ') is the situation that we don't need an extra space for current row. The current row could be successfully fitted. So that we need to increase our counter by using start++.
-     4. The else is the situation, which the next word can't fit to current row. So that we need to remove extra characters from next word.
-     5. start / s.length() is (# of valid characters) / our formatted sentence.
-     */
-    public int wordsTyping(String[] sentence, int rows, int cols) {
-        String s = String.join(" ", sentence) + " ";
-        int start = 0;
-        int l = s.length();
-        for (int i = 0; i < rows; i++) {
-            start += cols;
-            if (s.charAt(start % l) == ' ') {
-                start++;
-            } else {
-                while (start > 0 && s.charAt((start - 1) % l) != ' ') {
-                    start--;
+    public static class Solution1 {
+        /**
+         * credit: https://discuss.leetcode.com/topic/62455/21ms-18-lines-java-solution
+         * <p>
+         * 1. String s = String.join(" ", sentence) + " " ;. This line gives us a formatted sentence to be put to our screen.
+         * 2. start is the counter for how many valid characters from s have been put to our screen.
+         * 3. if (s.charAt(start % l) == ' ') is the situation that we don't need an extra space for current row. The current row could be successfully fitted. So that we need to increase our counter by using start++.
+         * 4. The else is the situation, which the next word can't fit to current row. So that we need to remove extra characters from next word.
+         * 5. start / s.length() is (# of valid characters) / our formatted sentence.
+         */
+        public int wordsTyping(String[] sentence, int rows, int cols) {
+            String s = String.join(" ", sentence) + " ";
+            int start = 0;
+            int l = s.length();
+            for (int i = 0; i < rows; i++) {
+                start += cols;
+                if (s.charAt(start % l) == ' ') {
+                    start++;
+                } else {
+                    while (start > 0 && s.charAt((start - 1) % l) != ' ') {
+                        start--;
+                    }
                 }
             }
+            return start / s.length();
         }
-        return start / s.length();
     }
-
 }
diff --git a/src/test/java/com/fishercoder/_418Test.java b/src/test/java/com/fishercoder/_418Test.java
@@ -6,16 +6,13 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by stevesun on 6/11/17.
- */
 public class _418Test {
-    private static _418 test;
+    private static _418.Solution1 test;
     private static String[] sentence;
 
     @BeforeClass
     public static void setup() {
-        test = new _418();
+        test = new _418.Solution1();
     }
 
     @Test
