RegularExpressionMatching10

fluency03 · fluency03 · commit d65a67fdb361 · 2018-03-14T11:57:09.000+01:00
diff --git a/src/RegularExpressionMatching10.java b/src/RegularExpressionMatching10.java
@@ -139,7 +139,7 @@ public boolean isMatch5(String s, String p) {
                         dp[i][j] = dp[i-1][j-1];
                         break;
                     case '*':
-                        dp[i][j] = dp[i][j-2] || isMatch(dp, s, i, p, j);
+                        dp[i][j] = dp[i][j-2] || ((p.charAt(j-2) == '.' || p.charAt(j-2) == s.charAt(i-1)) && dp[i-1][j]);
                         break;
                     default:
                         dp[i][j] = s.charAt(i-1) == p.charAt(j-1) && dp[i-1][j-1];
@@ -149,14 +149,4 @@ public boolean isMatch5(String s, String p) {
         return dp[s.length()][p.length()];
     }
 
-    private boolean isMatch(boolean[][] dp, String s, int i, String p, int j) {
-        char c = p.charAt(j-2);
-        while (i >= 1 && (c == '.' || s.charAt(i-1) == c)) {
-            if (dp[i][j-1]) return true;
-            else i--;
-        }
-        return false;
-    }
-
-
 }
