Skip to content

Commit 1e6ed97

Browse files
authored
Refactor files to be in correctly nested packages (TheAlgorithms#6120)
1 parent a9633c0 commit 1e6ed97

13 files changed

+75
-77
lines changed

pmd-exclude.properties

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ com.thealgorithms.maths.SumOfArithmeticSeries=UselessParentheses
5555
com.thealgorithms.maths.TrinomialTriangle=UselessParentheses
5656
com.thealgorithms.maths.VampireNumber=CollapsibleIfStatements
5757
com.thealgorithms.maths.Volume=UselessParentheses
58-
com.thealgorithms.matrixexponentiation.Fibonacci=UnnecessaryFullyQualifiedName
5958
com.thealgorithms.misc.Sparsity=UselessParentheses
6059
com.thealgorithms.misc.ThreeSumProblem=UselessParentheses
6160
com.thealgorithms.misc.WordBoggle=UselessParentheses

src/main/java/com/thealgorithms/misc/InverseOfMatrix.java src/main/java/com/thealgorithms/matrix/InverseOfMatrix.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
/**
44
* This class provides methods to compute the inverse of a square matrix

src/main/java/com/thealgorithms/misc/MatrixTranspose.java src/main/java/com/thealgorithms/matrix/MatrixTranspose.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
/**
44
*

src/main/java/com/thealgorithms/misc/MedianOfMatrix.java src/main/java/com/thealgorithms/matrix/MedianOfMatrix.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
import java.util.ArrayList;
44
import java.util.Collections;

src/main/java/com/thealgorithms/misc/MirrorOfMatrix.java src/main/java/com/thealgorithms/matrix/MirrorOfMatrix.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
// Problem Statement
44
/*
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
package com.thealgorithms.others;
2-
3-
import java.util.ArrayList;
4-
import java.util.List;
5-
6-
public class PrintAMatrixInSpiralOrder {
7-
/**
8-
* Search a key in row and column wise sorted matrix
9-
*
10-
* @param matrix matrix to be searched
11-
* @param row number of rows matrix has
12-
* @param col number of columns matrix has
13-
* @author Sadiul Hakim : https://github.com/sadiul-hakim
14-
*/
15-
16-
public List<Integer> print(int[][] matrix, int row, int col) {
17-
18-
// r traverses matrix row wise from first
19-
int r = 0;
20-
// c traverses matrix column wise from first
21-
int c = 0;
22-
int i;
23-
24-
List<Integer> result = new ArrayList<>();
25-
26-
while (r < row && c < col) {
27-
// print first row of matrix
28-
for (i = c; i < col; i++) {
29-
result.add(matrix[r][i]);
30-
}
31-
32-
// increase r by one because first row printed
33-
r++;
34-
35-
// print last column
36-
for (i = r; i < row; i++) {
37-
result.add(matrix[i][col - 1]);
38-
}
39-
40-
// decrease col by one because last column has been printed
41-
col--;
42-
43-
// print rows from last except printed elements
44-
if (r < row) {
45-
for (i = col - 1; i >= c; i--) {
46-
result.add(matrix[row - 1][i]);
47-
}
48-
49-
row--;
50-
}
51-
52-
// print columns from first except printed elements
53-
if (c < col) {
54-
for (i = row - 1; i >= r; i--) {
55-
result.add(matrix[i][c]);
56-
}
57-
c++;
58-
}
59-
}
60-
return result;
61-
}
62-
}
1+
package com.thealgorithms.matrix;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
6+
public class PrintAMatrixInSpiralOrder {
7+
/**
8+
* Search a key in row and column wise sorted matrix
9+
*
10+
* @param matrix matrix to be searched
11+
* @param row number of rows matrix has
12+
* @param col number of columns matrix has
13+
* @author Sadiul Hakim : https://github.com/sadiul-hakim
14+
*/
15+
16+
public List<Integer> print(int[][] matrix, int row, int col) {
17+
18+
// r traverses matrix row wise from first
19+
int r = 0;
20+
// c traverses matrix column wise from first
21+
int c = 0;
22+
int i;
23+
24+
List<Integer> result = new ArrayList<>();
25+
26+
while (r < row && c < col) {
27+
// print first row of matrix
28+
for (i = c; i < col; i++) {
29+
result.add(matrix[r][i]);
30+
}
31+
32+
// increase r by one because first row printed
33+
r++;
34+
35+
// print last column
36+
for (i = r; i < row; i++) {
37+
result.add(matrix[i][col - 1]);
38+
}
39+
40+
// decrease col by one because last column has been printed
41+
col--;
42+
43+
// print rows from last except printed elements
44+
if (r < row) {
45+
for (i = col - 1; i >= c; i--) {
46+
result.add(matrix[row - 1][i]);
47+
}
48+
49+
row--;
50+
}
51+
52+
// print columns from first except printed elements
53+
if (c < col) {
54+
for (i = row - 1; i >= r; i--) {
55+
result.add(matrix[i][c]);
56+
}
57+
c++;
58+
}
59+
}
60+
return result;
61+
}
62+
}

src/main/java/com/thealgorithms/others/RotateMatrixBy90Degrees.java src/main/java/com/thealgorithms/matrix/RotateMatrixBy90Degrees.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.others;
1+
package com.thealgorithms.matrix;
22

33
import java.util.Scanner;
44
/**

src/main/java/com/thealgorithms/matrixexponentiation/Fibonacci.java src/main/java/com/thealgorithms/matrix/matrixexponentiation/Fibonacci.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.matrixexponentiation;
1+
package com.thealgorithms.matrix.matrixexponentiation;
22

33
import java.util.Scanner;
44

@@ -55,14 +55,14 @@ private static int[][] matrixMultiplication(int[][] matrix1, int[][] matrix2) {
5555
*/
5656
public static int[][] fib(int n) {
5757
if (n == 0) {
58-
return Fibonacci.IDENTITY_MATRIX;
58+
return IDENTITY_MATRIX;
5959
} else {
6060
int[][] cachedResult = fib(n / 2);
6161
int[][] matrixExpResult = matrixMultiplication(cachedResult, cachedResult);
6262
if (n % 2 == 0) {
6363
return matrixExpResult;
6464
} else {
65-
return matrixMultiplication(Fibonacci.FIB_MATRIX, matrixExpResult);
65+
return matrixMultiplication(FIB_MATRIX, matrixExpResult);
6666
}
6767
}
6868
}

src/test/java/com/thealgorithms/misc/InverseOfMatrixTest.java src/test/java/com/thealgorithms/matrix/InverseOfMatrixTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
package com.thealgorithms.misc;
2-
1+
package com.thealgorithms.matrix;
32
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
43

54
import java.util.stream.Stream;

src/test/java/com/thealgorithms/misc/MatrixTransposeTest.java src/test/java/com/thealgorithms/matrix/MatrixTransposeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
44
import static org.junit.jupiter.api.Assertions.assertThrows;

src/test/java/com/thealgorithms/misc/MedianOfMatrixTest.java src/test/java/com/thealgorithms/matrix/MedianOfMatrixTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

src/test/java/com/thealgorithms/misc/MirrorOfMatrixTest.java src/test/java/com/thealgorithms/matrix/MirrorOfMatrixTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.misc;
1+
package com.thealgorithms.matrix;
22

33
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
44
import static org.junit.jupiter.api.Assertions.assertNull;

src/test/java/com/thealgorithms/others/TestPrintMatrixInSpiralOrder.java src/test/java/com/thealgorithms/matrix/TestPrintMatrixInSpiralOrder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thealgorithms.others;
1+
package com.thealgorithms.matrix;
22

33
import static org.junit.jupiter.api.Assertions.assertIterableEquals;
44

0 commit comments

Comments
 (0)