54 accepted

Author: aQua

Algorithms/0054.spiral-matrix/README.md

@@ -17,5 +17,4 @@ You should return [1,2,3,6,9,8,7,4,5].
 ```
 ## 解题思路
 
-
 见程序注释

Algorithms/0054.spiral-matrix/spiral-matrix.go

@@ -1,5 +1,42 @@
 package Problem0054
 
 func spiralOrder(matrix [][]int) []int {
+	r := len(matrix)
 
+	if r == 0 {
+		return []int{}
+	}
+
+	c := len(matrix[0])
+
+	if len(matrix) == 1 {
+		return matrix[0]
+	}
+
+	res := make([]int, 0, r*c)
+
+	res = append(res, matrix[0]...)
+
+	for i := 1; i < r-1; i++ {
+		res = append(res, matrix[i][c-1])
+	}
+
+	for j := c - 1; j >= 0; j-- {
+		res = append(res, matrix[r-1][j])
+	}
+
+	for i := r - 2; i > 0 && c > 1; i-- {
+		res = append(res, matrix[i][0])
+	}
+
+	if r == 2 || c <= 2 {
+		return res
+	}
+
+	nextMatrix := make([][]int, 0, r-2)
+	for i := 1; i < r-1; i++ {
+		nextMatrix = append(nextMatrix, matrix[i][1:c-1])
+	}
+
+	return append(res, spiralOrder(nextMatrix)...)
 }

Algorithms/0054.spiral-matrix/spiral-matrix_test.go

@@ -1,8 +1,8 @@
 package Problem0054
 
 import (
-	"testing"
 	"fmt"
+	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -19,7 +19,7 @@ type para struct {
 
 // ans 是答案
 type ans struct {
-	one  []int 
+	one []int
 }
 
 func Test_Problem0054(t *testing.T) {
@@ -29,20 +29,69 @@ func Test_Problem0054(t *testing.T) {
 
 		question{
 			para{
-					,
+				[][]int{
+					[]int{7},
+					[]int{9},
+					[]int{6},
+				},
+			},
+			ans{
+				[]int{7, 9, 6},
+			},
+		},
+
+		question{
+			para{
+				[][]int{
+					[]int{1, 2, 3},
+					[]int{4, 5, 6},
+					[]int{7, 8, 9},
+				},
+			},
+			ans{
+				[]int{1, 2, 3, 6, 9, 8, 7, 4, 5},
+			},
+		},
+
+		question{
+			para{
+				[][]int{
+					[]int{1, 2, 3},
+					[]int{4, 5, 6},
+				},
 			},
 			ans{
-					,
+				[]int{1, 2, 3, 6, 5, 4},
 			},
 		},
-	
+
+		question{
+			para{
+				[][]int{
+					[]int{1, 2, 3},
+				},
+			},
+			ans{
+				[]int{1, 2, 3},
+			},
+		},
+
+		question{
+			para{
+				[][]int{},
+			},
+			ans{
+				[]int{},
+			},
+		},
+
 		// 如需多个测试，可以复制上方元素。
 	}
 
 	for _, q := range qs {
 		a, p := q.ans, q.para
 		fmt.Printf("~~%v~~\n", p)
 
-		ast.Equal(a.one, spiralOrder(p  ), "输入:%v", p)
+		ast.Equal(a.one, spiralOrder(p.matrix), "输入:%v", p)
 	}
 }