feat: commit solution

lxlxw · lxlxw · commit 92ac75c6dbac · 2020-06-18T16:15:28.000+08:00
diff --git a/README.md b/README.md
@@ -2,18 +2,16 @@
 ✅ **LeetCode** 题解 
 
 [![Golang](https://img.shields.io/badge/language-Golang-blue.svg)](https://img.shields.io/badge/language-Golang-blue.svg)
-[![Golang](https://img.shields.io/badge/language-Php-red.svg)](https://img.shields.io/badge/language-Php-red.svg)
-[![Golang](https://img.shields.io/badge/language-Python-yellow.svg)](https://img.shields.io/badge/language-Python-yellow.svg)
-[![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 [![Travis](https://www.travis-ci.org/lxlxw/leetcode.svg?branch=master)](https://www.travis-ci.org/lxlxw/leetcode)
 [![Codecov](https://codecov.io/gh/lxlxw/leetcode/branch/master/graph/badge.svg)](https://codecov.io/gh/lxlxw/leetcode)
+[![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 [![HitCount](http://hits.dwyl.com/lxlxw/leetcode.svg)](http://hits.dwyl.com/lxlxw/leetcode)
 
 [ [中文](http://leetcode.xwlin.com)
 | [English](http://leetcode.xwlin.com/#/en/)
  ]
 
-😀 使用`Golang`/`Python`/`PHP`等语言实现LeetCode题解（持续更新中...）
+😀 使用`Golang`语言实现LeetCode题解（持续更新中...）
 
 ## 项目简介
 
@@ -24,7 +22,7 @@ leetcode 题解，记录自己的 leetcode 解题之路。
 - 可根据题目难易度与题型标签进行`快速索引`。
 - 包含leetcode问题链接的`说明`与`示例`。
 - 包含leetcode`解题思路`和具体的`代码实现`。
-- 包含单元测试，已提交的问题均已通过leetcode各自的测试用例。
+- 包含完整的单元测试，已提交的问题均已通过leetcode各自的测试用例。
 - 可以直接通过编辑页面实现`Pull requests`。
 
 
diff --git a/_sidebar.md b/_sidebar.md
@@ -13,7 +13,9 @@
   - [9.回文数　✅](solution/1-99/0009.palindrome-number/)
   - [13.罗马数字转整数 ✅](solution/1-99/0013.roman-to-integer/)
   - [20.有效的括号 ✅](solution/1-99/0020.valid-parentheses/)
+  - [21.合并两个有序链表 ✅](solution/1-99/0021.merge-two-sorted-lists/)
   - [26.删除排序数组中的重复项 ✅](solution/1-99/0026.remove-duplicates-from-sorted-array/)
+  - [27.移除元素 ✅](solution/1-99/0027.remove-element/)
 
 
 
diff --git a/index-tags.md b/index-tags.md
@@ -23,6 +23,7 @@
 | --- | --- | --- | --- | --- |
 |  [1](https://leetcode-cn.com/problems/two-sum)  |  [两数之和](/solution/1-99/0001.two-sum/)  |  `数组`,`哈希表`  |  <font color=green>简单</font>  | ✅ |
 |  [26](https://leetcode-cn.com/problems/remove-duplicates-from-sorted-array)  |  [删除排序数组中的重复项](/solution/1-99/0026.remove-duplicates-from-sorted-array/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
+|  [27](https://leetcode-cn.com/problems/remove-element)  |  [移除元素](/solution/1-99/0027.remove-element/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
 
 #### **哈希表**
 
@@ -38,6 +39,12 @@
 
 #### **堆**
 
+#### **链表**
+
+|  题号  |  题解  |  标签  | 难度  | 是否解题 |
+| --- | --- | --- | --- | --- |
+|  [21](https://leetcode-cn.com/problems/merge-two-sorted-lists)  |  [合并两个有序链表](/solution/1-99/0021.merge-two-sorted-lists/)  |  `链表`  |  <font color=green>简单</font>  |✅ |
+
 #### **排序**
 
 #### **队列**
@@ -53,6 +60,7 @@
 |  题号  |  题解  |  标签  | 难度  | 是否解题 |
 | --- | --- | --- | --- | --- |
 |  [26](https://leetcode-cn.com/problems/remove-duplicates-from-sorted-array)  |  [删除排序数组中的重复项](/solution/1-99/0026.remove-duplicates-from-sorted-array/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
+|  [27](https://leetcode-cn.com/problems/remove-element)  |  [移除元素](/solution/1-99/0027.remove-element/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
 
 #### **递归**
 
diff --git a/index-type.md b/index-type.md
@@ -13,9 +13,9 @@
 |  [13](https://leetcode-cn.com/problems/roman-to-integer)  |  [罗马数字转整数](/solution/1-99/0013.roman-to-integer/)  |  `数学`,`字符串`  |  <font color=green>简单</font>  |✅ |
 |  [14](https://leetcode-cn.com/problems/longest-common-prefix)  |  [最长公共前缀](/solution/1-99/0014.longest-common-prefix/)  |  `字符串`  |  <font color=green>简单</font>  |
 |  [20](https://leetcode-cn.com/problems/valid-parentheses)  |  [有效的括号](/solution/1-99/0020.valid-parentheses/)  |  `栈`,`字符串`  |  <font color=green>简单</font>  |✅ |
-|  [21](https://leetcode-cn.com/problems/merge-two-sorted-lists)  |  [合并两个有序链表](/solution/1-99/0021.merge-two-sorted-lists/)  |  `链表`  |  <font color=green>简单</font>  |
+|  [21](https://leetcode-cn.com/problems/merge-two-sorted-lists)  |  [合并两个有序链表](/solution/1-99/0021.merge-two-sorted-lists/)  |  `链表`  |  <font color=green>简单</font>  |✅ |
 |  [26](https://leetcode-cn.com/problems/remove-duplicates-from-sorted-array)  |  [删除排序数组中的重复项](/solution/1-99/0026.remove-duplicates-from-sorted-array/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
-|  [27](https://leetcode-cn.com/problems/remove-element)  |  [移除元素](/solution/1-99/0027.remove-element/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |
+|  [27](https://leetcode-cn.com/problems/remove-element)  |  [移除元素](/solution/1-99/0027.remove-element/)  |  `数组`,`双指针`  |  <font color=green>简单</font>  |✅ |
 |  [28](https://leetcode-cn.com/problems/implement-strstr)  |  [实现 strstr()](/solution/1-99/0028.implement-strstr%28%29/)  |  `双指针`,`字符串`  |  <font color=green>简单</font>  |
 |  [35](https://leetcode-cn.com/problems/search-insert-position)  |  [搜索插入位置](/solution/1-99/0035.search-insert-position/)  |  `数组`,`二分查找`  |  <font color=green>简单</font>  |
 |  [38](https://leetcode-cn.com/problems/count-and-say)  |  [外观数列](/solution/1-99/0038.count-and-say/)  |  `字符串`  |  <font color=green>简单</font>  |
diff --git a/solution/1-99/0001.two-sum/README.md b/solution/1-99/0001.two-sum/README.md
@@ -37,10 +37,6 @@ func twoSum(nums []int, target int) []int {
 	return []int{}
 }
 ```
-#### **Java**
 
-#### **Python**
-
-#### **PHP**
 
 <!-- tabs:end -->
diff --git a/solution/1-99/0002.add-two-numbers/README.md b/solution/1-99/0002.add-two-numbers/README.md
@@ -29,10 +29,5 @@ func sk() error {
 	return nil
 }
 ```
-#### **Java**
-
-#### **Python**
-
-#### **PHP**
 
 <!-- tabs:end -->
diff --git a/solution/1-99/0007.reverse-integer/README.md b/solution/1-99/0007.reverse-integer/README.md
@@ -53,10 +53,5 @@ func reverse(x int) int {
 	return ret
 }
 ```
-#### **Java**
-
-#### **Python**
-
-#### **PHP**
 
 <!-- tabs:end -->
diff --git a/solution/1-99/0009.palindrome-number/README.md b/solution/1-99/0009.palindrome-number/README.md
@@ -51,10 +51,4 @@ func isPalindrome(x int) bool {
 	return true
 }
 ```
-#### **Java**
-
-#### **Python**
-
-#### **PHP**
-
 <!-- tabs:end -->
diff --git a/solution/1-99/0013.roman-to-integer/README.md b/solution/1-99/0013.roman-to-integer/README.md
@@ -61,7 +61,7 @@ M             1000</pre>
 1. 先匹配特殊的字符串,匹配到的话`ret`累加
 2. 遍历字符串,如果能在`romanMap`中找到的话`ret`累加
 
-?> 该题解不是最优解！
+?> 说明：该题解不是最优解！
 
 ### 代码实现
 
@@ -107,10 +107,5 @@ func romanToInt(s string) int {
 	return ret
 }
 ```
-#### **Java**
-
-#### **Python**
-
-#### **PHP**
 
 <!-- tabs:end -->
diff --git a/solution/1-99/0020.valid-parentheses/README.md b/solution/1-99/0020.valid-parentheses/README.md
@@ -84,10 +84,5 @@ func isValid(s string) bool {
 	return stack.Len() == 0
 }
 ```
-#### **Java**
-
-#### **Python**
-
-#### **PHP**
 
 <!-- tabs:end -->
diff --git a/solution/1-99/0021.merge-two-sorted-lists/README.md b/solution/1-99/0021.merge-two-sorted-lists/README.md
@@ -0,0 +1,72 @@
+# [21.合并两个有序链表](https://leetcode-cn.com/problems/merge-two-sorted-lists)
+
+
+### 题目描述
+
+<div class="notranslate"><p>将两个升序链表合并为一个新的 <strong>升序</strong> 链表并返回。新链表是通过拼接给定的两个链表的所有节点组成的。&nbsp;</p>
+
+<p>&nbsp;</p>
+
+<p><strong>示例：</strong></p>
+
+<pre><strong>输入：</strong>1-&gt;2-&gt;4, 1-&gt;3-&gt;4
+<strong>输出：</strong>1-&gt;1-&gt;2-&gt;3-&gt;4-&gt;4
+</pre>
+</div>
+
+### 解题思路
+![](http://lc-photo.xwlin.com/21-1.png)
+![](http://lc-photo.xwlin.com/21-2.png)
+![](http://lc-photo.xwlin.com/21-3.png)
+
+### 代码实现
+
+<!-- tabs:start -->
+
+#### **Golang 1**
+```go
+func mergeTwoLists1(l1 *ListNode, l2 *ListNode) *ListNode {
+	if l1 == nil {
+		return l2
+	}
+	if l2 == nil {
+		return l1
+	}
+	ret := &ListNode{}
+	if l1.Val <= l2.Val {
+		ret = l1
+		ret.Next = mergeTwoLists1(l1.Next, l2)
+	} else {
+		ret = l2
+		ret.Next = mergeTwoLists1(l1, l2.Next)
+	}
+	return ret
+}
+```
+
+#### **Golang 2**
+```go
+func mergeTwoLists2(l1 *ListNode, l2 *ListNode) *ListNode {
+	head := &ListNode{}
+	ret := head
+	for l1 != nil && l2 != nil {
+		if l1.Val < l2.Val {
+			ret.Next = l1
+			l1 = l1.Next
+		} else {
+			ret.Next = l2
+			l2 = l2.Next
+		}
+		ret = ret.Next
+	}
+	if l1 != nil {
+		ret.Next = l1
+	}
+	if l2 != nil {
+		ret.Next = l2
+	}
+	return head.Next
+}
+```
+
+<!-- tabs:end -->
diff --git a/solution/1-99/0021.merge-two-sorted-lists/solution.go b/solution/1-99/0021.merge-two-sorted-lists/solution.go
@@ -0,0 +1,54 @@
+package leetcode
+
+/*
+ * @lc app=leetcode.cn id=21 lang=golang
+ *
+ * [21] 合并两个有序链表
+ */
+
+// @lc code=start
+/**
+ * Definition for singly-linked list.
+ */
+
+func mergeTwoLists1(l1 *ListNode, l2 *ListNode) *ListNode {
+	if l1 == nil {
+		return l2
+	}
+	if l2 == nil {
+		return l1
+	}
+	ret := &ListNode{}
+	if l1.Val <= l2.Val {
+		ret = l1
+		ret.Next = mergeTwoLists1(l1.Next, l2)
+	} else {
+		ret = l2
+		ret.Next = mergeTwoLists1(l1, l2.Next)
+	}
+	return ret
+}
+
+func mergeTwoLists2(l1 *ListNode, l2 *ListNode) *ListNode {
+	head := &ListNode{}
+	ret := head
+	for l1 != nil && l2 != nil {
+		if l1.Val < l2.Val {
+			ret.Next = l1
+			l1 = l1.Next
+		} else {
+			ret.Next = l2
+			l2 = l2.Next
+		}
+		ret = ret.Next
+	}
+	if l1 != nil {
+		ret.Next = l1
+	}
+	if l2 != nil {
+		ret.Next = l2
+	}
+	return head.Next
+}
+
+// @lc code=end
diff --git a/solution/1-99/0021.merge-two-sorted-lists/solution_test.go b/solution/1-99/0021.merge-two-sorted-lists/solution_test.go
diff --git a/solution/1-99/0026.remove-duplicates-from-sorted-array/README.md b/solution/1-99/0026.remove-duplicates-from-sorted-array/README.md
diff --git a/solution/1-99/0027.remove-element/README.md b/solution/1-99/0027.remove-element/README.md
diff --git a/solution/1-99/0027.remove-element/solution.go b/solution/1-99/0027.remove-element/solution.go
diff --git a/solution/1-99/0027.remove-element/solution_test.go b/solution/1-99/0027.remove-element/solution_test.go

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,6 @@ func twoSum(nums []int, target int) []int {`
`37`	`37`	`return []int{}`
`38`	`38`	`}`
`39`	`39`	```
`40`		`-#### Java`
`41`	`40`
`42`		`-#### Python`
`43`		`-`
`44`		`-#### PHP`
`45`	`41`
`46`	`42`	`<!-- tabs:end -->`