bug de clignotement corrigé

GameOfLifeGUI.java

@@ -22,8 +22,9 @@ public class GameOfLifeGUI extends JFrame {
 		labelGrid[x][y] = new JLabel("*");
 		JLabel label;
 		if(g.getCell(x,y).isAlive()){
-		    if (g.getCell(x,y).isRed()) labelGrid[x][y].setForeground(Color.red);
-            else labelGrid[x][y].setForeground(Color.BLUE);
+            labelGrid[x][y].setForeground(Color.red);
+		    //if (g.getCell(x,y).isRed()) labelGrid[x][y].setForeground(Color.red);
+            //else labelGrid[x][y].setForeground(Color.BLUE);
         }
 		else
 		    labelGrid[x][y].setForeground(Color.white);

Grid.java

@@ -132,10 +132,15 @@ public class Grid implements Iterable<Cell> {
 
     private boolean calculateNextColor(int rowIndex, int columnIndex) {
 
-        int aliveNeighbours = countAliveNeighbours(rowIndex,columnIndex);
-        int redNeighbours =  countRedNeighbours(rowIndex,columnIndex);
-        if (aliveNeighbours == 3) return (redNeighbours > aliveNeighbours - redNeighbours);
-        return !(redNeighbours > aliveNeighbours - redNeighbours);
+        //int aliveNeighbours = countAliveNeighbours(rowIndex,columnIndex);
+        //int redNeighbours =  countRedNeighbours(rowIndex,columnIndex);
+        //if (aliveNeighbours == 3) return (redNeighbours >= aliveNeighbours - redNeighbours);
+        //return !(redNeighbours >= aliveNeighbours - redNeighbours);
+
+        if (getCell(rowIndex,columnIndex).isDead() && calculateNextState(rowIndex,columnIndex)){
+            return countRedNeighbours(rowIndex,columnIndex)>=countAliveNeighbours(rowIndex,columnIndex)-countRedNeighbours(rowIndex,columnIndex);
+        }
+        return getCell(rowIndex,columnIndex).isRed();
     }
 
     private int countAliveNeighbours(int rowIndex, int columnIndex) {
@@ -226,8 +231,9 @@ public class Grid implements Iterable<Cell> {
         for (int row = 0; row < this.numberOfRows; row++){
             for (int col = 0; col < this.numberOfColumns; col++) {
                 if (random.nextBoolean()){
-                    this.cells[row][col].setAlive();
                     this.cells[row][col].setColor(random.nextBoolean());
+                    this.cells[row][col].setAlive();
+
                 }
             }
         }