Skip to content
Snippets Groups Projects
Commit 6fd1e3d1 authored by ousseyn01's avatar ousseyn01
Browse files

no change

parent 3d1739f6
Branches
No related tags found
No related merge requests found
Pipeline #42810 passed
...@@ -43,4 +43,8 @@ public class Firefighter { ...@@ -43,4 +43,8 @@ public class Firefighter {
public void extinguish(Position position, Set<Position> firePositions) { public void extinguish(Position position, Set<Position> firePositions) {
firePositions.remove(position); firePositions.remove(position);
} }
public void reset(Position initialPosition) {
this.position = initialPosition;
}
} }
...@@ -48,7 +48,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> { ...@@ -48,7 +48,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
this.initialCloudCount = initialCloudCount; this.initialCloudCount = initialCloudCount;
initializeElements(); initializeElements();
// Initialisation des Updaters
nextGenerationUpdater = new NextGenerationUpdater(fire, clouds, firefighters, mountains, neighbors); nextGenerationUpdater = new NextGenerationUpdater(fire, clouds, firefighters, mountains, neighbors);
terrainElements = new ArrayList<>(); terrainElements = new ArrayList<>();
...@@ -68,7 +67,16 @@ public class FirefighterBoard implements Board<List<ModelElement>> { ...@@ -68,7 +67,16 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
clouds = new ArrayList<>(); clouds = new ArrayList<>();
mountains = new ArrayList<>(); mountains = new ArrayList<>();
Set<Position> firePositions = new HashSet<>(); Set<Position> firePositions = new HashSet<>();
terrainElements = new ArrayList<>();
// List<Position> initialFirefighterPositions = new ArrayList<>();
int targetColumn = 9;
for (int row = 0; row < rowCount; row++) {
Position position = new Position(row, targetColumn);
terrainElements.add(new Route(position));
}
for (int index = 0; index < initialCloudCount; index++) { for (int index = 0; index < initialCloudCount; index++) {
clouds.add(new Cloud(randomPosition(), neighbors)); clouds.add(new Cloud(randomPosition(), neighbors));
...@@ -76,8 +84,11 @@ public class FirefighterBoard implements Board<List<ModelElement>> { ...@@ -76,8 +84,11 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
for (int index = 0; index < initialFireCount; index++) for (int index = 0; index < initialFireCount; index++)
firePositions.add(randomPosition()); firePositions.add(randomPosition());
fire = new Fire(firePositions, neighbors); fire = new Fire(firePositions, neighbors);
for (int index = 0; index < initialFirefighterCount; index++)
for (int index = 0; index < initialFirefighterCount; index++) {
firefighters.add(new Firefighter(randomPosition())); firefighters.add(new Firefighter(randomPosition()));
}
for (int index = 0; index < initialCloudCount; index++) { for (int index = 0; index < initialCloudCount; index++) {
clouds.add(new Cloud(randomPosition(), neighbors)); clouds.add(new Cloud(randomPosition(), neighbors));
} }
...@@ -155,13 +166,17 @@ public class FirefighterBoard implements Board<List<ModelElement>> { ...@@ -155,13 +166,17 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
} }
public List<Position> updateToNextGeneration() { public List<Position> updateToNextGeneration() {
return nextGenerationUpdater.updateToNextGeneration(); List<Position> updatedPositions = nextGenerationUpdater.updateToNextGeneration();
step++; // Incrémentation du compteur de génération
return updatedPositions;
//return nextGenerationUpdater.updateToNextGeneration();
} }
@Override @Override
public void reset() { public void reset() {
nextGenerationUpdater.resetStep();
initializeElements(); initializeElements();
nextGenerationUpdater.resetStep();
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment