laure.bel
/
OOP_F3_Project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# WARNING: head commit changed in the meantime 

a
This commit is contained in:
Timéo 2024-05-29 13:18:07 +02:00
parent d866f7c6f1
commit 8cf859bb76
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/backend/Simulator.java
View File

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