refactor 320

fishercoder1534 · fishercoder1534 · commit adb5683b0a07 · 2018-12-29T07:54:37.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_320.java b/src/main/java/com/fishercoder/solutions/_320.java
@@ -4,6 +4,8 @@
 import java.util.List;
 
 /**
+ * 320. Generalized Abbreviation
+ *
  * Write a function to generate the generalized abbreviations of a word.
 
  Example:
@@ -13,21 +15,25 @@
  */
 public class _320 {
 
-    public List<String> generateAbbreviations(String word) {
-        List<String> result = new ArrayList<>();
-        backtrack(word, result, 0, "", 0);
-        return result;
-    }
+    public static class Solution1 {
+        public List<String> generateAbbreviations(String word) {
+            List<String> result = new ArrayList<>();
+            backtrack(word, result, 0, "", 0);
+            return result;
+        }
 
-    private void backtrack(String word, List<String> result, int position, String current, int count) {
-        if (position == word.length()) {
-            if (count > 0) {
-                current += count;
+        private void backtrack(String word, List<String> result, int position, String current,
+            int count) {
+            if (position == word.length()) {
+                if (count > 0) {
+                    current += count;
+                }
+                result.add(current);
+            } else {
+                backtrack(word, result, position + 1, current, count + 1);
+                backtrack(word, result, position + 1,
+                    current + (count > 0 ? count : "") + word.charAt(position), 0);
             }
-            result.add(current);
-        } else {
-            backtrack(word, result, position + 1, current, count + 1);
-            backtrack(word, result, position + 1, current + (count > 0 ? count : "") + word.charAt(position), 0);
         }
     }
 
diff --git a/src/test/java/com/fishercoder/_320Test.java b/src/test/java/com/fishercoder/_320Test.java
@@ -11,31 +11,30 @@
 
 import static org.junit.Assert.assertTrue;
 
-/**
- * Created by fishercoder on 2/10/17.
- */
 public class _320Test {
-    private static _320 test;
-    private static List<String> expected;
-    private static List<String> actual;
-    private static String word;
+  private static _320.Solution1 solution1;
+  private static List<String> expected;
+  private static List<String> actual;
+  private static String word;
 
-    @BeforeClass
-    public static void setup() {
-        test = new _320();
-    }
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _320.Solution1();
+  }
 
-    @Before
-    public void setupForEachTest() {
-        expected = new ArrayList<>();
-        actual = new ArrayList<>();
-    }
+  @Before
+  public void setupForEachTest() {
+    expected = new ArrayList<>();
+    actual = new ArrayList<>();
+  }
 
-    @Test
-    public void test1() {
-        word = "word";
-        expected = Arrays.asList("word", "1ord", "w1rd", "wo1d", "wor1", "2rd", "w2d", "wo2", "1o1d", "1or1", "w1r1", "1o2", "2r1", "3d", "w3", "4");
-        actual = test.generateAbbreviations(word);
-        assertTrue(expected.containsAll(actual) && actual.containsAll(expected));
-    }
+  @Test
+  public void test1() {
+    word = "word";
+    expected =
+        Arrays.asList("word", "1ord", "w1rd", "wo1d", "wor1", "2rd", "w2d", "wo2", "1o1d", "1or1",
+            "w1r1", "1o2", "2r1", "3d", "w3", "4");
+    actual = solution1.generateAbbreviations(word);
+    assertTrue(expected.containsAll(actual) && actual.containsAll(expected));
+  }
 }
