From 7acff3e63834ee490cf75eabeac4f1896b0ed88e Mon Sep 17 00:00:00 2001
From: laure <laure.bel@ecam.fr>
Date: Wed, 29 May 2024 18:07:23 +0200
Subject: [PATCH] test

---
 src/backend/Sheep.java     |  6 +++++-
 src/backend/Simulator.java | 25 ++++++++++++-------------
 src/backend/World.java     |  6 +++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/backend/Sheep.java b/src/backend/Sheep.java
index 3c0f302..0317fab 100644
--- a/src/backend/Sheep.java
+++ b/src/backend/Sheep.java
@@ -36,7 +36,11 @@ public class Sheep extends Agent {
 			hunger++;
 		}
 		this.moveRandom();
-		return hunger>10;
+		if (hunger<=10) {
+			return true;
+		}else {
+			return hunger>10;
+		}
 	}
 
 	private void moveRandom() {
diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index e7bebb6..439fc03 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -16,8 +16,8 @@ public class Simulator extends Thread {
 	private MyInterface mjf;
 	public Rules rules;
 
-	//private final int COL_NUM = 100;
-	//private final int LINE_NUM = 100;
+	private final int COL_NUM = 100;
+	private final int LINE_NUM = 100;
 	private final int LIFE_TYPE_NUM = 4;
 	//Conway Radius : 1
 	private final int LIFE_AREA_RADIUS = 1;
@@ -66,11 +66,11 @@ public class Simulator extends Thread {
 	}
 	
 	public int getWidth() {
-        return world.getWidth();
+        return this.getWidth();
 	}
 	
 	public int getHeight() {
-		return world.getHeight();
+		return this.getHeight();
 	}
 	
 	public World getActualWorld(){
@@ -160,13 +160,15 @@ public class Simulator extends Thread {
 		
         ArrayList<Agent> newAgents = new ArrayList<>();
 		for(Agent agent : agents) {
-			ArrayList<Agent> neighbors =this.getNeighboringAnimals(agent.getX(),agent.getY(),ANIMAL_AREA_RADIUS);}
-			if(!agent.liveTurn(neighbors,this)) {
+			/*ArrayList<Agent> neighbors =this.getNeighboringAnimals(agent.getX(),agent.getY(),ANIMAL_AREA_RADIUS);}
+			*/
+			System.out.println("makeStep Called");
+			if(!agent.liveTurn(this.getNeighboringAnimals(agent.getX(),agent.getY(),ANIMAL_AREA_RADIUS),world)) {
 				agents.remove(agent);
 			}
-        
+		}
 
-         int[][] nextWorld = new int[getWidth()][getHeight()];
+         /*int[][] nextWorld = new int[getWidth()][getHeight()];
 
             for (int x = 0; x < getWidth(); x++) {
                 for (int y = 0; y < getHeight(); y++) {
@@ -182,7 +184,7 @@ public class Simulator extends Thread {
             world.setWorld(nextWorld, getWidth(), getHeight());
         }
 
-        
+        */
         
 	//then evolution of the field
 	   
@@ -203,10 +205,7 @@ public class Simulator extends Thread {
 		 */
 			
 	
-	
-
-        
-		
+	}
 
 	/*
 	 * leave this as is
diff --git a/src/backend/World.java b/src/backend/World.java
index 3c1cfe9..121df0b 100644
--- a/src/backend/World.java
+++ b/src/backend/World.java
@@ -3,9 +3,9 @@ package backend;
 import java.util.Random;
 
 public class World {
-	
-	private int width;
-	private int height;
+	Simulator simulator;
+	private int width = simulator.getWidth();
+	private int height = simulator.getHeight();
 	private int[][] world;
 	
 	public World(int width, int height) {