Merge pull request #652 from openset/develop

Shuo · web-flow · commit c5b88c02a382 · 2019-09-18T15:12:27.000+08:00
Update: PackageName
diff --git a/internal/leetcode/question_data.go b/internal/leetcode/question_data.go
@@ -9,7 +9,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode"
 )
 
 func QuestionData(titleSlug string, isForce bool, graphQL ...string) (qd questionDataType) {
@@ -199,11 +198,7 @@ func (question *questionType) TitleSnake() string {
 }
 
 func (question *questionType) PackageName() string {
-	snake := question.TitleSnake()
-	if snake != "" && unicode.IsNumber(rune(snake[0])) {
-		snake = "p_" + snake
-	}
-	return snake
+	return "problem_" + question.QuestionFrontendId
 }
 
 func (question *questionType) SaveCodeSnippet() {
diff --git a/problems/01-matrix/01_matrix.go b/problems/01-matrix/01_matrix.go
@@ -1,4 +1,4 @@
-package p_01_matrix
+package problem_542
 
 func updateMatrix(matrix [][]int) [][]int {
 	m, n := len(matrix), len(matrix[0])
diff --git a/problems/01-matrix/01_matrix_test.go b/problems/01-matrix/01_matrix_test.go
@@ -1,4 +1,4 @@
-package p_01_matrix
+package problem_542
 
 import (
 	"reflect"
diff --git a/problems/1-bit-and-2-bit-characters/1_bit_and_2_bit_characters.go b/problems/1-bit-and-2-bit-characters/1_bit_and_2_bit_characters.go
@@ -1,8 +1,7 @@
-package p_1_bit_and_2_bit_characters
+package problem_717
 
 func isOneBitCharacter(bits []int) bool {
-	l := len(bits) - 1
-	i := 0
+	i, l := 0, len(bits)-1
 	for i < l {
 		i += bits[i] + 1
 	}
diff --git a/problems/1-bit-and-2-bit-characters/1_bit_and_2_bit_characters_test.go b/problems/1-bit-and-2-bit-characters/1_bit_and_2_bit_characters_test.go
@@ -1,4 +1,4 @@
-package p_1_bit_and_2_bit_characters
+package problem_717
 
 import "testing"
 
diff --git a/problems/132-pattern/132_pattern.go b/problems/132-pattern/132_pattern.go
@@ -1,4 +1,4 @@
-package p_132_pattern
+package problem_456
 
 func find132pattern(nums []int) bool {
 	ak, ajStack := -1<<31, make([]int, 0, len(nums))
diff --git a/problems/132-pattern/132_pattern_test.go b/problems/132-pattern/132_pattern_test.go
@@ -1,4 +1,4 @@
-package p_132_pattern
+package problem_456
 
 import "testing"
 
diff --git a/problems/2-keys-keyboard/2_keys_keyboard.go b/problems/2-keys-keyboard/2_keys_keyboard.go
@@ -1,4 +1,4 @@
-package p_2_keys_keyboard
+package problem_650
 
 func minSteps(n int) int {
 	if n == 1 {
diff --git a/problems/2-keys-keyboard/2_keys_keyboard_test.go b/problems/2-keys-keyboard/2_keys_keyboard_test.go
@@ -1,4 +1,4 @@
-package p_2_keys_keyboard
+package problem_650
 
 import "testing"
 
diff --git a/problems/24-game/24_game.go b/problems/24-game/24_game.go
@@ -1,4 +1,4 @@
-package p_24_game
+package problem_679
 
 import "sort"
 
diff --git a/problems/24-game/24_game_test.go b/problems/24-game/24_game_test.go
@@ -1,4 +1,4 @@
-package p_24_game
+package problem_679
 
 import "testing"
 
diff --git a/problems/3sum-closest/3sum_closest.go b/problems/3sum-closest/3sum_closest.go
@@ -1,4 +1,4 @@
-package p_3sum_closest
+package problem_16
 
 import (
 	"math"
diff --git a/problems/3sum-closest/3sum_closest_test.go b/problems/3sum-closest/3sum_closest_test.go
@@ -1,4 +1,4 @@
-package p_3sum_closest
+package problem_16
 
 import "testing"
 
diff --git a/problems/3sum-smaller/3sum_smaller.go b/problems/3sum-smaller/3sum_smaller.go
@@ -1 +1 @@
-package p_3sum_smaller
+package problem_258
diff --git a/problems/3sum-smaller/3sum_smaller_test.go b/problems/3sum-smaller/3sum_smaller_test.go
@@ -1 +1 @@
-package p_3sum_smaller
+package problem_258
diff --git a/problems/3sum-with-multiplicity/3sum_with_multiplicity.go b/problems/3sum-with-multiplicity/3sum_with_multiplicity.go
@@ -1 +1 @@
-package p_3sum_with_multiplicity
+package problem_923
diff --git a/problems/3sum-with-multiplicity/3sum_with_multiplicity_test.go b/problems/3sum-with-multiplicity/3sum_with_multiplicity_test.go
@@ -1 +1 @@
-package p_3sum_with_multiplicity
+package problem_923
diff --git a/problems/3sum/3sum.go b/problems/3sum/3sum.go
@@ -1,4 +1,4 @@
-package p_3sum
+package problem_15
 
 import "sort"
 
diff --git a/problems/3sum/3sum_test.go b/problems/3sum/3sum_test.go
@@ -1,4 +1,4 @@
-package p_3sum
+package problem_15
 
 import (
 	"reflect"
diff --git a/problems/4-keys-keyboard/4_keys_keyboard.go b/problems/4-keys-keyboard/4_keys_keyboard.go
@@ -1 +1 @@
-package p_4_keys_keyboard
+package problem_651
diff --git a/problems/4-keys-keyboard/4_keys_keyboard_test.go b/problems/4-keys-keyboard/4_keys_keyboard_test.go
@@ -1 +1 @@
-package p_4_keys_keyboard
+package problem_651
diff --git a/problems/4sum-ii/4sum_ii.go b/problems/4sum-ii/4sum_ii.go
@@ -1,4 +1,4 @@
-package p_4sum_ii
+package problem_454
 
 func fourSumCount(A []int, B []int, C []int, D []int) int {
 	ans, n := 0, len(A)
diff --git a/problems/4sum-ii/4sum_ii_test.go b/problems/4sum-ii/4sum_ii_test.go
@@ -1,4 +1,4 @@
-package p_4sum_ii
+package problem_454
 
 import "testing"
 
diff --git a/problems/4sum/4sum.go b/problems/4sum/4sum.go
@@ -1,4 +1,4 @@
-package p_4sum
+package problem_18
 
 import "sort"
 
diff --git a/problems/4sum/4sum_test.go b/problems/4sum/4sum_test.go
@@ -1,4 +1,4 @@
-package p_4sum
+package problem_18
 
 import (
 	"reflect"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"regexp"`
`10`	`10`	`"strconv"`
`11`	`11`	`"strings"`
`12`		`- "unicode"`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`func QuestionData(titleSlug string, isForce bool, graphQL ...string) (qd questionDataType) {`
`@@ -199,11 +198,7 @@ func (question *questionType) TitleSnake() string {`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`func (question *questionType) PackageName() string {`
`202`		`- snake := question.TitleSnake()`
`203`		`- if snake != "" && unicode.IsNumber(rune(snake[0])) {`
`204`		`- snake = "p_" + snake`
`205`		`- }`
`206`		`- return snake`
	`201`	`+ return "problem_" + question.QuestionFrontendId`
`207`	`202`	`}`
`208`	`203`
`209`	`204`	`func (question *questionType) SaveCodeSnippet() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package p_01_matrix`
	`1`	`+package problem_542`
`2`	`2`
`3`	`3`	`func updateMatrix(matrix [][]int) [][]int {`
`4`	`4`	`m, n := len(matrix), len(matrix[0])`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package p_1_bit_and_2_bit_characters`
	`1`	`+package problem_717`
`2`	`2`
`3`	`3`	`import "testing"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package p_132_pattern`
	`1`	`+package problem_456`
`2`	`2`
`3`	`3`	`func find132pattern(nums []int) bool {`
`4`	`4`	`ak, ajStack := -1<<31, make([]int, 0, len(nums))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package p_2_keys_keyboard`
	`1`	`+package problem_650`
`2`	`2`
`3`	`3`	`func minSteps(n int) int {`
`4`	`4`	`if n == 1 {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package p_24_game`
	`1`	`+package problem_679`
`2`	`2`
`3`	`3`	`import "sort"`
`4`	`4`