Merge branch 'master' of github.com:youngyangyang04/leetcode-master

Author: youngyangyang04

problems/0027.移除元素.md

@@ -281,10 +281,8 @@ func removeElement(_ nums: inout [Int], _ val: Int) -> Int {
 
     for fastIndex in 0..<nums.count {
         if val != nums[fastIndex] {
-            if slowIndex != fastIndex {
                 nums[slowIndex] = nums[fastIndex]
-            }
-            slowIndex += 1
+                slowIndex += 1
         }
     }
     return slowIndex

problems/0045.跳跃游戏II.md

@@ -250,6 +250,27 @@ var jump = function(nums) {
 };
 ```
 
+### TypeScript
+
+```typescript
+function jump(nums: number[]): number {
+    const length: number = nums.length;
+    let curFarthestIndex: number = 0,
+        nextFarthestIndex: number = 0;
+    let curIndex: number = 0;
+    let stepNum: number = 0;
+    while (curIndex < length - 1) {
+        nextFarthestIndex = Math.max(nextFarthestIndex, curIndex + nums[curIndex]);
+        if (curIndex === curFarthestIndex) {
+            curFarthestIndex = nextFarthestIndex;
+            stepNum++;
+        }
+        curIndex++;
+    }
+    return stepNum;
+};
+```
+
 
 
 

problems/0055.跳跃游戏.md

@@ -154,6 +154,23 @@ var canJump = function(nums) {
 };
 ```
 
+### TypeScript
+
+```typescript
+function canJump(nums: number[]): boolean {
+    let farthestIndex: number = 0;
+    let cur: number = 0;
+    while (cur <= farthestIndex) {
+        farthestIndex = Math.max(farthestIndex, cur + nums[cur]);
+        if (farthestIndex >= nums.length - 1) return true;
+        cur++;
+    }
+    return false;
+};
+```
+
+
+
 
 -----------------------
 <div align="center"><img src=https://code-thinking.cdn.bcebos.com/pics/01二维码一.jpg width=500> </img></div>

problems/0059.螺旋矩阵II.md

@@ -246,11 +246,11 @@ var generateMatrix = function(n) {
             res[row][col] = count++;
         }
         // 下行从右到左（左闭右开）
-        for (; col > startX; col--) {
+        for (; col > startY; col--) {
             res[row][col] = count++;
         }
         // 左列做下到上（左闭右开）
-        for (; row > startY; row--) {
+        for (; row > startX; row--) {
             res[row][col] = count++;
         }
 

problems/0121.买卖股票的最佳时机.md

@@ -311,7 +311,36 @@ class Solution:
 ```
 
 Go:
+> 贪心法：
+```Go
+func maxProfit(prices []int) int {
+    low := math.MaxInt32
+    rlt := 0
+    for i := range prices{
+        low = min(low, prices[i])
+        rlt = max(rlt, prices[i]-low)
+    }
+
+    return rlt
+}
+func min(a, b int) int {
+    if a < b{
+        return a
+    }
+
+    return b
+}
+
+func max(a, b int) int {
+    if a > b{
+        return a
+    }
+
+    return b
+}
+```
 
+> 动态规划：版本一
 ```Go
 func maxProfit(prices []int) int {
 	length:=len(prices)
@@ -338,6 +367,29 @@ func max(a,b int)int {
 }
 ```
 
+> 动态规划：版本二
+```Go
+func maxProfit(prices []int) int {
+    dp := [2][2]int{}
+    dp[0][0] = -prices[0]   
+    dp[0][1] = 0
+    for i := 1; i < len(prices); i++{
+        dp[i%2][0] = max(dp[(i-1)%2][0], -prices[i])
+        dp[i%2][1] = max(dp[(i-1)%2][1], dp[(i-1)%2][0]+prices[i])
+    }
+
+    return dp[(len(prices)-1)%2][1]
+}
+
+func max(a, b int) int {
+    if a > b{
+        return a 
+    }
+
+    return b
+}
+```
+
 JavaScript:
 
 > 动态规划

problems/0122.买卖股票的最佳时机II.md

@@ -264,7 +264,19 @@ const maxProfit = (prices) => {
         dp[i][1] = Math.max(dp[i-1][1], dp[i-1][0] + prices[i]);
     }
 
-    return dp[prices.length -1][0];
+    return dp[prices.length -1][1];
+};
+```
+
+TypeScript：
+
+```typescript
+function maxProfit(prices: number[]): number {
+    let resProfit: number = 0;
+    for (let i = 1, length = prices.length; i < length; i++) {
+        resProfit += Math.max(prices[i] - prices[i - 1], 0);
+    }
+    return resProfit;
 };
 ```
 

problems/0122.买卖股票的最佳时机II（动态规划）.md

@@ -276,7 +276,7 @@ const maxProfit = (prices) => {
         dp[i][1] = Math.max(dp[i-1][1], dp[i-1][0] + prices[i]);
     }
 
-    return dp[prices.length -1][0];
+    return dp[prices.length -1][1];
 };
 
 // 方法二：动态规划（滚动数组）

problems/0134.加油站.md

@@ -235,7 +235,7 @@ class Solution {
         return index;
     }
 }
-``` 
+```
 
 ### Python 
 ```python
@@ -364,7 +364,50 @@ var canCompleteCircuit = function(gas, cost) {
 };
 ```
 
+### TypeScript
+
+**暴力法：**
+
+```typescript
+function canCompleteCircuit(gas: number[], cost: number[]): number {
+    for (let i = 0, length = gas.length; i < length; i++) {
+        let curSum: number = 0;
+        let index: number = i;
+        while (curSum >= 0 && index < i + length) {
+            let tempIndex: number = index % length;
+            curSum += gas[tempIndex] - cost[tempIndex];
+            index++;
+        }
+        if (index === i + length && curSum >= 0) return i;
+    }
+    return -1;
+};
+```
+
+**解法二：**
+
+```typescript
+function canCompleteCircuit(gas: number[], cost: number[]): number {
+    let total: number = 0;
+    let curGas: number = 0;
+    let tempDiff: number = 0;
+    let resIndex: number = 0;
+    for (let i = 0, length = gas.length; i < length; i++) {
+        tempDiff = gas[i] - cost[i];
+        total += tempDiff;
+        curGas += tempDiff;
+        if (curGas < 0) {
+            resIndex = i + 1;
+            curGas = 0;
+        }
+    }
+    if (total < 0) return -1;
+    return resIndex;
+};
+```
+
 ### C 
+
 ```c
 int canCompleteCircuit(int* gas, int gasSize, int* cost, int costSize){
     int curSum = 0;

problems/0135.分发糖果.md

@@ -238,6 +238,32 @@ var candy = function(ratings) {
 };
 ```
 
+### TypeScript
+
+```typescript
+function candy(ratings: number[]): number {
+    const candies: number[] = [];
+    candies[0] = 1;
+    // 保证右边高分孩子一定比左边低分孩子发更多的糖果
+    for (let i = 1, length = ratings.length; i < length; i++) {
+        if (ratings[i] > ratings[i - 1]) {
+            candies[i] = candies[i - 1] + 1;
+        } else {
+            candies[i] = 1;
+        }
+    }
+    // 保证左边高分孩子一定比右边低分孩子发更多的糖果
+    for (let i = ratings.length - 2; i >= 0; i--) {
+        if (ratings[i] > ratings[i + 1]) {
+            candies[i] = Math.max(candies[i], candies[i + 1] + 1);
+        }
+    }
+    return candies.reduce((pre, cur) => pre + cur);
+};
+```
+
+
+
 
 -----------------------
 <div align="center"><img src=https://code-thinking.cdn.bcebos.com/pics/01二维码一.jpg width=500> </img></div>

problems/0416.分割等和子集.md

@@ -50,7 +50,7 @@
 
 ## 01背包问题
 
-背包问题，大家都知道，有N件物品和一个最多能被重量为W 的背包。第i件物品的重量是weight[i]，得到的价值是value[i] 。每件物品只能用一次，求解将哪些物品装入背包里物品价值总和最大。
+背包问题，大家都知道，有N件物品和一个最多能背重量为W 的背包。第i件物品的重量是weight[i]，得到的价值是value[i] 。每件物品只能用一次，求解将哪些物品装入背包里物品价值总和最大。
 
 **背包问题有多种背包方式，常见的有：01背包、完全背包、多重背包、分组背包和混合背包等等。**