Updated actions, fix some lint issues and introduce translate package
testing / check and test (push) Failing after 9m19s

This commit is contained in:
2024-04-13 02:40:32 +00:00
parent d05fa2e90a
commit 04c5f52e6f
8 changed files with 128 additions and 35 deletions
+8 -8
View File
@@ -1,13 +1,13 @@
package pattern
type pattern struct {
}
// type pattern struct {
// }
type shun struct {
}
// type shun struct {
// }
type ke struct {
}
// type ke struct {
// }
type jiang struct {
}
// type jiang struct {
// }
+7 -3
View File
@@ -8,12 +8,12 @@ import (
"sort"
)
var TileTypes = [34]string{
var TileTypes []string = []string{
"1W", "2W", "3W", "4W", "5W", "6W", "7W", "8W", "9W",
"1T", "2T", "3T", "4T", "5T", "6T", "7T", "8T", "9T",
"1B", "2B", "3B", "4B", "5B", "6B", "7B", "8B", "9B",
"DO", "XI", "NA", "BE", "ZH", "FA", "BA"}
var tileHuaTypes = [8]string{"ME", "LA", "ZU", "JU", "CH", "XA", "QI", "DN"}
var TileHuaTypes []string = []string{"ME", "LA", "ZU", "JU", "CH", "XA", "QI", "DN"}
// Given two tiles, return if first tile is smaller the second tile, functions used as comparator for ordering
// Default order is: 万 < 条 < 饼 < 字(东西南北中发白)
@@ -184,7 +184,7 @@ func CheckXushuTile(tiles []string) ([][][]string, error) {
}
func TilesDividedToPatterns(tiles []string) error {
Sort(tiles)
_ = Sort(tiles)
var wan, tiao, bing, zi []string
for _, tile := range tiles {
switch tile[1] {
@@ -198,5 +198,9 @@ func TilesDividedToPatterns(tiles []string) error {
zi = append(zi, tile)
}
}
_, _ = CheckXushuTile(wan)
_, _ = CheckXushuTile(tiao)
_, _ = CheckXushuTile(bing)
log.Println(zi)
return nil
}
+3 -3
View File
@@ -1,5 +1,5 @@
package tiles
type tileStruct struct {
}
// type tileStruct struct {
// }
-1
View File
@@ -84,6 +84,5 @@ func TestCheckXushuTile(t *testing.T) {
log.Fatalf("TestCheckXushuTile(%v) = %v want %v", tc.Args, result, tc.Want)
}
})
}
}
+77
View File
@@ -0,0 +1,77 @@
package tiles
import (
"fmt"
"slices"
"strconv"
"strings"
"unicode"
)
var jpnZiPaiTileTypes []string = []string{"DO", "NA", "XI", "BE", "BA", "FA", "ZH"}
// Translate numberized Zi Pai to 2-letter format
// rule can be "CHN" or "JPN"
// If rule is "CHN", it should translate as DO XI NA BE ZH FA BA
// If rule is "JPN", it should translate as DO NA XI BE BA FA ZH
func ziPaiShortSplit(num int, rule string) (string, error) {
if num < 1 || num > 7 {
return "", fmt.Errorf("invalid zipai index %d", num)
}
switch rule {
case "CHN":
return TileTypes[num-1+27], nil
case "JPN":
return jpnZiPaiTileTypes[num-1], nil
}
return "", fmt.Errorf("error calling ziPaiShortSplit()")
}
func shortToArray(tiles string) ([]string, error) {
var ret []string
var stack []string
var rule string
// Check if it's jpn format
tiles = strings.ToUpper(tiles)
if strings.Contains(tiles, "M") || strings.Contains(tiles, "S") || strings.Contains(tiles, "P") {
rule = "JPN"
} else {
rule = "CHN"
}
for _, char := range tiles {
if unicode.IsDigit(char) {
stack = append(stack, string(char))
} else {
switch string(char) {
case "W", "M":
for _, prefix := range stack {
ret = append(ret, prefix+"W")
}
case "T", "S":
for _, prefix := range stack {
ret = append(ret, prefix+"T")
}
case "B", "P":
for _, prefix := range stack {
ret = append(ret, prefix+"B")
}
case "Z":
for _, prefix := range stack {
num, _ := strconv.Atoi(prefix)
ziPaiStr, _ := ziPaiShortSplit(num, rule)
ret = append(ret, ziPaiStr)
}
}
stack = []string{}
}
}
// Check return value valid, if not return error
for _, t := range ret {
if !slices.Contains(TileTypes, t) {
return []string{}, fmt.Errorf("invalid tile string with %s", t)
}
}
return ret, nil
}
+32
View File
@@ -0,0 +1,32 @@
package tiles
import (
"fmt"
"log"
"reflect"
"testing"
)
func TestShortToArray(t *testing.T) {
type testcase struct {
Name string
Arg string
Want []string
}
testcases := []testcase{
{Name: "自创格式", Arg: "12W56T456B1234567Z", Want: []string{"1W", "2W", "5T", "6T", "4B", "5B", "6B", "DO", "XI", "NA", "BE", "ZH", "FA", "BA"}},
{Name: "日麻格式", Arg: "1134m4p24s123677z6m", Want: []string{"1W", "1W", "3W", "4W", "4B", "2T", "4T", "DO", "NA", "XI", "FA", "ZH", "ZH", "6W"}},
}
for _, tc := range testcases {
t.Run(tc.Name, func(t *testing.T) {
result, err := shortToArray(tc.Arg)
if err != nil {
log.Fatalf("Failed in translating tiles %s , error: %s", tc.Arg, err)
}
fmt.Println(result)
if !reflect.DeepEqual(result, tc.Want) {
log.Fatalf("Failed in translating tiles %s , expectd: %v, got %v", tc.Arg, tc.Want, result)
}
})
}
}