guillaume.bonabau
/
OOP_F1_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load Agents works (but not save agents)

This commit is contained in:
Guillaume BONABAU 2024-05-31 16:40:02 +02:00
parent dee5805c28
commit e785ba1cf8
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ressources/Agents/wolfAndSheep.csv Normal file
View File

2
src/backend/Sheep.java
View File

@ -37,7 +37,7 @@ public class Sheep extends Agent {
} else { } else {
hunger++; hunger++;
} }
this.moveRandom(); this.moveRandom(world);
return hunger<10; //condition to be alive return hunger<10; //condition to be alive
//if the sheep can reproduce it creates a new sheep in agents //if the sheep can reproduce it creates a new sheep in agents
//if(canReproduce(neighbors, world)) { //if(canReproduce(neighbors, world)) {

43
src/backend/Simulator.java
View File

@ -18,8 +18,8 @@ public class Simulator extends Thread {
private MyInterface mjf; private MyInterface mjf;
private final int COL_NUM = 10; private final int COL_NUM = 100;
private final int LINE_NUM = 10; private final int LINE_NUM = 100;
private final int LIFE_TYPE_NUM = 4; private final int LIFE_TYPE_NUM = 4;
//Conway Radius : 1 //Conway Radius : 1
private final int LIFE_AREA_RADIUS = 1; private final int LIFE_AREA_RADIUS = 1;
@ -71,7 +71,7 @@ public class Simulator extends Thread {
//Default rule : Survive always, birth never //Default rule : Survive always, birth never
//loadRule("ressources/Rule/conwayRule.json"); //loadRule("ressources/Rule/conwayRule.json");
loadRule("OOP_F1_Project/ressources/Rule/conwayRule.json"); loadRule("ressources/Rule/conwayRule.json");
} }
@ -526,7 +526,7 @@ public class Simulator extends Thread {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void loadRule(String fileName) { public void loadRule(String fileName) {
System.out.println(fileName); System.out.println(fileName);
//TODO-INPROGRESS load json //TODO-COMPLETE load json
JSONParser jsonParser = new JSONParser(); JSONParser jsonParser = new JSONParser();
try (FileReader reader = new FileReader(fileName)) try (FileReader reader = new FileReader(fileName))
{ {
@ -643,13 +643,42 @@ public class Simulator extends Thread {
public ArrayList<String> getAgentsSave() { public ArrayList<String> getAgentsSave() {
//TODO : Same idea as the other save method, but for agents ArrayList<String> agentSave = new ArrayList<String>();
return null; String listSheep = "";
String listWolf = "";
//iterate through the agents arraylist
for(Agent agent : agents){
if(agent instanceof Sheep) {
listSheep = listSheep + agent.getX() + "," + agent.getY() + ";";
}else if (agent instanceof Wolf) {
listWolf = listWolf + agent.getX() + "," + agent.getY() + ";";
}
}
agentSave.add(listSheep);
agentSave.add(listWolf);
return agentSave;
} }
public void loadAgents(ArrayList<String> stringArray) { public void loadAgents(ArrayList<String> stringArray) {
//TODO : Same idea as other load methods, but for agent list //TODO : Same idea as other load methods, but for agent list
// Load sheep agents
String sheepLine = stringArray.get(0);
String[] sheepCoordinates = sheepLine.split(";");
for (String coordinate : sheepCoordinates) {
String[] xy = coordinate.split(",");
int x = Integer.parseInt(xy[0]);
int y = Integer.parseInt(xy[1]);
setSheep(x, y);
}
// Load wolf agents
String wolfLine = stringArray.get(1);
String[] wolfCoordinates = wolfLine.split(";");
for (String coordinate : wolfCoordinates) {
String[] xy = coordinate.split(",");
int x = Integer.parseInt(xy[0]);
int y = Integer.parseInt(xy[1]);
setWolf(x, y);
}
} }
/** /**