From fce9dbcc55538dad6e36637dd985aff693149547 Mon Sep 17 00:00:00 2001
From: Guyslain <guyslain.naves@lis-lab.fr>
Date: Wed, 11 Oct 2023 13:51:54 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20des=20soucis=20cr=C3=A9=C3=A9s=20e?=
=?UTF-8?q?n=20templ=C3=A9tant=20le=20projet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/model/NextGenerationInitializer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/model/NextGenerationInitializer.java b/src/main/java/model/NextGenerationInitializer.java
index 1242f43..0c4cdba 100644
--- a/src/main/java/model/NextGenerationInitializer.java
+++ b/src/main/java/model/NextGenerationInitializer.java
@@ -28,7 +28,7 @@ public class NextGenerationInitializer<S extends State<S>> implements MatrixInit
@Override
public S initialValueAt(Coordinate coordinate) {
- List<State<S>> neighbours = new ArrayList<>();
+ List<S> neighbours = new ArrayList<>();
for (Coordinate neighbourCoord : coordinate.orthodiagonalNeighbours()) {
Coordinate wrapped = wrap(neighbourCoord);
neighbours.add(this.simulation.at(wrapped).get());
@@ -45,7 +45,7 @@ public class NextGenerationInitializer<S extends State<S>> implements MatrixInit
* @param coordinate a {@link Coordinate} that may be outside the grid.
* @return a corresponding {@link Coordinate}, that is inside the grid.
*/
- private Coordinate wrap(Coordinate coordinate) {
+ Coordinate wrap(Coordinate coordinate) {
return new Coordinate(
modulo(coordinate.x(),this.simulation.numberOfColumns()),
modulo(coordinate.y(),this.simulation.numberOfRows())
@@ -58,7 +58,7 @@ public class NextGenerationInitializer<S extends State<S>> implements MatrixInit
* @param d a non-zero integer.
* @return the remainder of {@code n/d}, between {@code 0} and {@code n-1}.
*/
- private static int modulo(int n, int d) {
+ static int modulo(int n, int d) {
int result = n % d;
return n < 0 ? result + d : result;
}
--
GitLab