From 44a5919c0ba0f18a838b036657d08228579f17c4 Mon Sep 17 00:00:00 2001
From: yuanguangxin <274841922@qq.com>
Date: Sat, 15 Feb 2020 02:33:32 +0800
Subject: [PATCH] update q10/q746

---
 .idea/workspace.xml    | 38 +++++++++++++-------------
 src/q10/Solution.java  | 61 +++++++++---------------------------------
 src/q746/Solution.java |  6 ++---
 3 files changed, 34 insertions(+), 71 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62443b0..cce2e36 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="af7ffdf2-4ddc-4ed6-8222-60ed5acbc2ed" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Interviewing.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/q10/Solution.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/q110/q2/Solution.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/q110/q2/TreeNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/q22/f1/Solution.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/q22/f2/Solution.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Rocket.md" beforeDir="false" afterPath="$PROJECT_DIR$/Rocket.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/q110/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/q110/q1/Solution.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/q110/TreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/q110/q1/TreeNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/q94/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/q94/Solution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/q10/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/q10/Solution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/q746/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/q746/Solution.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -226,7 +218,7 @@
       <workItem from="1580044287086" duration="50376000" />
       <workItem from="1580562331089" duration="8289000" />
       <workItem from="1580626297484" duration="35811000" />
-      <workItem from="1581061282899" duration="68429000" />
+      <workItem from="1581061282899" duration="68993000" />
     </task>
     <task id="LOCAL-00001" summary="add q5/q7/q172">
       <created>1580045439607</created>
@@ -340,7 +332,14 @@
       <option name="project" value="LOCAL" />
       <updated>1581519773712</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="update md">
+      <created>1581704713975</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1581704713975</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -363,7 +362,8 @@
     <MESSAGE value="add q110/q450/q701" />
     <MESSAGE value="add q1277" />
     <MESSAGE value="add q42" />
-    <option name="LAST_COMMIT_MESSAGE" value="add q42" />
+    <MESSAGE value="update md" />
+    <option name="LAST_COMMIT_MESSAGE" value="update md" />
   </component>
   <component name="WindowStateProjectService">
     <state x="320" y="115" key="#Inspections" timestamp="1581061018990">
@@ -378,14 +378,14 @@
       <screen x="0" y="0" width="1440" height="900" />
     </state>
     <state x="533" y="166" key="#com.intellij.ide.util.MemberChooser/0.0.1440.900@0.0.1440.900" timestamp="1578548165321" />
-    <state x="303" y="50" key="CommitChangelistDialog2" timestamp="1581704695669">
+    <state x="303" y="50" key="CommitChangelistDialog2" timestamp="1581704713389">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="303" y="50" key="CommitChangelistDialog2/0.0.1440.900@0.0.1440.900" timestamp="1581704695669" />
-    <state x="144" y="78" key="DiffContextDialog" timestamp="1581704670225">
+    <state x="303" y="50" key="CommitChangelistDialog2/0.0.1440.900@0.0.1440.900" timestamp="1581704713389" />
+    <state x="144" y="78" key="DiffContextDialog" timestamp="1581704720088">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="144" y="78" key="DiffContextDialog/0.0.1440.900@0.0.1440.900" timestamp="1581704670225" />
+    <state x="144" y="78" key="DiffContextDialog/0.0.1440.900@0.0.1440.900" timestamp="1581704720088" />
     <state width="1398" height="177" key="GridCell.Tab.0.bottom" timestamp="1581704695726">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
@@ -430,10 +430,10 @@
       <screen x="0" y="0" width="1440" height="900" />
     </state>
     <state x="221" y="63" key="SettingsEditor/0.0.1440.900@0.0.1440.900" timestamp="1581061096545" />
-    <state x="320" y="190" key="Vcs.Push.Dialog.v2" timestamp="1581519775156">
+    <state x="320" y="190" key="Vcs.Push.Dialog.v2" timestamp="1581704721326">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
-    <state x="320" y="190" key="Vcs.Push.Dialog.v2/0.0.1440.900@0.0.1440.900" timestamp="1581519775156" />
+    <state x="320" y="190" key="Vcs.Push.Dialog.v2/0.0.1440.900@0.0.1440.900" timestamp="1581704721326" />
     <state x="378" y="207" width="683" height="486" key="find.popup" timestamp="1581572590737">
       <screen x="0" y="0" width="1440" height="900" />
     </state>
diff --git a/src/q10/Solution.java b/src/q10/Solution.java
index 245dc27..b973a65 100644
--- a/src/q10/Solution.java
+++ b/src/q10/Solution.java
@@ -1,57 +1,20 @@
 package q10;
 
+/**
+ * 回溯法 对于*字符，可以直接忽略模式串中这一部分，或者删除匹配串的第一个字符，前提是它能够匹配模式串当前位置字符，即 pattern[0]。如果两种操作中有任何一种使得剩下的字符串能匹配，那么初始时，匹配串和模式串就可以被匹配。
+ */
 public class Solution {
-    public boolean isMatch(String s, String p) {
-        int i = 0;
-        int j = 0;
-        while (i < s.length()) {
-            char sc = s.charAt(i);
-            if (j >= p.length()) {
-                return false;
-            }
-            char pc = p.charAt(j);
+    public boolean isMatch(String text, String pattern) {
+        if (pattern.isEmpty()) return text.isEmpty();
+        boolean firstMatch = (!text.isEmpty() &&
+                (pattern.charAt(0) == text.charAt(0) || pattern.charAt(0) == '.'));
 
-            if (j + 1 < p.length()) {
-                if (p.charAt(j + 1) == '*') {
-                    if (pc == '.') {
-                        j+=2;
-                        break;
-                    } else if (pc == sc) {
-                        while (i < s.length() && s.charAt(i) == pc) {
-                            i++;
-                        }
-                    }
-                    j += 2;
-                } else {
-                    if ((sc == pc) || (pc == '.')) {
-                        i++;
-                        j++;
-                    } else {
-                        return false;
-                    }
-                }
-            } else {
-                if ((sc == pc) || (pc == '.')) {
-                    i++;
-                    j++;
-                } else {
-                    return false;
-                }
-            }
+        if (pattern.length() >= 2 && pattern.charAt(1) == '*') {
+            return (isMatch(text, pattern.substring(2)) ||
+                    (firstMatch && isMatch(text.substring(1), pattern)));
+        } else {
+            return firstMatch && isMatch(text.substring(1), pattern.substring(1));
         }
-
-        while (j < p.length()) {
-            if (p.charAt(j) == '*') {
-                j++;
-            } else {
-                if (j + 1 < p.length() && p.charAt(j) == '*') {
-                    j += 2;
-                } else {
-                    return false;
-                }
-            }
-        }
-        return true;
     }
 
     public static void main(String[] args) {
diff --git a/src/q746/Solution.java b/src/q746/Solution.java
index 12d292f..20f1906 100644
--- a/src/q746/Solution.java
+++ b/src/q746/Solution.java
@@ -1,5 +1,8 @@
 package q746;
 
+/**
+ * 动态规划 o(n) f[i] = cost[i] + min(f[i+1], f[i+2])
+ */
 class Solution {
     public int minCostClimbingStairs(int[] cost) {
         int f1 = 0, f2 = 0;
@@ -7,9 +10,6 @@ class Solution {
             int f0 = cost[i] + Math.min(f1, f2);
             f2 = f1;
             f1 = f0;
-            System.out.println("f0=" + f0);
-            System.out.println("f2=" + f2);
-            System.out.println("f1=" + f1);
         }
         return Math.min(f1, f2);
     }