feat(/) :daiyl update

Author: 6boris

src/0021.Merge-Two-Sorted-Lists/Solution.go

@@ -1,5 +1,10 @@
 package Solution
 
+type ListNode struct {
+Val int
+Next *ListNode
+}
+
 func mergeTwoLists(l1 *ListNode, l2 *ListNode) *ListNode {
 head := &ListNode{}
 tmp := head
@@ -22,8 +27,3 @@ func mergeTwoLists(l1 *ListNode, l2 *ListNode) *ListNode {
 
 return head.Next
 }
-
-type ListNode struct {
-Val int
-Next *ListNode
-}

src/0025.Reverse-Nodes-in-k-Group/Solution_test.go

@@ -12,8 +12,17 @@ func TestSolution(t *testing.T) {
 input2 int
 expect *ListNode
 }{
-{"TestCacse 1", UnmarshalListBySlice([]int{1, 2, 3, 4, 5}), 2, UnmarshalListBySlice([]int{2, 1, 4, 3, 5})},
-{"TestCacse 2", UnmarshalListBySlice([]int{1, 2, 3, 4, 5}), 3, UnmarshalListBySlice([]int{3, 2, 1, 4, 5})},
+{
+"TestCacse 1",
+UnmarshalListBySlice([]int{1, 2, 3, 4, 5}),
+2,
+UnmarshalListBySlice([]int{2, 1, 4, 3, 5})},
+{
+"TestCacse 2",
+UnmarshalListBySlice([]int{1, 2, 3, 4, 5}),
+3,
+UnmarshalListBySlice([]int{3, 2, 1, 4, 5}),
+},
 }
 
 //	开始测试

src/0026.Remove-Duplicates-from-Sorted-Array/README.md

@@ -49,7 +49,9 @@ for (int i = 0; i < len; i++) {
 
 ## 题解
 ### 思路1
-题意是让你从一个有序的数组中移除重复的元素，并返回之后数组的长度。我的思路是判断长度小于等于 1 的话直接返回原长度即可，否则的话遍历一遍数组，用一个 `tail` 变量指向尾部，如果后面的元素和前面的元素不同，就让 `tail` 变量加一，最后返回 `tail` 即可。
+> 题意是让你从一个有序的数组中移除重复的元素，并返回之后数组的长度。我的思路是判断长度小于等于 1
+ 的话直接返回原长度即可，否则的话遍历一遍数组，用一个 `tail` 变量指向尾部，如果后面的元素和前面的元素不同，
+ 就让 `tail` 变量加一，最后返回 `tail` 即可。
 ```go
 func removeDuplicates(nums []int) int {
 if len(nums) <= 1 {

src/0029.Divide-Two-Integers/Solution.go

@@ -1,12 +1,50 @@
 package Solution
 
+import "math"
+
 func divide(dividend int, divisor int) int {
-return 0
+dm, dsm, sign := true, true, true
+if dividend < 0 {
+dm = false
+dividend = -dividend
+}
+if divisor < 0 {
+dsm = false
+divisor = -divisor
+}
 
-}
-func Abs(x int) int {
-if x > 0 {
-return x
+if (dm && !dsm) || (!dm && dsm) {
+sign = false
+}
+
+if divisor == 0 {
+return math.MaxInt32
+}
+
+h := 0
+out := 0
+if dividend < divisor {
+return 0
+}
+for (divisor << uint(h)) <= dividend {
+h++
+}
+h--
+for i := h; i >= 0; i-- {
+if dividend >= (divisor << uint(i)) {
+dividend -= (divisor << uint(i))
+out |= 1 << uint(i)
+}
+}
+
+if !sign {
+out = -out
+}
+if out > math.MaxInt32 {
+return math.MaxInt32
+} else if out < math.MinInt32 {
+return math.MinInt32
+} else {
+return out
 }
-return -x
 }

src/0029.Divide-Two-Integers/Solution_test.go

@@ -9,18 +9,17 @@ func TestSolution(t *testing.T) {
 //	测试用例
 cases := []struct {
 name string
-inputs bool
-expect bool
+inputs []int
+expect int
 }{
-{"1 test 1", true, true},
-{"2 test 2", true, true},
-{"3 test 3", false, true},
+{"1 test 1", []int{10, 3}, 3},
+{"1 test 2", []int{7, -3}, -2},
 }
 
 //	开始测试
 for _, c := range cases {
 t.Run(c.name, func(t *testing.T) {
-ret := Solution(c.inputs)
+ret := divide(c.inputs[0], c.inputs[1])
 if !reflect.DeepEqual(ret, c.expect) {
 t.Fatalf("expected: %v, but got: %v, with inputs: %v",
 c.expect, ret, c.inputs)

src/0030.Substring-with-Concatenation-of-All-Words/README.md

@@ -23,7 +23,8 @@ Output: "10101"
 **Tags:** Math, String
 
 ## 题意
->给你两个二进制串，求其和的二进制串。
+>给定一个目标字符串s，一个单词集合words。
+ 要求使得words集合中所有元素连续出现在s中的首位置组成的集合（元素顺序不考虑）。
 
 ## 题解
 

src/0030.Substring-with-Concatenation-of-All-Words/Solution.go

@@ -1,5 +1,5 @@
 package Solution
 
-func Solution(x bool) bool {
-return x
+func findSubstring(s string, words []string) []int {
+
 }

src/0030.Substring-with-Concatenation-of-All-Words/Solution_test.go

@@ -9,21 +9,29 @@ func TestSolution(t *testing.T) {
 //	测试用例
 cases := []struct {
 name string
-inputs bool
-expect bool
+input1 string
+input2 []string
+expect []int
 }{
-{"TestCacse 1", true, true},
-{"TestCacse 1", true, true},
-{"TestCacse 1", false, true},
+{"TestCacse 1",
+"barfoothefoobarman",
+[]string{"foo", "bar"},
+[]int{0, 9},
+},
+{"TestCacse 2",
+"wordgoodstudentgoodword",
+[]string{"word", "student"},
+[]int{},
+},
 }
 
 //	开始测试
 for _, c := range cases {
 t.Run(c.name, func(t *testing.T) {
-ret := Solution(c.inputs)
+ret := findSubstring(c.input1, c.input2)
 if !reflect.DeepEqual(ret, c.expect) {
 t.Fatalf("expected: %v, but got: %v, with inputs: %v",
-c.expect, ret, c.inputs)
+c.expect, ret, c.input1)
 }
 })
 }