undefined_name/School_Project
3
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 4 Wiki Activity

Merge pull request 'Set the matrix size of a new piece to its minimum size' (#45) from matrixMinimumSize into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #45
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
This commit is contained in:
Debucquoy Anthony
2023-05-11 20:08:39 +02:00
parent a35d823ec4 90d6d47cc8
commit 9fabc8128b
6 changed files with 184 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/school_project/Piece.java
View File

@ -55,6 +55,8 @@ public class Piece extends Shape{
*/
public void RotateRight(int times){
while(times > 0) {
height = matrix.length;
width = matrix[0].length;
boolean[][] temp_matrix = new boolean[width][height];
for (int i = 0; i < width; i++) {
for (int j = 0; j < height; j++) {
@ -70,9 +72,10 @@ public class Piece extends Shape{
public boolean equals(Object obj) {
if(obj instanceof Piece){
Piece pieceObj = (Piece) obj;
if( pieceObj.getPosition().equals(this.getPosition()) && pieceObj.getShape().equals(getShape())) {
return true;
if (pieceObj.getPosition() != null && this.getPosition() != null){
return pieceObj.getPosition().equals(this.getPosition()) && pieceObj.getShape().equals(getShape());
}
return pieceObj.getShape().equals(getShape());
}
return false;
}

46
app/src/main/java/school_project/Shape.java
View File

@ -1,6 +1,8 @@
package school_project;
import school_project.Utils.Array;
import java.io.Serializable;
/**
@ -21,14 +23,52 @@ public class Shape implements Serializable, Cloneable{
}
public void setShape(boolean[][] matrix) throws IllegalArgumentException{
height = matrix.length;
width = matrix[0].length;
for (boolean[] row: matrix){
if(row.length != width){
if(row.length != matrix[0].length){
throw new IllegalArgumentException("The argument should be a square matrix");
}
}
for (int i = 0; i < matrix.length; i++) {
if(!Array.isRowOnlyFalse(matrix, i)) {
for (int j = 0; j < i; j++) {
matrix = Array.MatrixRemoveRow(matrix, 0);
}
break;
}
}
for (int i = matrix.length-1; i >= 0; i--) {
if(!Array.isRowOnlyFalse(matrix, i)) {
for (int j = matrix.length-1; j > i; j--) {
matrix = Array.MatrixRemoveRow(matrix, j);
}
break;
}
}
for (int i = 0; i < matrix[0].length; i++) {
if(!Array.isColumnOnlyFalse(matrix, i)) {
for (int j = 0; j < i; j++) {
matrix = Array.MatrixRemoveColumn(matrix, 0);
}
break;
}
}
for (int i = matrix[0].length-1; i >= 0; i--){
if(!Array.isColumnOnlyFalse(matrix, i)) {
for (int j = matrix[0].length-1; j > i; j--) {
matrix = Array.MatrixRemoveColumn(matrix, j);
}
break;
}
}
height = matrix.length;
width = matrix[0].length;
this.matrix = matrix;
}

48
app/src/main/java/school_project/Utils/Array.java
View File

@ -10,4 +10,52 @@ public class Array{
}
return ret;
}
public static boolean[][] MatrixRemoveRow(boolean[][] o, int row){
boolean[][] newMatrix = new boolean[o.length - 1][o[0].length];
int newRow = 0;
for (int i = 0; i < o.length; i++) {
if(i == row)
i++;
if(i >= o.length)
continue;
newMatrix[newRow] = o[i];
newRow++;
}
return newMatrix;
}
public static boolean[][] MatrixRemoveColumn(boolean[][] o, int col){
boolean[][] newMatrix = new boolean[o.length][o[0].length - 1];
for (int i = 0; i < o.length; i++) {
int newCol = 0;
for(int j = 0; j < o[0].length; j++){
if(j == col)
j++;
if(j >= o[0].length)
continue;
newMatrix[i][newCol] = o[i][j];
newCol++;
}
}
return newMatrix;
}
public static boolean isRowOnlyFalse(boolean[][] o, int row){
boolean mark = true;
for (int i = 0; i < o[row].length; i++) {
if(o[row][i])
mark = false;
}
return mark;
}
public static boolean isColumnOnlyFalse(boolean[][] o, int column){
boolean mark = true;
for (int i = 0; i < o.length; i++) {
if(o[i][column])
mark = false;
}
return mark;
}
}

2
app/src/test/java/school_project/PieceTest.java
View File

@ -17,7 +17,6 @@ class PieceTest {
boolean[][] piece1_matrix_result = {
{true, false, true},
{true, true, false},
{false, false, false},
};
boolean[][] piece2_matrix = {
@ -31,7 +30,6 @@ class PieceTest {
};
boolean[][] piece3_matrix_result = {
{false, false, false},
{false, true, true},
{true, false, true},
};

33
app/src/test/java/school_project/ShapeTest.java
View File

@ -1,6 +1,9 @@
package school_project;
import org.junit.jupiter.api.Test;
import school_project.Utils.Array;
import java.util.Arrays;
import static org.junit.jupiter.api.Assertions.*;
@ -29,6 +32,30 @@ class ShapeTest {
{true}
};
boolean[][] matrix_shape5 = {
{false, false, false, false, false},
{false, false, false, false, false},
{false, true, true, true, false},
{false, true, false, true, false},
{false, false, false, false, false},
{false, false, false, false, false},
};
boolean[][] matrix_shape5_result = {
{true, true, true},
{true, false, true},
};
boolean[][] matrix_shape6 = {
{true, false},
{false, false}
};
boolean[][] matrix_shape6_result = {
{true},
};
System.out.println(Array.isRowOnlyFalse(matrix_shape1, 0));
Shape shape1 = new Shape();
shape1.setShape(matrix_shape1);
assertEquals(3, shape1.getHeight());
@ -44,5 +71,11 @@ class ShapeTest {
assertEquals(3, shape4.getHeight());
assertEquals(1, shape4.getWidth());
Shape shape5 = new Shape(matrix_shape5);
assertArrayEquals(matrix_shape5_result, shape5.getShape());
Shape shape6 = new Shape(matrix_shape6);
assertArrayEquals(matrix_shape6_result, shape6.getShape());
}
}

55
app/src/test/java/school_project/Utils/ArrayTest.java
View File

@ -23,4 +23,59 @@ class ArrayTest {
a[1][1] = true;
assertArrayEquals(b, c);
}
@Test
void matrixRemoveRow() {
boolean[][] a = new boolean[][] {
{true, false, true},
{false, false, false},
{true, false, true},
};
boolean[][] b = new boolean[][] {
{true, false, true},
{true, false, true},
};
boolean[][] result = Array.MatrixRemoveRow(a, 1);
assertArrayEquals(b, result);
}
@Test
void matrixRemoveColumn() {
boolean[][] a = new boolean[][] {
{true, false, true},
{false, false, false},
{true, false, true},
};
boolean[][] b = new boolean[][] {
{true, true},
{false, false},
{true, true},
};
boolean[][] result = Array.MatrixRemoveColumn(a, 1);
assertArrayEquals(b, result);
}
@Test
void isRowOnlyFalse() {
boolean[][] a = new boolean[][] {
{true, false, true},
{false, false, false},
{true, false, true},
};
assertTrue(Array.isRowOnlyFalse(a, 1));
assertFalse(Array.isRowOnlyFalse(a, 0));
}
@Test
void isColumnOnlyFalse() {
boolean[][] a = new boolean[][] {
{true, false, true},
{false, false, false},
{true, false, true},
};
assertTrue(Array.isColumnOnlyFalse(a, 1));
assertFalse(Array.isColumnOnlyFalse(a, 0));
}
}