[N-0] refactor 10

Author: fishercoder1534

src/main/java/com/fishercoder/solutions/_10.java

@@ -25,32 +25,34 @@
 
 public class _10 {
 
-    public boolean isMatch(String s, String p) {
-        if (s == null || p == null) {
-            return false;
-        }
-        boolean[][] dp = new boolean[s.length() + 1][p.length() + 1];
-        dp[0][0] = true;
-        for (int i = 0; i < p.length(); i++) {
-            if (p.charAt(i) == '*' && dp[0][i - 1]) {
-                dp[0][i + 1] = true;
+    public static class Solution1 {
+        public boolean isMatch(String s, String p) {
+            if (s == null || p == null) {
+                return false;
             }
-        }
-        for (int i = 0; i < s.length(); i++) {
-            for (int j = 0; j < p.length(); j++) {
-                if (p.charAt(j) == '.' || p.charAt(j) == s.charAt(i)) {
-                    dp[i + 1][j + 1] = dp[i][j];
+            boolean[][] dp = new boolean[s.length() + 1][p.length() + 1];
+            dp[0][0] = true;
+            for (int i = 0; i < p.length(); i++) {//here's the p's length, not s's
+                if (p.charAt(i) == '*' && dp[0][i - 1]) {
+                    dp[0][i + 1] = true;//here's y axis should be i+1
                 }
-                if (p.charAt(j) == '*') {
-                    if (p.charAt(j - 1) != s.charAt(i) && p.charAt(j - 1) != '.') {
-                        dp[i + 1][j + 1] = dp[i + 1][j - 1];
-                    } else {
-                        dp[i + 1][j + 1] = (dp[i + 1][j] || dp[i][j + 1] || dp[i + 1][j - 1]);
+            }
+            for (int i = 0; i < s.length(); i++) {
+                for (int j = 0; j < p.length(); j++) {
+                    if (p.charAt(j) == '.' || p.charAt(j) == s.charAt(i)) {
+                        dp[i + 1][j + 1] = dp[i][j];
+                    }
+                    if (p.charAt(j) == '*') {
+                        if (p.charAt(j - 1) != s.charAt(i) && p.charAt(j - 1) != '.') {
+                            dp[i + 1][j + 1] = dp[i + 1][j - 1];
+                        } else {
+                            dp[i + 1][j + 1] = (dp[i + 1][j] || dp[i][j + 1] || dp[i + 1][j - 1]);
+                        }
                     }
                 }
             }
+            return dp[s.length()][p.length()];
         }
-        return dp[s.length()][p.length()];
     }
 
 }

src/test/java/com/fishercoder/_10Test.java

@@ -0,0 +1,32 @@
+package com.fishercoder;
+
+import com.fishercoder.solutions._10;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class _10Test {
+    private static _10.Solution1 solution1;
+
+    @BeforeClass
+    public static void setup() {
+        solution1 = new _10.Solution1();
+    }
+
+    @Test
+    public void test1() {
+        assertEquals(true, solution1.isMatch("", ""));
+    }
+
+    @Test
+    public void test2() {
+        assertEquals(false, solution1.isMatch("aa", "a"));
+    }
+
+    @Test
+    public void test3() {
+        assertEquals(true, solution1.isMatch("aab", "c*a*b"));
+    }
+
+}