From 2daa757fb80dbf498a511fb5894c9e290e225ea6 Mon Sep 17 00:00:00 2001
From: ousseyn01 <ousseyn.ndiaye9@gmail.com>
Date: Thu, 28 Nov 2024 20:57:23 +0100
Subject: [PATCH] Modification of Cloud
---
src/main/java/model/Cloud.java | 2 --
src/main/java/model/FirefighterBoard.java | 1 -
src/test/java/model/FirefighterBoardTest.java | 4 ++--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java
index 208894d..8b23525 100644
--- a/src/main/java/model/Cloud.java
+++ b/src/main/java/model/Cloud.java
@@ -17,9 +17,7 @@ public class Cloud {
// Déplacement aléatoire du nuage
public void move() {
List<Position> validNeighbors = neighbors.get(position);
- if (!validNeighbors.isEmpty()) {
this.position = validNeighbors.get(randomGenerator.nextInt(validNeighbors.size()));
- }
}
// Éteindre les feux dans les cases adjacentes
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 7aef60a..b5785cf 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -123,7 +123,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
if (step % 2 == 0){
modifiedPositions.addAll(fire.spreadFire(getMountainPositions()));
}
- // Déplacer les nuages et éteindre les feux
for (Cloud cloud : clouds) {
//cloud.moveAndExtinguishFire(fire);
//cloud.extinguishFireCloud(fire);
diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java
index 91b328a..6db4184 100644
--- a/src/test/java/model/FirefighterBoardTest.java
+++ b/src/test/java/model/FirefighterBoardTest.java
@@ -15,12 +15,12 @@ public class FirefighterBoardTest {
}
@Test
void testRowCount(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3, 3, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 3, 3, 3, 3);
assertThat(board.rowCount()).isEqualTo(10);
}
@Test
void testStepNumber(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3, 3, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 3, 3, 3, 3);
for(int index = 0; index < 10; index++){
assertThat(board.stepNumber()).isEqualTo(index);
board.updateToNextGeneration();
--
GitLab