update

medium/11.go

@@ -1,11 +1,11 @@
 package main
 
-func minInt(x, y int) int {
+/* func minInt(x, y int) int {
 	if x < y {
 		return x
 	}
 	return y
-}
+} */
 
 // 穷举
 func maxAreaOld(height []int) int {
@@ -47,9 +47,4 @@ func maxArea(height []int) int {
 /* func main() {
 	arr := []int{1, 2, 4, 54, 6, 54}
 	fmt.Println(maxArea(arr))
-<<<<<<< HEAD
-}
-*/
-=======
 } */
->>>>>>> 7f6bbabf3a02854f000cb57e11f470c83197aefb

medium/81.go

@@ -1,6 +1,5 @@
 package main
 
-<<<<<<< HEAD
 import (
 	"fmt"
 )
@@ -47,50 +46,12 @@ func binarySearch(nums []int, target, beg, end int) bool {
 		if nums[mid] > target {
 			end = mid - 1
 		} else if nums[mid] < target {
-=======
-// ??? so many problems here
-/* func search(nums []int, target int) bool {
-	if len(nums) == 0 {
-		return false
-	}
-	beg, end := 0, len(nums)-1
-	var mid int
-	// how to find the smallest num of arr?
-	for beg < end {
-		mid = (beg + end) / 2
-		if nums[mid] > nums[end] {
-			beg = mid + 1
-		} else if nums[mid] < nums[end] {
-			end = mid - 1
-		} else {
-			for nums[mid] < nums[(mid+1)%len(nums)] {
-				mid = (mid + len(nums) - 1) % len(nums)
-			}
-			break
-		}
-	}
-	fmt.Println(mid)
-	if target == nums[mid] {
-		return true
-	}
-	if target < nums[0] {
-		beg, end = mid+1, len(nums)-1
-	} else {
-		beg, end = 0, mid-1
-	}
-	for beg <= end {
-		mid = (beg + end) / 2
-		if target < nums[mid] {
-			end = mid - 1
-		} else if target > nums[mid] {
->>>>>>> 7f6bbabf3a02854f000cb57e11f470c83197aefb
 			beg = mid + 1
 		} else {
 			return true
 		}
 	}
 	return false
-<<<<<<< HEAD
 }
 
 func testSearch(nums []int, target int) {
@@ -114,20 +75,4 @@ func testSearch(nums []int, target int) {
 	testSearch(nums2, 0)
 	testSearch(nums3, 5)
 	testSearch(nums4, 0)
-=======
-} */
-
-/* func main() {
-	a1 := []int{4, 5, 6, 6, 6, 7, 7, 0, 0, 1, 1, 2, 2, 3}
-	fmt.Println(search(a1, 6))
-	fmt.Println(search(a1, 4))
-	fmt.Println(search(a1, 3))
-	fmt.Println(search(a1, 7))
-	fmt.Println(search(a1, 9))
-	a2 := []int{1, 3}
-	fmt.Println(search(a2, 3))
-	a3 := []int{3, 1}
-	fmt.Println(search(a3, 3))
-	fmt.Println(search(a3, 1))
->>>>>>> 7f6bbabf3a02854f000cb57e11f470c83197aefb
 } */