commit solution 56

lxlxw · lxlxw · commit f15d84f383d9 · 2020-07-09T09:55:55.000+08:00
diff --git a/index-tags.md b/index-tags.md
@@ -14,11 +14,13 @@
 |  [34](https://leetcode-cn.com/problems/find-first-and-last-position-of-element-in-sorted-array)  |  [在排序数组中查找元素的第一个和最后一个位置](/solution/1-99/0034.find-first-and-last-position-of-element-in-sorted-array/)  |  `数组`,`二分查找`  |  <font color=blue>中等</font>  |✅ |
 |  [35](https://leetcode-cn.com/problems/search-insert-position)  |  [搜索插入位置](/solution/1-99/0035.search-insert-position/)  |  `数组`,`二分查找`  |  <font color=green>简单</font>  |✅ |
 |  [53](https://leetcode-cn.com/problems/maximum-subarray)  |  [最大子序和](/solution/1-99/0053.maximum-subarray/)  |  `数组`,`分治算法`,`动态规划`  |  <font color=green>简单</font>  |✅ |
+|  [56](https://leetcode-cn.com/problems/merge-intervals)  |  [合并区间](/solution/1-99/0056.merge-intervals/)  |  `排序`,`数组`  |  <font color=blue>中等</font>  |✅ |
 |  [66](https://leetcode-cn.com/problems/plus-one)  |  [加一](/solution/1-99/0066.plus-one/)  |  `数组`  |  <font color=green>简单</font>  |✅ |
 |  [75](https://leetcode-cn.com/problems/sort-colors)  |  [颜色分类](/solution/1-99/0075.sort-colors/)  |  `排序`,`数组`,`双指针`  |  <font color=blue>中等</font>  |✅ |
 |  [80](https://leetcode-cn.com/problems/remove-duplicates-from-sorted-array-ii)  |  [删除排序数组中的重复项 ii](/solution/1-99/0080.remove-duplicates-from-sorted-array-ii/)  |  `数组`,`双指针`  |  <font color=blue>中等</font>  |✅ |
 |  [88](https://leetcode-cn.com/problems/merge-sorted-array)  |  [合并两个有序数组](/solution/1-99/0088.merge-sorted-array/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
 |  [118](https://leetcode-cn.com/problems/pascals-triangle)  |  [杨辉三角](/solution/100-199/0118.pascal%27s-triangle/)  |  `数组`  |  <font color=green>简单</font>  |✅ |
+|  [121](https://leetcode-cn.com/problems/best-time-to-buy-and-sell-stock)  |  [买卖股票的最佳时机](/solution/100-199/0121.best-time-to-buy-and-sell-stock/)  |  `数组`,`动态规划`  |  <font color=green>简单</font>  |✅ |
 |  [167](https://leetcode-cn.com/problems/two-sum-ii-input-array-is-sorted)  |  [两数之和 ii - 输入有序数组](/solution/100-199/0167.two-sum-ii---input-array-is-sorted/)  |  `数组`,`双指针`,`二分查找`  |  <font color=green>简单</font>  |✅ |
 |  [169](https://leetcode-cn.com/problems/majority-element)  |  [多数元素](/solution/100-199/0169.majority-element/)  |  `位运算`,`数组`,`分治算法`  |  <font color=green>简单</font>  |✅ |
 |  [189](https://leetcode-cn.com/problems/rotate-array)  |  [旋转数组](/solution/100-199/0189.rotate-array/)  |  `数组`  |  <font color=green>简单</font>  |✅ |
@@ -133,7 +135,9 @@
 
 |  题号  |  题解  |  标签  | 难度  | 是否解题 |
 | --- | --- | --- | --- | --- |
+|  [56](https://leetcode-cn.com/problems/merge-intervals)  |  [合并区间](/solution/1-99/0056.merge-intervals/)  |  `排序`,`数组`  |  <font color=blue>中等</font>  |✅ |
 |  [75](https://leetcode-cn.com/problems/sort-colors)  |  [颜色分类](/solution/1-99/0075.sort-colors/)  |  `排序`,`数组`,`双指针`  |  <font color=blue>中等</font>  |✅ |
+
 #### **队列**
 
 #### **位运算**
@@ -192,6 +196,7 @@
 |  题号  |  题解  |  标签  | 难度  | 是否解题 |
 | --- | --- | --- | --- | --- |
 |  [53](https://leetcode-cn.com/problems/maximum-subarray)  |  [最大子序和](/solution/1-99/0053.maximum-subarray/)  |  `数组`,`分治算法`,`动态规划`  |  <font color=green>简单</font>  |✅ |
+|  [121](https://leetcode-cn.com/problems/best-time-to-buy-and-sell-stock)  |  [买卖股票的最佳时机](/solution/100-199/0121.best-time-to-buy-and-sell-stock/)  |  `数组`,`动态规划`  |  <font color=green>简单</font>  |✅ |
 
 #### **分治算法**
 
diff --git a/index-type.md b/index-type.md
@@ -37,7 +37,7 @@
 |  [112](https://leetcode-cn.com/problems/path-sum)  |  [路径总和](/solution/100-199/0112.path-sum/)  |  `树`,`深度优先搜索`  |  <font color=green>简单</font>  |✅ |
 |  [118](https://leetcode-cn.com/problems/pascals-triangle)  |  [杨辉三角](/solution/100-199/0118.pascal%27s-triangle/)  |  `数组`  |  <font color=green>简单</font>  |✅ |
 |  [119](https://leetcode-cn.com/problems/pascals-triangle-ii)  |  [杨辉三角 ii](/solution/100-199/0119.pascal%27s-triangle-ii/)  |  `数组`  |  <font color=green>简单</font>  |
-|  [121](https://leetcode-cn.com/problems/best-time-to-buy-and-sell-stock)  |  [买卖股票的最佳时机](/solution/100-199/0121.best-time-to-buy-and-sell-stock/)  |  `数组`,`动态规划`  |  <font color=green>简单</font>  |
+|  [121](https://leetcode-cn.com/problems/best-time-to-buy-and-sell-stock)  |  [买卖股票的最佳时机](/solution/100-199/0121.best-time-to-buy-and-sell-stock/)  |  `数组`,`动态规划`  |  <font color=green>简单</font>  |✅ |
 |  [122](https://leetcode-cn.com/problems/best-time-to-buy-and-sell-stock-ii)  |  [买卖股票的最佳时机 ii](/solution/100-199/0122.best-time-to-buy-and-sell-stock-ii/)  |  `贪心算法`,`数组`  |  <font color=green>简单</font>  |
 |  [125](https://leetcode-cn.com/problems/valid-palindrome)  |  [验证回文串](/solution/100-199/0125.valid-palindrome/)  |  `双指针`,`字符串`  |  <font color=green>简单</font>  |✅ |
 |  [136](https://leetcode-cn.com/problems/single-number)  |  [只出现一次的数字](/solution/100-199/0136.single-number/)  |  `位运算`,`哈希表`  |  <font color=green>简单</font>  |✅ |
@@ -434,7 +434,7 @@
 |  [50](https://leetcode-cn.com/problems/powx-n)  |  [pow(x, n)](/solution/1-99/0050.pow%28x%2c-n%29/)  |  `数学`,`二分查找`  |  <font color=blue>中等</font>  |✅ |
 |  [54](https://leetcode-cn.com/problems/spiral-matrix)  |  [螺旋矩阵](/solution/1-99/0054.spiral-matrix/)  |  `数组`  |  <font color=blue>中等</font>  |
 |  [55](https://leetcode-cn.com/problems/jump-game)  |  [跳跃游戏](/solution/1-99/0055.jump-game/)  |  `贪心算法`,`数组`  |  <font color=blue>中等</font>  |
-|  [56](https://leetcode-cn.com/problems/merge-intervals)  |  [合并区间](/solution/1-99/0056.merge-intervals/)  |  `排序`,`数组`  |  <font color=blue>中等</font>  |
+|  [56](https://leetcode-cn.com/problems/merge-intervals)  |  [合并区间](/solution/1-99/0056.merge-intervals/)  |  `排序`,`数组`  |  <font color=blue>中等</font>  |✅ |
 |  [59](https://leetcode-cn.com/problems/spiral-matrix-ii)  |  [螺旋矩阵 ii](/solution/1-99/0059.spiral-matrix-ii/)  |  `数组`  |  <font color=blue>中等</font>  |
 |  [60](https://leetcode-cn.com/problems/permutation-sequence)  |  [第k个排列](/solution/1-99/0060.permutation-sequence/)  |  `数学`,`回溯算法`  |  <font color=blue>中等</font>  |
 |  [61](https://leetcode-cn.com/problems/rotate-list)  |  [旋转链表](/solution/1-99/0061.rotate-list/)  |  `链表`,`双指针`  |  <font color=blue>中等</font>  |
diff --git a/solution/1-99/0056.merge-intervals/README.md b/solution/1-99/0056.merge-intervals/README.md
@@ -1,7 +1,7 @@
 # [56. 合并区间](https://leetcode-cn.com/problems/merge-intervals)
 
 ### 题目描述
-<!-- 这里写题目描述 -->
+
 <p>给出一个区间的集合，请合并所有重叠的区间。</p>
 
 <p><strong>示例 1:</strong></p>
@@ -24,12 +24,42 @@
 
 ### 具体解法
 
-<!-- tabs:start -->
 
 #### **Golang**
 ```go
-
+func merge(intervals [][]int) [][]int {
+	var res [][]int
+	if len(intervals) == 0 {
+		return res
+	}
+	if len(intervals) == 1 {
+		return intervals
+	}
+	sort.Slice(intervals, func(i, j int) bool {
+		return intervals[i][0] < intervals[j][0]
+	})
+	tmp := intervals[0]
+	flag := false
+	for _, nums := range intervals[1:] {
+		if tmp[1] >= nums[0] && tmp[0] <= nums[1] {
+			if tmp[1] < nums[1] {
+				tmp[1] = nums[1]
+			}
+			if tmp[0] > nums[0] {
+				tmp[0] = nums[0]
+			}
+			flag = true
+		} else {
+			res = append(res, tmp)
+			flag = false
+			tmp = nums
+		}
+	}
+	if flag == true || tmp[0] == intervals[len(intervals)-1][0] {
+		res = append(res, tmp)
+	}
+	return res
+}
 ```
 
-<!-- tabs:end -->
 
diff --git a/solution/1-99/0056.merge-intervals/solution.go b/solution/1-99/0056.merge-intervals/solution.go
@@ -0,0 +1,48 @@
+package leetcode
+
+import (
+	"sort"
+)
+
+/*
+ * @lc app=leetcode.cn id=56 lang=golang
+ *
+ * [56] 合并区间
+ */
+
+// @lc code=start
+func merge(intervals [][]int) [][]int {
+	var res [][]int
+	if len(intervals) == 0 {
+		return res
+	}
+	if len(intervals) == 1 {
+		return intervals
+	}
+	sort.Slice(intervals, func(i, j int) bool {
+		return intervals[i][0] < intervals[j][0]
+	})
+	tmp := intervals[0]
+	flag := false
+	for _, nums := range intervals[1:] {
+		if tmp[1] >= nums[0] && tmp[0] <= nums[1] {
+			if tmp[1] < nums[1] {
+				tmp[1] = nums[1]
+			}
+			if tmp[0] > nums[0] {
+				tmp[0] = nums[0]
+			}
+			flag = true
+		} else {
+			res = append(res, tmp)
+			flag = false
+			tmp = nums
+		}
+	}
+	if flag == true || tmp[0] == intervals[len(intervals)-1][0] {
+		res = append(res, tmp)
+	}
+	return res
+}
+
+// @lc code=end
diff --git a/solution/1-99/0056.merge-intervals/solution_test.go b/solution/1-99/0056.merge-intervals/solution_test.go
@@ -0,0 +1,42 @@
+package leetcode
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestMerge(t *testing.T) {
+	var nums [][]int
+
+	nums = [][]int{{1, 4}, {4, 5}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 3}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 4}, {5, 6}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 6}, {2, 6}, {8, 10}, {15, 18}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 4}, {0, 4}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 4}, {0, 1}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{1, 4}, {0, 0}}
+
+	fmt.Println(merge(nums))
+
+	nums = [][]int{{2, 3}, {4, 5}, {6, 7}, {8, 9}, {1, 10}}
+
+	fmt.Println(merge(nums))
+}
diff --git a/solution/1-99/_sidebar.md b/solution/1-99/_sidebar.md
@@ -61,7 +61,7 @@
     - [53. 最大子序和 ✅](solution/1-99/0053.maximum-subarray/)
     - [54. 螺旋矩阵](solution/1-99/0054.spiral-matrix/)
     - [55. 跳跃游戏](solution/1-99/0055.jump-game/)
-    - [56. 合并区间](solution/1-99/0056.merge-intervals/)
+    - [56. 合并区间 ✅](solution/1-99/0056.merge-intervals/)
     - [57. 插入区间](solution/1-99/0057.insert-interval/)
     - [58. 最后一个单词的长度 ✅](solution/1-99/0058.length-of-last-word/)
     - [59. 螺旋矩阵 ii](solution/1-99/0059.spiral-matrix-ii/)
