Skip to content

Commit c45b7e4

Browse files
committedFeb 18, 2021
feat: update solutions to leetcode problem: No.0054
1 parent 6ae0a1b commit c45b7e4

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed
 

‎solution/0000-0099/0054.Spiral Matrix/README.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
<strong>输出:</strong> [1,2,3,4,8,12,11,10,9,5,6,7]
3030
</pre>
3131

32+
**提示**
33+
34+
- m == matrix.length
35+
- n == matrix[i].length
36+
- 1 <= m, n <= 10
37+
- -100 <= matrix[i][j] <= 100
38+
3239
## 解法
3340

3441
<!-- 这里可写通用的实现逻辑 -->
@@ -50,8 +57,6 @@ class Solution:
5057
if j1 == j2:
5158
return [matrix[i][j1] for i in range(i1, i2 + 1)]
5259
return [matrix[i1][j] for j in range(j1, j2)] + [matrix[i][j2] for i in range(i1, i2)] + [matrix[i2][j] for j in range(j2, j1, -1)] + [matrix[i][j1] for i in range(i2, i1, -1)]
53-
if not matrix or not matrix[0]:
54-
return []
5560
m, n = len(matrix), len(matrix[0])
5661
i1, j1, i2, j2 = 0, 0, m - 1, n - 1
5762
res = []
@@ -70,9 +75,7 @@ class Solution {
7075
private List<Integer> res;
7176

7277
public List<Integer> spiralOrder(int[][] matrix) {
73-
int m, n;
74-
if (matrix == null || (m = matrix.length) == 0 || matrix[0] == null || (n = matrix[0].length) == 0)
75-
return Collections.emptyList();
78+
int m = matrix.length, n = matrix[0].length;
7679
res = new ArrayList<>();
7780
int i1 = 0, i2 = m - 1;
7881
int j1 = 0, j2 = n - 1;

‎solution/0000-0099/0054.Spiral Matrix/README_EN.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@
4646

4747
</pre>
4848

49+
**Constraints:**
50+
51+
- m == matrix.length
52+
- n == matrix[i].length
53+
- 1 <= m, n <= 10
54+
- -100 <= matrix[i][j] <= 100
55+
4956
## Solutions
5057

5158
<!-- tabs:start -->
@@ -61,8 +68,7 @@ class Solution:
6168
if j1 == j2:
6269
return [matrix[i][j1] for i in range(i1, i2 + 1)]
6370
return [matrix[i1][j] for j in range(j1, j2)] + [matrix[i][j2] for i in range(i1, i2)] + [matrix[i2][j] for j in range(j2, j1, -1)] + [matrix[i][j1] for i in range(i2, i1, -1)]
64-
if not matrix or not matrix[0]:
65-
return []
71+
6672
m, n = len(matrix), len(matrix[0])
6773
i1, j1, i2, j2 = 0, 0, m - 1, n - 1
6874
res = []
@@ -79,9 +85,7 @@ class Solution {
7985
private List<Integer> res;
8086

8187
public List<Integer> spiralOrder(int[][] matrix) {
82-
int m, n;
83-
if (matrix == null || (m = matrix.length) == 0 || matrix[0] == null || (n = matrix[0].length) == 0)
84-
return Collections.emptyList();
88+
int m = matrix.length, n = matrix[0].length;
8589
res = new ArrayList<>();
8690
int i1 = 0, i2 = m - 1;
8791
int j1 = 0, j2 = n - 1;

‎solution/0000-0099/0054.Spiral Matrix/Solution.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ class Solution {
22
private List<Integer> res;
33

44
public List<Integer> spiralOrder(int[][] matrix) {
5-
int m, n;
6-
if (matrix == null || (m = matrix.length) == 0 || matrix[0] == null || (n = matrix[0].length) == 0)
7-
return Collections.emptyList();
5+
int m = matrix.length, n = matrix[0].length;
86
res = new ArrayList<>();
97
int i1 = 0, i2 = m - 1;
108
int j1 = 0, j2 = n - 1;

‎solution/0000-0099/0054.Spiral Matrix/Solution.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ def add(i1, j1, i2, j2):
66
if j1 == j2:
77
return [matrix[i][j1] for i in range(i1, i2 + 1)]
88
return [matrix[i1][j] for j in range(j1, j2)] + [matrix[i][j2] for i in range(i1, i2)] + [matrix[i2][j] for j in range(j2, j1, -1)] + [matrix[i][j1] for i in range(i2, i1, -1)]
9-
if not matrix or not matrix[0]:
10-
return []
9+
1110
m, n = len(matrix), len(matrix[0])
1211
i1, j1, i2, j2 = 0, 0, m - 1, n - 1
1312
res = []

0 commit comments

Comments
 (0)
Please sign in to comment.