.idea/.gitignore

+# Default ignored files
+/workspace.xml

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/tp3.iml" filepath="$PROJECT_DIR$/tp3.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

Cell.java

@@ -4,9 +4,11 @@
 
 public class Cell {
     private boolean isAlive;
+    private boolean isRed;
 
     public Cell(){
 	this.isAlive = false;
+	this.isRed = false;
     }
     
     /**
@@ -19,6 +21,8 @@ public class Cell {
         return this.isAlive;
     }
 
+    public boolean isRed() { return this.isRed; }
+
     /**
      * Determines whether this {@link Cell} is dead or not.
      *
@@ -39,6 +43,9 @@ public class Cell {
 	this.isAlive = true;
     }
 
+    public void setBlue() { isRed = false; }
+    public void setRed() { isRed = true; }
+
     /**
      * Sets the state of this {@link Cell} to dead.
      *

GameOfLifeGUI.java

@@ -39,8 +39,12 @@ public class GameOfLifeGUI extends JFrame {
         for (int x = 0; x < numberOfColumns; x++)
             for (int y = 0; y < numberOfRows; y++){
 		JLabel label = labelGrid[x][y];
-		if(g.getCell(x,y).isAlive())
+		if(g.getCell(x,y).isAlive()) {
+            if (g.getCell(x, y).isRed())
                 label.setForeground(Color.red);
+            else
+                label.setForeground(Color.blue);
+        }
 		else
 		    label.setForeground(Color.white);
 	    }

Grid.java

-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * {@code Grid} instances represent the grid in <i>The Game of Life</i>.
@@ -98,29 +95,68 @@ public class Grid implements Iterable<Cell> {
     }
 
     private boolean[][] calculateNextStates() {
-        return null;
+        boolean[][] states = new boolean[getNumberOfRows()][getNumberOfColumns()];
+            for (int i = 0; i < getNumberOfRows(); i++) {
+                for (int j = 0; j < getNumberOfColumns(); j++) {
+                    states[i][j] = calculateNextState(i, j, getCell(i, j));
+                }
+            }
+        return states;
     }
 
     private boolean calculateNextState(int rowIndex, int columnIndex, Cell cell) {
-	return false;
+        int aliveNeighbours = countAliveNeighbours(rowIndex, columnIndex);
+        if (cell.isAlive()) {
+            return aliveNeighbours >= 2 && aliveNeighbours <= 3;
+        }
+        if (willBeRed(rowIndex, columnIndex))
+            getCell(rowIndex, columnIndex).setRed();
+        else
+            getCell(rowIndex, columnIndex).setBlue();
+        return aliveNeighbours == 3;
     }
 
     private int countAliveNeighbours(int rowIndex, int columnIndex) {
-        return 0;
+        int aliveNeighbours = 0;
+        List<Cell> cells = getNeighbours(rowIndex, columnIndex);
+        for (Cell cell : cells) {
+            if (cell.isAlive())
+                aliveNeighbours++;
+        }
+        return aliveNeighbours;
     }
 
 
     private List<Cell> getNeighbours(int rowIndex, int columnIndex) {
-	return null;
+        List<Cell> cells = new ArrayList<>();
+        for (int i =  rowIndex - 1; i <= rowIndex + 1; i++) {
+            for (int j = columnIndex - 1; j <= columnIndex + 1; j++) {
+                if ((!(i == rowIndex && j == columnIndex)) && i > 0 && j > 0 && i < getNumberOfRows() && j < getNumberOfColumns())
+                    cells.add(getCell(i, j));
+            }
+        }
+	return cells;
     }
 
     private void goToNextState(boolean[][] nextState) {
+        for (int i = 0; i < getNumberOfRows(); i++) {
+            for (int j = 0; j < getNumberOfColumns(); j++) {
+                if (nextState[i][j])
+                    getCell(i, j).setAlive();
+                else
+                    getCell(i, j).setDead();
+            }
+        }
     }
 
     /**
      * Sets all {@link Cell}s in this {@code Grid} as dead.
      */
     void clear() {
+        GridIterator iterator = new GridIterator(this);
+        while (iterator.hasNext()) {
+            iterator.next().setDead();
+        }
     }
 
     /**
@@ -131,6 +167,29 @@ public class Grid implements Iterable<Cell> {
      */
  
     void randomGeneration(Random random) {
+        GridIterator iterator = new GridIterator(this);
+        while (iterator.hasNext()) {
+            Cell cell = iterator.next();
+            if (random.nextBoolean()) {
+                cell.setAlive();
+                if (random.nextBoolean())
+                    cell.setRed();
+                else
+                    cell.setBlue();
+            }
+            else
+                cell.setDead();
+        }
+    }
+
+    private boolean willBeRed(int rowIndex, int cocolumnIndex) {
+        List<Cell> cells = getNeighbours(rowIndex, cocolumnIndex);
+        int redCells = 0;
+        for (Cell cell : cells) {
+            if (cell.isAlive() && cell.isRed())
+                redCells++;
+        }
+        return redCells >= 2;
     }
 
 }

out/production/tp3/.idea/.gitignore

+# Default ignored files
+/workspace.xml

out/production/tp3/.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file

out/production/tp3/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/tp3.iml" filepath="$PROJECT_DIR$/tp3.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

out/production/tp3/.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

out/production/tp3/tp3.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

tp3.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file