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
No results found
Select Git revision
  • main
1 result
Show changes

Commits on Source 12

10 files
+ 1133
14
Compare changes
  • Side-by-side
  • Inline

Files

+1 −1
Original line number Diff line number Diff line
@@ -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 

app/hs_err_pid7403.log

0 → 100644
+1004 −0

File added.

Preview size limit exceeded, changes collapsed.

+57 −0
Original line number Diff line number Diff line
package model;

import java.util.Iterator;

public class ArrayGrid implements Grid{

    private Cell [][] cells;
    private int numberOfRows;
    private int numberOfColumns;


    public ArrayGrid(int numberOfRows,int numberOfColumns){
        this.numberOfColumns=numberOfColumns;
        this.numberOfRows=numberOfRows;
        if(numberOfRows==0 | numberOfRows<0 | numberOfColumns==0 | numberOfRows<0 | numberOfColumns<0)  {
            throw new IllegalArgumentException("numberOfRows or numberOfColumns can't be equal to zero or a negative value");
        }
        else {
            this.cells=new Cell[numberOfRows][numberOfColumns];
            Cell cell=new SquareCell();
            for (int i=0; i<numberOfRows;i++){
                for(int j=0; j<numberOfColumns;j++){
                    cells[i][j]=cell;
                }
            }

        }
    }



    @Override
    public Cell getCell(int row, int column) {
        return null;
    }

    @Override
    public int getNumberOfRows() {
        return 0;
    }

    @Override
    public int getNumberOfColumns() {
        return 0;
    }

    @Override
    public void color(ColorGenerator colorGenerator) {
        for (int i=0; i<this.numberOfRows;i++){
            for(int j=0; j<this.numberOfColumns;j++){
                colorGenerator.nextColor(cells[i][j]);
            }
        }
    }


}
Original line number Diff line number Diff line
@@ -40,4 +40,9 @@ public class GrayGrid implements Grid{
    public int getNumberOfColumns() {
        return numnberOfColumns;
    }

    @Override
    public void color(ColorGenerator colorGenerator) {

    }
}
Original line number Diff line number Diff line
@@ -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);
}
Original line number Diff line number Diff line
@@ -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,22 @@ public class SquareCell extends AbstractCell{
    List<Cell> neighbours;


    public SquareCell(){
        setColor(AbstractCell.DEFAULT_CELL_COLOR);
        setNeighbours(null);

    }
    public SquareCell( Color color){
        setColor(color);
        setNeighbours(null);

    }
    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 +34,7 @@ public class SquareCell extends AbstractCell{
     */
    @Override
    public List<Cell> getNeighbours() {
        return null;
        return neighbours;
    }

    /**
@@ -28,6 +45,17 @@ public class SquareCell extends AbstractCell{
     */
    @Override
    public void setNeighbours(List<Cell> cells) {
        if (cells==null){
            neighbours=new ArrayList<>();
        }
        else {

            neighbours=new ArrayList<>();
            for (Cell value:cells)
            {
                neighbours.add(value);
            }
        }

    }

Original line number Diff line number Diff line
package model;

import javafx.scene.paint.Color;

import java.util.Random;

public class UniformColorGenerator implements ColorGenerator{

    private Color color;

    //code of color generator found on stackOverFlow;
    // link : https://stackoverflow.com/questions/4246351/creating-random-colour-in-java
    // but the color constructor with 3 parameter is not public, so I checked in the documentation of Color, and
    // I found that there is a constructor with 4 parameter that is public since java 8;
    // Link of the doc : https://docs.oracle.com/javase/8/javafx/api/javafx/scene/paint/Color.html
    @Override
   public Color nextColor(Cell cell) {
//        Random rand = new Random();
//        double red = rand.nextFloat();
//        double green = rand.nextFloat();
//        double blue = rand.nextFloat();
//        double opacity=rand.nextFloat();
//        Color randomColor = new Color(red, green, blue,opacity);
//        cell.setColor(randomColor);
//        return randomColor;
        return this.color;

    }
   
}
Original line number Diff line number Diff line
@@ -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;
@@ -28,8 +29,7 @@ public class MatrixPane extends GridPane {
        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();
    }

Original line number Diff line number Diff line
@@ -11,9 +11,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;

class ArrayGridTest {

    // TODO
    //  uncomment
/*

    private  ArrayGrid arrayGridThreeFour;
    private final ArrayGrid arrayGridTwoTwo = new ArrayGrid(2,2);

@@ -76,8 +74,8 @@ class ArrayGridTest {
        }
    }

    @Test
    void testIterator() {
   //@Test
   /* void testIterator() {
        Iterator<Cell> iterator = arrayGridTwoTwo.iterator();
        assertThat(iterator.hasNext()).isTrue();
        assertThat(iterator.next()).isEqualTo(arrayGridTwoTwo.getCell(0,0));
Original line number Diff line number Diff line
@@ -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