diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index 0c7f9a3..4e5a183 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -31,7 +31,7 @@ public class Simulator extends Thread { private boolean stopFlag; private boolean pauseFlag; private boolean loopingBorder; - private int clickActionFlag; + private boolean clickActionFlag; private int loopDelay = 150; private int[][] worldGrid; private World world; //get the World instance @@ -45,7 +45,7 @@ public class Simulator extends Thread { //stopFlag=false; //not necessary since i set the state when pressing the button start pauseFlag=false; loopingBorder=false; - clickActionFlag=0; + clickActionFlag=false; agents = new ArrayList(); fieldBirthValues = new ArrayList(); @@ -141,7 +141,7 @@ public class Simulator extends Thread { // in agent classes - // int[][] newWorld = new int[getWidth()][getHeight()]; + int[][] newWorld = new int[getWidth()][getHeight()]; /*ArrayList newAgents = new ArrayList<>(); for(Agent agent : agents) { @@ -149,29 +149,32 @@ public class Simulator extends Thread { this.getNeighboringAnimals( agent.getX(), agent.getY(), - ANIMAL_AREA_RADIUS); + ANIMAL_AREA_RADIUS);} if(!agent.liveTurn( neighbors, this)) { agents.remove(agent); - } - }*/ + }*/ // Apply Game of Life rules - /*for (int x = 0; x < getWidth(); x++) { - for (int y = 0; y < getHeight(); y++) { - int aliveNeighbors = countAliveNeighbors(x, y); - if (getCell(x,y) == 1) { // - newWorld[x][y] = (aliveNeighbors < 2 || aliveNeighbors > 3) ? 0 : 1; - } else { - newWorld[x][y] = (aliveNeighbors == 3) ? 1 : 0; - } - } - } + //for (int x = 0; x < getWidth(); x++) { + // for (int y = 0; y < getHeight(); y++) { + // int aliveNeighbors = countAliveNeighbors(x, y); + // if (world[x][y] == 1) { + // newWorld[x][y] = (aliveNeighbors < 2 || aliveNeighbors > 3) ? 0 : 1; + // } else { + // newWorld[x][y] = (aliveNeighbors == 3) ? 1 : 0; + // } + // } + //} - this.world = setWorld(newWorld,getWidth(),getHeight()) ; -*/ + + + + + //world = newWorld; + //then evolution of the field @@ -317,7 +320,7 @@ public class Simulator extends Thread { ArrayList rule = new ArrayList<>(); for (int i = 0; i < getHeight(); i++) { StringBuilder lineState = new StringBuilder(); - for (int j = 0 ; j < getHeight() ; j++) { + for (int j = 0 ; j < getHeight() ; j++) { // je crois qu'il y a un probleme, il fau+t mettre getWidth je crois lineState.append(getCell(i, j)); if (j < getWidth() - 1) { lineState.append(";"); @@ -355,7 +358,10 @@ public class Simulator extends Thread { } public void toggleClickAction() { - //TODO : complete method + if (clickActionFlag() != 2) { + = ++ + } + else = 0 } @@ -379,11 +385,6 @@ public class Simulator extends Thread { public String clickActionName() { // TODO : initially return "sheep" or "cell" // depending on clickActionFlag - if (clickActionFlag==0) { - return "cell"; - }else if (clickActionFlag==1) { - - } return ""; }