Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
1 result

Target

Select target project
  • travers.c/flooding-template
  • g20031427/flooding-template
  • p20006624/flooding-template
  • b21221851/tp-6
  • n19028187/flooding-template
  • e21221636/tp-6-flood
  • saddem.r/flooding-template
  • r20029383/flooding-template
  • s21226517/flooding-template
  • r20004714/flooding-template
  • e20026270/flooding-template-el-ghaouti-aymane
  • o21205600/flooding-template
12 results
Select Git revision
  • main
1 result
Show changes
Commits on Source (24)
Showing with 1259 additions and 36 deletions
......@@ -6,5 +6,5 @@ Il s'agit d'implémenter une version du jeu "inondation" (voir par exemple [ici]
## Membre du projet
- NOM, prénom
- EL GHAOUTI , Aymane
- NOM, prénom
This diff is collapsed.
package model;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class ArrayGrid implements Grid{
protected Cell [][] cells;
private int numberOfRows;
private int numberOfColumns;
public ArrayGrid(int numberOfRows, int numberOfColumns) throws Exception{
if(numberOfRows <= 0 || numberOfColumns <= 0){ throw new IllegalArgumentException("taille nulle ou négative");}
this.numberOfRows = numberOfRows;
this.numberOfColumns = numberOfColumns;
this.cells = new Cell[numberOfRows][numberOfColumns];
for (int i = 0; i < numberOfRows; i++){
for (int j = 0; j < numberOfColumns; j++){
cells[i][j] = new SquareCell();
}
}
for (int i = 0; i < numberOfRows; i++) {
for (int j = 0; j < numberOfColumns; j++) {
calculateNeighbours(i,j);
}
}
}
public void calculateNeighbours( int rowIndex, int columnIndex){
List<Cell> neighbours = new ArrayList<>();
if (rowIndex==0){ neighbours.add(getCell(rowIndex+1,columnIndex));}
else if (rowIndex<this.getNumberOfRows()-1) {
neighbours.add(getCell(rowIndex-1,columnIndex));
neighbours.add(getCell(rowIndex+1,columnIndex));
}
if (rowIndex==this.getNumberOfRows()-1){ neighbours.add(getCell(rowIndex-1,columnIndex)); }
if (columnIndex==0){ neighbours.add(getCell(rowIndex,columnIndex+1));}
else if (columnIndex<this.getNumberOfColumns()-1 ) {
neighbours.add(getCell(rowIndex,columnIndex-1));
neighbours.add(getCell(rowIndex,columnIndex+1));
}
if (columnIndex==this.getNumberOfColumns()-1){ neighbours.add(getCell(rowIndex,columnIndex-1));}
getCell(rowIndex,columnIndex).setNeighbours(neighbours);
}
@Override
public Cell getCell(int row, int column) {
return this.cells[row][column];
}
@Override
public int getNumberOfRows() {
return this.numberOfRows;
}
@Override
public int getNumberOfColumns() {
return this.numberOfColumns;
}
@Override
public void color(ColorGenerator colorGenerator) {
// for(Cell []cell1D:cells){
// for(Cell cell:cell1D){
// cell.setColor(colorGenerator.nextColor(cell));
// }
// }
for(Cell cell:this){
cell.setColor(colorGenerator.nextColor(cell));
}
}
@Override
public Iterator<Cell> iterator() {
return new CellGridIterator(this);
}
}
package model;
import java.util.Iterator;
import java.util.NoSuchElementException;
public class CellGridIterator implements Iterator<Cell> {
ArrayGrid arrayGrid;
private int rowIndex,columnIndex;
private Cell [][]cells;
public CellGridIterator(ArrayGrid grid) {
arrayGrid=grid;
cells=grid.cells;
rowIndex =0;
columnIndex=0;
}
@Override
public boolean hasNext() {
if(rowIndex+1== cells.length){
return columnIndex<cells[rowIndex].length;
}
return rowIndex< cells.length;
}
@Override
public Cell next() {
if(columnIndex==cells[rowIndex].length)
{
columnIndex=0;
rowIndex++;
}
if(rowIndex== cells.length&& columnIndex==cells[rowIndex].length){
throw new NoSuchElementException();
}
return cells[rowIndex][columnIndex++];
}
}
package model;
import java.util.Iterator;
public class GrayGrid implements Grid {
private final int numberOfRows;
......@@ -40,4 +42,15 @@ public class GrayGrid implements Grid{
public int getNumberOfColumns() {
return numnberOfColumns;
}
@Override
public void color(ColorGenerator colorGenerator) {
}
@Override
public Iterator<Cell> iterator() {
return null;
}
}
package model;
public interface Grid {
public interface Grid extends Iterable<Cell>{
/**
* Return the cell located at the given coordinates in the grid.
......@@ -27,5 +27,5 @@ public interface Grid {
* @param colorGenerator the generator used to determine the color of each cell.
* The new color of {@code cell} is obtained by calling the method {@code nextColor}
*/
void color(ColorGenerator colorGenerator);
}
......@@ -2,6 +2,7 @@ package model;
import javafx.scene.paint.Color;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
......@@ -10,6 +11,24 @@ public class SquareCell extends AbstractCell{
List<Cell> neighbours;
public SquareCell(){
setColor(AbstractCell.DEFAULT_CELL_COLOR);
this.neighbours= new ArrayList<Cell>();
}
public SquareCell( Color color){
setColor(color);
this.neighbours= new ArrayList<Cell>();
}
public SquareCell(Color color,List<Cell>neighbours){
SquareCell Cell=new SquareCell(color);
setNeighbours(neighbours);
}
/**
* A cell is placed somewhere on a grid. Its neighbours thus depend on the underlying grid.
*
......@@ -17,7 +36,7 @@ public class SquareCell extends AbstractCell{
*/
@Override
public List<Cell> getNeighbours() {
return null;
return neighbours;
}
/**
......@@ -28,6 +47,8 @@ public class SquareCell extends AbstractCell{
*/
@Override
public void setNeighbours(List<Cell> cells) {
this.neighbours=cells;
}
......
package model;
import javafx.scene.paint.Color;
public class UniformColorGenerator implements ColorGenerator{
private Color color;
public UniformColorGenerator(Color color){
this.color = color;
}
@Override
public Color nextColor(Cell cell) {
return this.color;
}
}
package model;
import javafx.scene.paint.Color;
public class UniformExceptOneGenerator implements ColorGenerator{
private Color uniColor;
private Color excepColor;
public UniformExceptOneGenerator(Color uniformColor, Color exceptionColor){
this.uniColor=uniformColor;
this.excepColor=exceptionColor;
}
@Override
public Color nextColor(Cell cell) {
return null;
}
}
package util;
import java.util.List;
import java.util.Random;
public class RandomUtil {
private RandomUtil(){}
public static <T> T randomElement(T[] elements, Random random){
T element= elements[random.nextInt(elements.length)];
return element;
}
public static <T> T randomElement(List<T> elements, Random random){
T element= elements.get(random.nextInt(elements.size()));
return element;
}
}
......@@ -8,6 +8,7 @@ import javafx.scene.layout.GridPane;
import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle;
import javafx.util.Duration;
import model.ArrayGrid;
import model.Cell;
import model.GrayGrid;
import model.Grid;
......@@ -23,13 +24,12 @@ public class MatrixPane extends GridPane {
public MatrixPane(@NamedArg("tileWidth") Double tileWidth,
@NamedArg("tileHeight") Double tileHeight,
@NamedArg("numberOfColumns") Integer numberOfColumns,
@NamedArg("numberOfRows") Integer numberOfRows) {
@NamedArg("numberOfRows") Integer numberOfRows) throws Exception {
this.tileWidth = tileWidth;
this.tileHeight = tileHeight;
this.numberOfColumns = numberOfColumns;
this.numberOfRows = numberOfRows;
// TODO replace by new ArrayGrid(numberOfRows, numberOfColumns)
cellGrid = new GrayGrid(numberOfRows, numberOfColumns);
cellGrid = new ArrayGrid(numberOfRows, numberOfColumns);
initMatrix();
}
......
......@@ -11,35 +11,25 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
class ArrayGridTest {
// TODO
// uncomment
/*
private ArrayGrid arrayGridThreeFour;
private final ArrayGrid arrayGridTwoTwo = new ArrayGrid(2,2);
ArrayGridTest() throws Exception {
}
@BeforeEach
void initializeArrayGridThreeFour(){
void initializeArrayGridThreeFour() throws Exception {
arrayGridThreeFour = new ArrayGrid(3,4);
}
@Test
void testGetCellAndGridInitialization() {
assertThat(arrayGridThreeFour.getCell(0,0).getNeighbours())
.hasSize(2)
.containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,0), arrayGridThreeFour.getCell(0,1));
assertThat(arrayGridThreeFour.getCell(1,1).getNeighbours()).hasSize(4)
.containsExactlyInAnyOrder(arrayGridThreeFour.getCell(0,1),
arrayGridThreeFour.getCell(2,1),
arrayGridThreeFour.getCell(1,2),
arrayGridThreeFour.getCell(1,0));
assertThat(arrayGridThreeFour.getCell(2,3).getNeighbours()).hasSize(2)
.containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,3),
arrayGridThreeFour.getCell(2,2));
assertThat(arrayGridThreeFour.getCell(2,2).getNeighbours()).hasSize(3)
.containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,2),
arrayGridThreeFour.getCell(2,1),
arrayGridThreeFour.getCell(2,3));
assertThat(arrayGridThreeFour.getCell(0,0).getNeighbours()).hasSize(2).containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,0), arrayGridThreeFour.getCell(0,1));
assertThat(arrayGridThreeFour.getCell(1,1).getNeighbours()).hasSize(4).containsExactlyInAnyOrder(arrayGridThreeFour.getCell(0,1), arrayGridThreeFour.getCell(2,1),arrayGridThreeFour.getCell(1,2),arrayGridThreeFour.getCell(1,0));
assertThat(arrayGridThreeFour.getCell(2,3).getNeighbours()).hasSize(2).containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,3), arrayGridThreeFour.getCell(2,2));
assertThat(arrayGridThreeFour.getCell(2,2).getNeighbours()).hasSize(3).containsExactlyInAnyOrder(arrayGridThreeFour.getCell(1,2), arrayGridThreeFour.getCell(2,1), arrayGridThreeFour.getCell(2,3));
}
@Test
......@@ -49,12 +39,12 @@ class ArrayGridTest {
}
@Test
void testGetNumberOfRows() {
void testGetNumberOfRows() throws Exception {
assertThat(new ArrayGrid(100,200).getNumberOfRows()).isEqualTo(100);
}
@Test
void testGetNumberOfColumns() {
void testGetNumberOfColumns() throws Exception {
assertThat(new ArrayGrid(100,200).getNumberOfColumns()).isEqualTo(200);
}
......@@ -89,5 +79,5 @@ class ArrayGridTest {
assertThat(iterator.hasNext()).isFalse();
}
*/
}
\ No newline at end of file
......@@ -11,9 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat;
class SquareCellTest {
// TODO
// uncomment
/*
private final Cell northCell = new SquareCell(Color.NAVY);
private final Cell southCell = new SquareCell(Color.SALMON);
private final Cell westCell = new SquareCell(Color.WHEAT);
......@@ -51,5 +48,5 @@ class SquareCellTest {
assertThat(centralCell.getNeighbours()).containsExactlyInAnyOrder(northCell,southCell);
}
*/
}
\ No newline at end of file