From 82bcd85852e76d795d1bc1bdb1ee67c71a99c7cf Mon Sep 17 00:00:00 2001
From: "l.dupuis-burtin" <l.dupuis-burtin@ecam.fr>
Date: Wed, 29 May 2024 10:16:50 +0200
Subject: [PATCH] fix loading rules for every size of rule

---
 src/backend/Simulator.java | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 8031b8b..f3e5b7c 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -114,20 +114,26 @@ public class Simulator extends Thread {
 	//i put everything here for now
 	public void cellDies(int x, int y) {
 		int aliveNeighbors = getAliveNeighbors(x, y, LIFE_AREA_RADIUS);
+		for (int i=0;i<ruleSurviveCriteria.size();i++) {
+			if(aliveNeighbors == ruleSurviveCriteria.get(i)) {
+				setNewCell(x, y, 1);
+				break;
+				//newCells.get(x).set(y, 0);
+			}else{setNewCell(x, y, 0);}
+		}
 		
-		if(aliveNeighbors < ruleSurviveCriteria.get(0) || aliveNeighbors > ruleSurviveCriteria.get(1)) {
-			setNewCell(x, y, 0);
-			//newCells.get(x).set(y, 0);
-			}else{setNewCell(x, y, 1);}
 		}
 	
 	public void cellBorns(int x, int y) {
 		int aliveNeighbors = getAliveNeighbors(x, y, LIFE_AREA_RADIUS);
 
-		if(aliveNeighbors == ruleBirthCriteria.get(0)) {
-			setNewCell(x, y, 1);
-			//newCells.get(x).set(y, 1);
-		}else{setNewCell(x, y, 0);}
+		for (int i=0;i<ruleBirthCriteria.size();i++) {
+			if(aliveNeighbors == ruleBirthCriteria.get(i)) {
+				setNewCell(x, y, 1);
+				break;
+				//newCells.get(x).set(y, 0);
+			}else{setNewCell(x, y, 0);}
+		}
 	}
 	
 	public int getAliveNeighbors(int x, int y, int radius) {