Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfabd917

Browse files
authored
Add _498.Solution2 And Test3 & 4 (fishercoder1534#131)
1 parentc0e1a67 commitfabd917

File tree

2 files changed

+73
-0
lines changed

2 files changed

+73
-0
lines changed

‎src/main/java/com/fishercoder/solutions/_498.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
packagecom.fishercoder.solutions;
22

3+
importjava.util.ArrayList;
4+
importjava.util.Collections;
5+
importjava.util.List;
6+
37
publicclass_498 {
48

59
publicstaticclassSolutoin1 {
@@ -47,4 +51,51 @@ public int[] findDiagonalOrder(int[][] matrix) {
4751
}
4852
}
4953

54+
/*
55+
matrix = new int[][]{
56+
{1, 2, 3},
57+
{4, 5, 6},
58+
{7, 8, 9},
59+
{10, 11, 12},
60+
{13, 14, 15},
61+
};
62+
expected = new int[]{1, 2, 4, 7, 5, 3, 6, 8, 10, 13, 11, 9, 12, 14, 15};
63+
*/
64+
publicstaticclassSolutoin2 {
65+
publicint[]findDiagonalOrder(int[][]matrix) {
66+
if(matrix ==null ||matrix.length ==0){
67+
returnnewint[0];
68+
}
69+
List<List<Integer>>diagonals =newArrayList<>();
70+
intmaxRow =matrix.length;
71+
intmaxCol =matrix[0].length;
72+
intmaxDiagonal =maxRow +maxCol -1;
73+
for (intdiagonalIndex =0;diagonalIndex <maxDiagonal;diagonalIndex++) {
74+
intcurRowIdx = (diagonalIndex <maxCol) ?0 : (diagonalIndex -maxCol +1);
75+
intcurColIdx = (diagonalIndex <maxCol) ?diagonalIndex : (maxCol -1);
76+
List<Integer>diagonal =newArrayList<Integer>();
77+
while (curRowIdx >=0 &&curRowIdx <maxRow &&curColIdx >=0 &&curColIdx <maxCol) {
78+
intdiagonalElement =matrix[curRowIdx][curColIdx];
79+
diagonal.add(diagonalElement);
80+
curRowIdx++;
81+
curColIdx--;
82+
}
83+
diagonals.add(diagonal);
84+
}
85+
int[]result =newint[maxRow *maxCol];
86+
intresultIdx =0;
87+
for (inti =0;i <diagonals.size();i++) {
88+
List<Integer>diagonal =diagonals.get(i);
89+
if (i %2 ==0) {
90+
Collections.reverse(diagonal);
91+
}
92+
for (intj =0;j <diagonal.size();j++) {
93+
result[resultIdx] =diagonal.get(j);
94+
resultIdx++;
95+
}
96+
}
97+
returnresult;
98+
}
99+
}
100+
50101
}

‎src/test/java/com/fishercoder/_498Test.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
*/
1212
publicclass_498Test {
1313
privatestatic_498.Solutoin1solutoin1;
14+
privatestatic_498.Solutoin2solutoin2;
1415
privatestaticint[][]matrix;
1516
privatestaticint[]expected;
1617

1718
@BeforeClass
1819
publicstaticvoidsetup() {
1920
solutoin1 =new_498.Solutoin1();
21+
solutoin2 =new_498.Solutoin2();
2022
}
2123

2224
@Test
@@ -42,4 +44,24 @@ public void test2() {
4244
expected =newint[]{1,2,4,7,5,3,6,8,10,13,11,9,12,14,15};
4345
assertArrayEquals(expected,solutoin1.findDiagonalOrder(matrix));
4446
}
47+
48+
@Test
49+
publicvoidtest3() {
50+
matrix =newint[][]{
51+
{1,2,3},
52+
{4,5,6},
53+
{7,8,9},
54+
};
55+
expected =newint[]{1,2,4,7,5,3,6,8,9};
56+
assertArrayEquals(expected,solutoin2.findDiagonalOrder(matrix));
57+
}
58+
59+
@Test
60+
publicvoidtest4() {
61+
matrix =newint[][]{
62+
{2,5},{8,4},{0,-1}
63+
};
64+
expected =newint[]{2,5,8,0,4,-1};
65+
assertArrayEquals(expected,solutoin2.findDiagonalOrder(matrix));
66+
}
4567
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp