Merge pull request #855 from somone23412/patch-5

修正两个"股票交易"算法解答,将意义不明的s状态删除
This commit is contained in:
CyC2018 2020-02-29 21:46:00 +08:00 committed by GitHub
commit 2d650cc4e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1055,7 +1055,10 @@ public int combinationSum4(int[] nums, int target) {
题目描述交易之后需要有一天的冷却时间
<div align="center"> <img src="https://cs-notes-1256109796.cos.ap-guangzhou.myqcloud.com/ffd96b99-8009-487c-8e98-11c9d44ef14f.png" width="300px"> </div><br>
该题为马尔可夫过程分为A观望B持股C冷却三个状态
状态转移图A-(观望)->A, A-(买入-price)->B, B-(观望)->B, B-(卖出|+price)->C, C-(冷却)->A
可用维特比算法求解
```java
public int maxProfit(int[] prices) {
@ -1063,19 +1066,17 @@ public int maxProfit(int[] prices) {
return 0;
}
int N = prices.length;
int[] buy = new int[N];
int[] s1 = new int[N];
int[] sell = new int[N];
int[] s2 = new int[N];
s1[0] = buy[0] = -prices[0];
sell[0] = s2[0] = 0;
int[] A = new int[N];
int[] B = new int[N];
int[] C = new int[N];
A[0] = 0;
B[0] = C[0] = -prices[0];
for (int i = 1; i < N; i++) {
buy[i] = s2[i - 1] - prices[i];
s1[i] = Math.max(buy[i - 1], s1[i - 1]);
sell[i] = Math.max(buy[i - 1], s1[i - 1]) + prices[i];
s2[i] = Math.max(s2[i - 1], sell[i - 1]);
A[i] = Math.max(A[i - 1], C[i - 1]);
B[i] = Math.max(B[i - 1], A[i - 1] - prices[i]);
C[i] = B[i - 1] + prices[i];
}
return Math.max(sell[N - 1], s2[N - 1]);
return Math.max(A[N - 1], C[N - 1]);
}
```
@ -1098,24 +1099,22 @@ The total profit is ((8 - 1) - 2) + ((9 - 4) - 2) = 8.
题目描述每交易一次都要支付一定的费用
<div align="center"> <img src="https://cs-notes-1256109796.cos.ap-guangzhou.myqcloud.com/1e2c588c-72b7-445e-aacb-d55dc8a88c29.png" width="300px"> </div><br>
分为A观望B持股两个状态
状态转移图A-(观望)->A, A-(买入|-price)->B, B-(观望)->B, B-(卖出|+price|-fee)->A
```java
public int maxProfit(int[] prices, int fee) {
int N = prices.length;
int[] buy = new int[N];
int[] s1 = new int[N];
int[] sell = new int[N];
int[] s2 = new int[N];
s1[0] = buy[0] = -prices[0];
sell[0] = s2[0] = 0;
int[] A = new int[N];
int[] B = new int[N];
A[0] = 0;
B[0] = -prices[0];
for (int i = 1; i < N; i++) {
buy[i] = Math.max(sell[i - 1], s2[i - 1]) - prices[i];
s1[i] = Math.max(buy[i - 1], s1[i - 1]);
sell[i] = Math.max(buy[i - 1], s1[i - 1]) - fee + prices[i];
s2[i] = Math.max(s2[i - 1], sell[i - 1]);
A[i] = Math.max(A[i - 1], B[i - 1] + prices[i] -fee);
B[i] = Math.max(A[i - 1] - prices[i], B[i - 1]);
}
return Math.max(sell[N - 1], s2[N - 1]);
return A[N - 1];
}
```