Merge branch 'master' into develop

Author: aQuaYi

Algorithms/0337.house-robber-iii/house-robber-iii_test.go

@@ -4,32 +4,28 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aQuaYi/LeetCode-in-Go/kit"
-
 	"github.com/stretchr/testify/assert"
 )
 
 // tcs is testcase slice
 var tcs = []struct {
-	pre, in []int
-	ans     int
+	nums []int
+	ans  int
 }{
 
+	// 用 0 表示 nil
 	{
-		[]int{5, 2, 4, 1, 3, 1000},
-		[]int{2, 4, 5, 1, 3, 1000},
-		1009,
+		[]int{4, 1, 0, 2, 0, 3},
+		7,
 	},
 
 	{
-		[]int{5, 2, 4, 1, 3},
-		[]int{2, 4, 5, 1, 3},
-		12,
+		[]int{3, 2, 3, 0, 3, 0, 1},
+		7,
 	},
 
 	{
-		[]int{3, 4, 1, 3, 5, 1},
-		[]int{1, 4, 3, 3, 5, 1},
+		[]int{3, 4, 5, 1, 3, 0, 1},
 		9,
 	},
 
@@ -41,16 +37,57 @@ func Test_rob(t *testing.T) {
 
 	for _, tc := range tcs {
 		fmt.Printf("~~%v~~\n", tc)
-		root := kit.PreIn2Tree(tc.pre, tc.in)
+		root := &TreeNode{}
+		initTree(tc.nums, []*TreeNode{}, root)
 		ast.Equal(tc.ans, rob(root), "输入:%v", tc)
 	}
 }
 
 func Benchmark_rob(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for _, tc := range tcs {
-			root := kit.PreIn2Tree(tc.pre, tc.in)
+			root := &TreeNode{}
+			initTree(tc.nums, []*TreeNode{}, root)
 			rob(root)
 		}
 	}
 }
+
+// 创建二叉树
+func initTree(nums []int, parents []*TreeNode, root *TreeNode) {
+	if len(nums) == 0 {
+		return
+	}
+
+	if len(parents) == 0 {
+		if nums[0] != 0 {
+			root.Val = nums[0]
+			parents = append(parents, root)
+			initTree(nums[1:], parents, root)
+		}
+
+		return
+	}
+
+	newParents := make([]*TreeNode, 0, len(parents)*2)
+	for _, parent := range parents {
+
+		if nums[0] != 0 {
+			parent.Left = &TreeNode{Val: nums[0]}
+			newParents = append(newParents, parent.Left)
+		}
+
+		if len(nums) == 1 {
+			return
+		}
+
+		if nums[1] != 0 {
+			parent.Right = &TreeNode{Val: nums[1]}
+			newParents = append(newParents, parent.Right)
+		}
+
+		nums = nums[2:]
+	}
+
+	initTree(nums, newParents, root)
+}

Algorithms/0342.power-of-four/power-of-four.go

@@ -1,13 +1,19 @@
 package problem0342
 
-func isPowerOfFour(n int) bool {
-	if n < 1 {
+func isPowerOfFour(num int) bool {
+	if num <= 0 {
 		return false
 	}
 
-	for n%4 == 0 {
-		n /= 4
+	// 如果 num 不是2的N次方, 那么也不是4的N次方
+	if num&(num-1) != 0 {
+		return false
 	}
-	
-	return n == 1
+
+	// 过滤
+	if num&0x55555555 == 0 {
+		return false
+	}
+
+	return true
 }

Algorithms/0342.power-of-four/power-of-four_test.go

@@ -13,6 +13,7 @@ var tcs = []struct {
 	ans bool
 }{
 
+	{2, false},
 	{16, true},
 	{5, false},
 	{-5, false},

Algorithms/0686.repeated-string-match/repeated-string-match.go

@@ -1,15 +1,33 @@
 package problem0686
 
-import "strings"
-
-func repeatedStringMatch(a string, b string) int {
-	times := max(len(b)/len(a), 1)
-
-	if strings.Contains(strings.Repeat(a, times), b) {
-		return times
+func repeatedStringMatch(A string, B string) int {
+	// ref: https://leetcode.com/problems/repeated-string-match/discuss/108084/C%2B%2B-4-lines-O(m-*-n)-or-O(1)-and-KMP-O(m-%2B-n)-or-O(n)
+	n, m := len(A), len(B)
+	prefTable := make([]int, m+1)
+	for sp, pp := 1, 0; sp < m; {
+		if B[pp] == B[sp] {
+			sp++
+			pp++
+			prefTable[sp] = pp
+		} else if pp == 0 {
+			sp++
+			prefTable[sp] = pp
+		} else {
+			pp = prefTable[pp]
+		}
 	}
-	if strings.Contains(strings.Repeat(a, times+1), b) {
-		return times + 1
+
+	for i, j := 0, 0; i < n; i, j = i+max(1, j-prefTable[j]), prefTable[j] {
+		for j < m && A[(i+j)%n] == B[j] {
+			j++
+		}
+		if j == m {
+			if (i+j)%n == 0 {
+				return (i + j) / n
+			} else {
+				return (i+j)/n + 1
+			}
+		}
 	}
 	return -1
 }

Algorithms/0686.repeated-string-match/repeated-string-match_test.go

@@ -79,6 +79,11 @@ var tcs = []struct {
 		2,
 	},
 
+	{
+		"abc",
+		"cabcabca",
+		4,
+	},
 	// 可以有多个 testcase
 }
 

Helper/README.md

@@ -6,8 +6,10 @@
 1. 在`LeetCode-in-Go`目录下，添加文本文件`config.toml`。
 1. 把以下内容复制到`config.toml`中。
 1. 把`config.toml`中的`test`分别修改为你的 leetcode `用户名`和`密码`。
+1. 去 leetcode 登录后，把网站 cookie 复制 (有洁癖者只要复制 LEETCODE_SESSION 就够了) 并替换 `config.toml`中的`Cookie`。
 
 ```toml
-Login="test"
+Username="test"
 Password="test"
+Cookie="LEETCODE_SESSION=XXXXXXXXX;"
 ```

Helper/buildProblemDir.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"runtime/debug"
 	"strings"
 	"syscall"
@@ -52,6 +51,7 @@ func build(p problem) {
 		}
 	}()
 
+    // windows用户注释这两行
 	mask := syscall.Umask(0)
 	defer syscall.Umask(mask)
 
@@ -63,24 +63,29 @@ func build(p problem) {
 
 	log.Printf("开始创建 %d %s 的文件夹...\n", p.ID, p.Title)
 
+	content, fc := getGraphql(p)
+	if fc == "" {
+		log.Panicf("查无Go语言写法")
+	}
+
 	// 利用 chrome 打开题目页面
-	go func() {
-		cmd := exec.Command("google-chrome", p.link())
-		_, err = cmd.Output()
-		if err != nil {
-			panic(err.Error())
-		}
-	}()
+	// go func() {
+	// 	cmd := exec.Command("google-chrome", p.link())
+	// 	_, err = cmd.Output()
+	// 	if err != nil {
+	// 		panic(err.Error())
+	// 	}
+	// }()
 
-	fc := getFunction(p.link())
+	// fc := getFunction(p.link())
 
-	fcName, para, ans, fc := parseFunction(fc)
+	fcName, para, ans, _ := parseFunction(fc)
 
 	creatGo(p, fc, ans)
 
 	creatGoTest(p, fcName, para, ans)
 
-	creatREADME(p)
+	creatREADME(p, content)
 
 	log.Printf("%d.%s 的文件夹，创建完毕。\n", p.ID, p.Title)
 }

Helper/config.go

@@ -14,6 +14,7 @@ const (
 type config struct {
 	Username string
 	Password string
+	Cookie string
 
 	// 以下是电子邮件设置
 	SMTP          string

Helper/leetcode-getGraphql.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"log"
+	"net/http"
+)
+
+type JsL4CodeSnippets []struct {
+	Lang string
+	Code string
+}
+
+type JsL3Detail struct {
+	Content      string
+	CodeSnippets JsL4CodeSnippets
+}
+
+type JsL2Question struct {
+	Question JsL3Detail
+}
+
+type JsL1Data struct {
+	Data JsL2Question
+}
+
+func getGraphql(p problem) (string, string) {
+	// req := newReq()
+
+	params := make(map[string]interface{})
+	params["operationName"] = "questionData"
+	params["query"] = "query questionData($titleSlug: String!) { question(titleSlug: $titleSlug) { content codeSnippets { lang code } } }"
+	titleSlug := make(map[string]string)
+	titleSlug["titleSlug"] = p.TitleSlug
+	params["variables"] = titleSlug
+
+	// Make this JSON
+	postJson, _ := json.Marshal(params)
+
+	// http.POST expects an io.Reader, which a byte buffer does
+	postContent := bytes.NewBuffer(postJson)
+
+	resp, err := http.Post("https://leetcode.com/graphql", "application/json", postContent)
+	if err != nil {
+		log.Fatal("getGraphql: POST Error: " + err.Error())
+	}
+
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		log.Fatal("抓题失败 code: " + resp.Status)
+	}
+
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Fatal("getGraphql: Read Error: " + err.Error())
+	}
+
+	//byte数组直接转成string，优化内存
+	// str := (*string)(unsafe.Pointer(&respBytes))
+	// fmt.Printf("%#v\n", *str)
+
+	res := &JsL1Data{}
+	json.Unmarshal(respBytes, &res)
+
+	code := ""
+	for _, qc := range res.Data.Question.CodeSnippets {
+		if qc.Lang == "Go" {
+			code = qc.Code
+		}
+	}
+	return res.Data.Question.Content, code
+}

Helper/problemGoFile.go

@@ -9,7 +9,7 @@ import (
 )
 
 func parseFunction(fc string) (fcName, para, ansType, nfc string) {
-	log.Println("准备分解函数:", fc)
+	log.Println("正在分解函数")
 
 	defer func() { // 必须要先声明defer，否则不能捕获到panic异常
 		if err := recover(); err != nil {

Helper/problemReadme.go

@@ -4,20 +4,24 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+
+	"github.com/TruthHun/html2md"
 )
 
-func creatREADME(p problem) {
+func creatREADME(p problem, s string) {
 	fileFormat := `# [%d. %s](%s)
 
 %s
 `
 
 	questionDescription := strings.TrimSpace(getDescription(p.link()))
 
-	content := fmt.Sprintf(fileFormat, p.ID, p.Title, p.link(), questionDescription)
+	content := fmt.Sprintf(fileFormat, p.ID, p.Title, p.link(), questionDescription) + s + "\n\n## 解题思路\n\n## 可能的變化"
 
 	content = replaceCharacters(content)
 
+	content = html2md.Convert(content)
+
 	filename := fmt.Sprintf("%s/README.md", p.Dir())
 
 	write(filename, content)
@@ -36,7 +40,7 @@ func replaceCharacters(s string) string {
 		"&lt;":       "<",
 		"&gt;":       ">",
 		"&ge;":       ">=",
-		"&nbsp;":     "`",
+		"&nbsp;":     " ",
 		"&amp;":      "&",
 		"&#39;":      "'",
 		"   \n":      "\n",