paul.ledieu
/
OOP_C04_Project
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final - complexified

This commit is contained in:
paull 2024-06-01 16:37:48 +02:00
parent 804060575d
commit 7dde3bc47a
4 changed files with 177 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/Agent.java
View File

@ -30,15 +30,37 @@ public abstract class Agent {
return dist<radius;
}
public String saveState() {
return String.format("%s;%d;%d;%d;%d;%d",
this.getClass().getSimpleName(),
x, y,
color.getRed(), color.getGreen(), color.getBlue());
}
public static Agent loadState(String state) {
String[] parts = state.split(";");
String className = parts[0];
int x = Integer.parseInt(parts[1]);
int y = Integer.parseInt(parts[2]);
int r = Integer.parseInt(parts[3]);
int g = Integer.parseInt(parts[4]);
int b = Integer.parseInt(parts[5]);
Color color = new Color(r, g, b);
// Create the specific agent type based on the class name
switch (className) {
case "Sheep":
return new Sheep(x, y, color);
// Add cases for other agent types here
default:
throw new IllegalArgumentException("Unknown agent type: " + className);
}
}
// Does whatever the agent does during a step
// then returns a boolean
// if false, agent dies at end of turn
// see step function in Simulator
public abstract boolean liveTurn(ArrayList<Agent> neighbors, Simulator world);
public static Agent fromString(String line) {
return null;
}
}

42
src/backend/Sheep.java
View File

@ -4,15 +4,15 @@ import java.awt.Color;
import java.util.ArrayList;
import java.util.Random;
// example of basic animal.
// do not hesitate to make it more complex
// and DO add at least another species that interact with it
// for example wolves that eat Sheep
public class Sheep extends Agent {
int hunger;
Random rand;
public Sheep(int x, int y, Color color) {
super(x, y, color);
}
Sheep(int x,int y){
//first we call the constructor of the superClass(Animal)
//with the values we want.
@ -32,28 +32,38 @@ public class Sheep extends Agent {
public boolean liveTurn(ArrayList<Agent> neighbors, Simulator world) {
if(world.getCell(x, y)==1) {
world.setCell(x, y, 0);
hunger = 0; // Reset hunger if the sheep finds food
} else {
hunger++;
}
this.moveRandom();
return hunger>10;
return hunger <= 10; // Sheep survives if hunger is 10 or less
}
private void moveRandom() {
int direction = rand.nextInt(4);
if(direction == 0) {
x+=1;
}
if(direction == 1) {
y+=1;
}
if(direction == 2) {
x-=1;
}
if(direction == 3) {
y-=1;
switch(direction) {
case 0: x += 1; break;
case 1: y += 1; break;
case 2: x -= 1; break;
case 3: y -= 1; break;
}
}
// Parsing method to create Sheep from a string
public static Sheep parse(String line) {
String[] parts = line.split(";");
int x = Integer.parseInt(parts[0]);
int y = Integer.parseInt(parts[1]);
// We don't parse color here since Sheep is always white
Sheep sheep = new Sheep(x, y);
sheep.hunger = Integer.parseInt(parts[2]); // Parsing hunger value
return sheep;
}
@Override
public String toString() {
return x + ";" + y + ";" + hunger;
}
}

209
src/backend/Simulator.java
View File

@ -1,5 +1,6 @@
package backend;
import java.util.ArrayList;
import java.util.Random;
import windowInterface.MyInterface;
@ -7,13 +8,11 @@ public class Simulator extends Thread {
private MyInterface mjf;
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;
//Animal Neighborhood Radius : 5
private final int ANIMAL_AREA_RADIUS = 2;
private boolean[][] grid; // 2D array representing the current state of the grid
private boolean[][] newGrid; // 2D array representing the next state of the grid
private int LINE_NUM;
private int COL_NUM;
private ArrayList<Integer> fieldSurviveValues;
private ArrayList<Integer> fieldBirthValues;
@ -25,7 +24,7 @@ public class Simulator extends Thread {
private boolean clickActionFlag;
private int loopDelay = 150;
public int[][] grid;
private boolean running = false; // New flag to track if the thread is running
public Simulator(MyInterface mjfParam) {
mjf = mjfParam;
@ -38,12 +37,15 @@ public class Simulator extends Thread {
fieldBirthValues = new ArrayList<Integer>();
fieldSurviveValues = new ArrayList<Integer>();
grid = new int[LINE_NUM][COL_NUM];
LINE_NUM = mjfParam.getX();
COL_NUM = mjfParam.getY();
grid = new boolean[LINE_NUM][COL_NUM];
newGrid = new boolean[LINE_NUM][COL_NUM];
// Default rule : Survive always, birth never
for (int i = 0; i < 9; i++) {
fieldSurviveValues.add(i);
}
// Default rule: Survive on 2 or 3 neighbors, birth on 3 neighbors
fieldSurviveValues.add(2);
fieldSurviveValues.add(3);
fieldBirthValues.add(3);
}
public int getWidth() {
@ -54,10 +56,12 @@ public class Simulator extends Thread {
return LINE_NUM;
}
//Should probably stay as is
// Runs the simulation
public void run() {
int stepCount=0;
while(!stopFlag) {
if (running) return; // Prevents the thread from being started more than once
running = true;
int stepCount = 0;
while (!stopFlag) {
stepCount++;
makeStep();
mjf.update(stepCount);
@ -66,7 +70,7 @@ public class Simulator extends Thread {
} catch (InterruptedException e) {
e.printStackTrace();
}
while(pauseFlag && !stopFlag) {
while (pauseFlag && !stopFlag) {
try {
Thread.sleep(loopDelay);
} catch (InterruptedException e) {
@ -74,61 +78,62 @@ public class Simulator extends Thread {
}
}
}
running = false; // Reset the running flag when the thread finishes
}
/**
* method called at each step of the simulation
* makes all the actions to go from one step to the other
*/
public void makeStep() {
int[][] newGrid = new int[LINE_NUM][COL_NUM];
try {
for (Agent agent : agents) {
ArrayList<Agent> neighbors = getNeighboringAnimals(agent.getX(), agent.getY(), 2);
if (!agent.liveTurn(neighbors, this)) {
agents.remove(agent);
}
}
for (int y = 0; y < LINE_NUM; y++) {
for (int x = 0; x < COL_NUM; x++) {
int aliveNeighbors = countAliveNeighbors(x, y);
if (grid[y][x] == 1) {
if (aliveNeighbors < 2 || aliveNeighbors > 3) {
newGrid[y][x] = 0;
int liveNeighbors = countLiveNeighbors(y, x);
if (grid[y][x]) {
newGrid[y][x] = fieldSurviveValues.contains(liveNeighbors);
} else {
newGrid[y][x] = 1;
}
} else {
if (aliveNeighbors == 3) {
newGrid[y][x] = 1;
} else {
newGrid[y][x] = 0;
newGrid[y][x] = fieldBirthValues.contains(liveNeighbors);
}
}
}
}
boolean[][] temp = grid;
grid = newGrid;
newGrid = temp;
} catch (Exception e) {
boolean[][] temp = grid;
grid = newGrid;
newGrid = temp;
}
}
private int countAliveNeighbors(int x, int y) {
int aliveCount = 0;
int[] dx = {-1, -1, -1, 0, 0, 1, 1, 1};
int[] dy = {-1, 0, 1, -1, 1, -1, 0, 1};
for (int i = 0; i < 8; i++) {
int nx = x + dx[i];
int ny = y + dy[i];
// Counts live neighbors
private int countLiveNeighbors(int y, int x) {
int count = 0;
int[] directions = {-1, 0, 1};
for (int i : directions) {
for (int j : directions) {
if (i == 0 && j == 0) continue;
int neighbory = y + i;
int neighborCol = x + j;
if (loopingBorder) {
nx = (nx + COL_NUM) % COL_NUM;
ny = (ny + LINE_NUM) % LINE_NUM;
neighbory = (neighbory + LINE_NUM) % LINE_NUM;
neighborCol = (neighborCol + COL_NUM) % COL_NUM;
}
if (nx >= 0 && nx < COL_NUM && ny >= 0 && ny < LINE_NUM) {
aliveCount += grid[ny][nx];
if (isInBounds(neighbory, neighborCol) && grid[neighbory][neighborCol]) {
count++;
}
}
return aliveCount;
}
return count;
}
/*
@ -152,8 +157,7 @@ public class Simulator extends Thread {
if (clickActionFlag) {
agents.add(new Sheep(x, y));
} else {
int currentState = getCell(x, y);
setCell(x, y, currentState == 0 ? 1 : 0);
grid[x][y] = !grid[x][y];
}
}
@ -164,10 +168,13 @@ public class Simulator extends Thread {
* @return value of cell
*/
public int getCell(int x, int y) {
if (x >= 0 && x < COL_NUM && y >= 0 && y < LINE_NUM) {
return grid[y][x];
int i =1;
try {
return grid[x][y] ? 1 : 0;
}catch (Exception e) {
i = 0;
}
return 0;
return i;
}
/**
@ -202,9 +209,7 @@ public class Simulator extends Thread {
* @param val to set in cell
*/
public void setCell(int x, int y, int val) {
if (x >= 0 && x < COL_NUM && y >= 0 && y < LINE_NUM) {
grid[y][x] = val;
}
grid[x][y] = (val == 1);
}
/**
@ -215,14 +220,11 @@ public class Simulator extends Thread {
public ArrayList<String> getSaveState() {
ArrayList<String> saveState = new ArrayList<String>();
for (int y = 0; y < LINE_NUM; y++) {
StringBuilder sb = new StringBuilder();
StringBuilder line = new StringBuilder();
for (int x = 0; x < COL_NUM; x++) {
sb.append(grid[y][x]);
if (x < COL_NUM - 1) {
sb.append(";");
line.append(grid[x][y] ? "1" : "0").append(";");
}
}
saveState.add(sb.toString());
saveState.add(line.toString());
}
return saveState;
}
@ -232,16 +234,13 @@ public class Simulator extends Thread {
* @param lines of file representing saved world state
*/
public void loadSaveState(ArrayList<String> lines) {
if (lines.size() != LINE_NUM) {
return;
}
for (int y = 0; y < LINE_NUM; y++) {
if (lines.size() <= 0) return;
for (int y = 0; y < lines.size(); y++) {
String[] lineElements = lines.get(y).split(";");
if (lineElements.length != COL_NUM) {
return;
}
for (int x = 0; x < COL_NUM; x++) {
grid[y][x] = Integer.parseInt(lineElements[x]);
for (int x = 0; x < lineElements.length; x++) {
int value = Integer.parseInt(lineElements[x]);
setCell(x, y, value);
}
}
}
@ -253,9 +252,10 @@ public class Simulator extends Thread {
* to be alive in new state
*/
public void generateRandom(float chanceOfLife) {
Random rand = new Random();
for (int y = 0; y < LINE_NUM; y++) {
for (int x = 0; x < COL_NUM; x++) {
grid[y][x] = Math.random() < chanceOfLife ? 1 : 0;
grid[x][y] = rand.nextFloat() < chanceOfLife;
}
}
}
@ -286,60 +286,44 @@ public class Simulator extends Thread {
*/
public ArrayList<String> getRule() {
ArrayList<String> rules = new ArrayList<String>();
StringBuilder surviveBuilder = new StringBuilder();
StringBuilder birthBuilder = new StringBuilder();
for (int value : fieldSurviveValues) {
surviveBuilder.append(value).append(";");
}
for (int value : fieldBirthValues) {
birthBuilder.append(value).append(";");
}
rules.add(surviveBuilder.toString());
rules.add(birthBuilder.toString());
rules.add("Survive: " + fieldSurviveValues.toString());
rules.add("Birth: " + fieldBirthValues.toString());
return rules;
}
// Loads the rules of the simulation
public void loadRule(ArrayList<String> lines) {
if (lines.size() < 2) {
System.out.println("empty rule file");
return;
}
if (lines.size() <= 0) return;
fieldSurviveValues.clear();
fieldBirthValues.clear();
String[] surviveElements = lines.get(0).split(";");
for (String elem : surviveElements) {
if (!elem.isEmpty()) {
fieldSurviveValues.add(Integer.parseInt(elem));
for (String line : lines) {
if (line.startsWith("Survive: ")) {
String[] surviveRules = line.replace("Survive: ", "").replaceAll("[\\[\\]]", "").split(", ");
for (String rule : surviveRules) {
fieldSurviveValues.add(Integer.parseInt(rule));
}
} else if (line.startsWith("Birth: ")) {
String[] birthRules = line.replace("Birth: ", "").replaceAll("[\\[\\]]", "").split(", ");
for (String rule : birthRules) {
fieldBirthValues.add(Integer.parseInt(rule));
}
String[] birthElements = lines.get(1).split(";");
for (String elem : birthElements) {
if (!elem.isEmpty()) {
fieldBirthValues.add(Integer.parseInt(elem));
}
}
}
public ArrayList<String> getAgentsSave() {
ArrayList<String> saveState = new ArrayList<>();
ArrayList<String> agentsSave = new ArrayList<>();
for (Agent agent : agents) {
saveState.add(agent.toString());
agentsSave.add(agent.saveState());
}
return saveState;
return agentsSave;
}
public void loadAgents(ArrayList<String> stringArray) {
public void loadAgents(ArrayList<String> lines) {
agents.clear();
for (String line : stringArray) {
Agent agent = Agent.fromString(line);
if (agent != null) {
agents.add(agent);
}
for (String line : lines) {
agents.add(Agent.loadState(line));
}
}
@ -350,4 +334,9 @@ public class Simulator extends Thread {
public String clickActionName() {
return clickActionFlag ? "sheep" : "cell";
}
// Checks if the coordinates are in bounds
private boolean isInBounds(int y, int x) {
return y >= 0 && y < LINE_NUM && x >= 0 && x < COL_NUM;
}
}

2
src/windowInterface/MyInterface.java
View File

@ -44,7 +44,7 @@ public class MyInterface extends JFrame {
*/
public MyInterface() {
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds(10, 10, 700, 600);
setBounds(100, 100, 700, 600);
contentPane = new JPanel();
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
contentPane.setLayout(new BorderLayout(0, 0));