diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index 5659dd1..6944ba6 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -183,19 +183,25 @@ public class Simulator extends Thread { // to modify agent behavior, see liveTurn method // in agent classes - - ArrayList newAgents = new ArrayList<>(); + for (int i = agents.size() - 1; i >= 0; i--) { + Agent agent = agents.get(i); + ArrayList neighbors = this.getNeighboringAnimals(agent.getX(), agent.getY(), ANIMAL_AREA_RADIUS); + if (!agent.liveTurn(neighbors, this)) { + agents.remove(i); + } + } + /*ArrayList newAgents = new ArrayList<>(); for(Agent agent : agents) { ArrayList neighbors = this.getNeighboringAnimals( agent.getX(), agent.getY(), ANIMAL_AREA_RADIUS);} - /*if(!agent.liveTurn( + if(!agent.liveTurn( neighbors, this)) { agents.remove(agent); - {*/ + }*/ // Apply Game of Life rules @@ -570,8 +576,10 @@ public class Simulator extends Thread { public void startSimulation() { - if (isWorldEmpty()) { + if (isWorldEmpty() & getWidth()==100 & getHeight()==100) { mjf.clicLoadFileButtonCSV("World/baseworld.csv"); + }else { + mjf.generateRandomBoard(); }