From dbc06637b83ace2d9c8252774e7e3b014251959d Mon Sep 17 00:00:00 2001
From: melisdamlasahin <melis-damla.SAHIN@etu.univ-amu.fr>
Date: Sun, 26 Jan 2025 01:33:10 +0100
Subject: [PATCH] TP
---
.../model/automata/GameOfLifeAutomaton.java | 3 +--
.../java/model/automata/GameOfLifeState.java | 20 +++++++++----------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/model/automata/GameOfLifeAutomaton.java b/src/main/java/model/automata/GameOfLifeAutomaton.java
index 0caeca9..e732a60 100644
--- a/src/main/java/model/automata/GameOfLifeAutomaton.java
+++ b/src/main/java/model/automata/GameOfLifeAutomaton.java
@@ -5,7 +5,6 @@ import model.CellularAutomaton;
import java.util.Random;
public class GameOfLifeAutomaton implements CellularAutomaton<GameOfLifeState> {
-
private final int numberOfColumns;
private final int numberOfRows;
@@ -33,4 +32,4 @@ public class GameOfLifeAutomaton implements CellularAutomaton<GameOfLifeState> {
public GameOfLifeState randomState(Random generator) {
return generator.nextBoolean() ? GameOfLifeState.ALIVE : GameOfLifeState.DEAD;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/model/automata/GameOfLifeState.java b/src/main/java/model/automata/GameOfLifeState.java
index c3931e1..3136e44 100644
--- a/src/main/java/model/automata/GameOfLifeState.java
+++ b/src/main/java/model/automata/GameOfLifeState.java
@@ -4,7 +4,6 @@ import javafx.scene.paint.Color;
import model.State;
import java.util.List;
-import java.util.Random;
/**
* {@link GameOfLifeState} instances represent the possible states of a {@link GameOfLifeState}.
@@ -12,6 +11,7 @@ import java.util.Random;
public enum GameOfLifeState implements State<GameOfLifeState> {
ALIVE, DEAD;
+
@Override
public Color getColor() {
return this == ALIVE ? Color.RED : Color.WHITE;
@@ -23,16 +23,14 @@ public enum GameOfLifeState implements State<GameOfLifeState> {
}
@Override
- public GameOfLifeState update(List<GameOfLifeState> neighbors) {
- int aliveCount = State.count(ALIVE, neighbors);
-
- if (this == ALIVE) {
- return (aliveCount == 2 || aliveCount == 3) ? ALIVE : DEAD;
+ public GameOfLifeState update(List<GameOfLifeState> neighbours) {
+ int aliveNeighbors = State.count(ALIVE, neighbours);
+ if (this == ALIVE){
+ return (aliveNeighbors == 2 || aliveNeighbors == 3) ? ALIVE : DEAD;
} else {
- return (aliveCount == 3) ? ALIVE : DEAD;
+ return aliveNeighbors == 3 ? ALIVE : DEAD;
}
}
- public GameOfLifeState randomState(Random generator) {
- return generator.nextBoolean() ? GameOfLifeState.ALIVE : GameOfLifeState.DEAD;
- }
-}
\ No newline at end of file
+
+}
+
--
GitLab