Update solution 0148

halfrost · halfrost · commit 3881a5a214b9 · 2020-12-11T23:34:50.000+08:00
diff --git a/leetcode/0148.Sort-List/148. Sort List.go b/leetcode/0148.Sort-List/148. Sort List.go
@@ -25,17 +25,17 @@ func sortList(head *ListNode) *ListNode {
 		return head
 	}
 
-	middleNode := middleNode1(head)
+	middleNode := middleNode(head)
 	cur = middleNode.Next
 	middleNode.Next = nil
 	middleNode = cur
 
 	left := sortList(head)
 	right := sortList(middleNode)
-	return mergeTwoLists148(left, right)
+	return mergeTwoLists(left, right)
 }
 
-func middleNode1(head *ListNode) *ListNode {
+func middleNode(head *ListNode) *ListNode {
 	if head == nil || head.Next == nil {
 		return head
 	}
@@ -48,21 +48,6 @@ func middleNode1(head *ListNode) *ListNode {
 	return p1
 }
 
-func mergeTwoLists148(l1 *ListNode, l2 *ListNode) *ListNode {
-	if l1 == nil {
-		return l2
-	}
-	if l2 == nil {
-		return l1
-	}
-	if l1.Val < l2.Val {
-		l1.Next = mergeTwoLists(l1.Next, l2)
-		return l1
-	}
-	l2.Next = mergeTwoLists(l1, l2.Next)
-	return l2
-}
-
 func mergeTwoLists(l1 *ListNode, l2 *ListNode) *ListNode {
 	if l1 == nil {
 		return l2
diff --git a/website/content/ChapterFour/0148.Sort-List.md b/website/content/ChapterFour/0148.Sort-List.md
@@ -54,17 +54,17 @@ func sortList(head *ListNode) *ListNode {
 		return head
 	}
 
-	middleNode := middleNode1(head)
+	middleNode := middleNode(head)
 	cur = middleNode.Next
 	middleNode.Next = nil
 	middleNode = cur
 
 	left := sortList(head)
 	right := sortList(middleNode)
-	return mergeTwoLists148(left, right)
+	return mergeTwoLists(left, right)
 }
 
-func middleNode1(head *ListNode) *ListNode {
+func middleNode(head *ListNode) *ListNode {
 	if head == nil || head.Next == nil {
 		return head
 	}
@@ -77,7 +77,7 @@ func middleNode1(head *ListNode) *ListNode {
 	return p1
 }
 
-func mergeTwoLists148(l1 *ListNode, l2 *ListNode) *ListNode {
+func mergeTwoLists(l1 *ListNode, l2 *ListNode) *ListNode {
 	if l1 == nil {
 		return l2
 	}
@@ -92,4 +92,5 @@ func mergeTwoLists148(l1 *ListNode, l2 *ListNode) *ListNode {
 	return l2
 }
 
+
 ```

Original file line number	Diff line number	Diff line change
`@@ -54,17 +54,17 @@ func sortList(head ListNode) ListNode {`
`54`	`54`	`return head`
`55`	`55`	`}`
`56`	`56`
`57`		`- middleNode := middleNode1(head)`
	`57`	`+ middleNode := middleNode(head)`
`58`	`58`	`cur = middleNode.Next`
`59`	`59`	`middleNode.Next = nil`
`60`	`60`	`middleNode = cur`
`61`	`61`
`62`	`62`	`left := sortList(head)`
`63`	`63`	`right := sortList(middleNode)`
`64`		`- return mergeTwoLists148(left, right)`
	`64`	`+ return mergeTwoLists(left, right)`
`65`	`65`	`}`
`66`	`66`
`67`		`-func middleNode1(head ListNode) ListNode {`
	`67`	`+func middleNode(head ListNode) ListNode {`
`68`	`68`	`if head == nil \|\| head.Next == nil {`
`69`	`69`	`return head`
`70`	`70`	`}`
`@@ -77,7 +77,7 @@ func middleNode1(head ListNode) ListNode {`
`77`	`77`	`return p1`
`78`	`78`	`}`
`79`	`79`
`80`		`-func mergeTwoLists148(l1 ListNode, l2 ListNode) *ListNode {`
	`80`	`+func mergeTwoLists(l1 ListNode, l2 ListNode) *ListNode {`
`81`	`81`	`if l1 == nil {`
`82`	`82`	`return l2`
`83`	`83`	`}`
`@@ -92,4 +92,5 @@ func mergeTwoLists148(l1 ListNode, l2 ListNode) *ListNode {`
`92`	`92`	`return l2`
`93`	`93`	`}`
`94`	`94`
	`95`	`+`
`95`	`96`	```