diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 051fd35cbd1aaf2f2f60edf3b880204cfcc98c2e..73f5c656ffc9d5907e18817f756a67622bb73984 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.bin and b/.gradle/8.10.2/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 0be82c63efdc8504b711e35446e2a45e13b056e2..01305c5a79fb3335d4212cb69cec6ecfe9799a7e 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.lock and b/.gradle/8.10.2/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 27b724348ee342ec8d4b5724953555a9bdf2bde5..5f6ff7684485ab0401d5d71fd8517f8b3ed6fd2f 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.bin and b/.gradle/8.10.2/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index e68c6953a46e5070226bdc0295ae1d3dd8787e56..1f3117a7e6e764418451701a2f7793e3994ef72a 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.lock and b/.gradle/8.10.2/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index efa19decb6e32ae5cef9eac1e52b8b7bcfa7c061..c7f8aba72b9fe6b90a63279949156eef2887337b 100644
Binary files a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index d0e0f9f97184b7335603179be1962ff8f3a3232d..95ccd3a0ea82d0ce1f4b91f7c0c51ec34b2256aa 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index d90530e8d72b19736694ba88f2525b738af4bb8d..439370a9cf3e81f943e985a67690580dd7b49b3b 100644
Binary files a/build/classes/java/main/model/FirefighterBoard.class and b/build/classes/java/main/model/FirefighterBoard.class differ
diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 2b66bfdf17fed85e7539d1b0a714e09803e4efaa..f8689dddb9f3d7f8bc408a1c0db69f5a41101aaf 100644
Binary files a/build/classes/java/main/view/FirefighterGrid.class and b/build/classes/java/main/view/FirefighterGrid.class differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index 13960325fcfe0d305876ea83d4af1b454e819c14..4ab2b334e3ac1fb502c67b8dbded51f09ca58b02 100644
Binary files a/build/classes/java/main/view/ViewElement.class and b/build/classes/java/main/view/ViewElement.class differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 687f3d658c2b5616b6cc79b89347e94a27d1cf12..88b9efe038e7d5399b7fc58d68ad25fd6a38d9f4 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 55c698be17be5604a5a89a0cc2f0dcdb4d234687..4255afb848f7d125992177b185f673ab9aa770c1 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -218,26 +218,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
return modifiedPositions;
}
- private Set<Position> spreadFire() {
- Set<Position> newFirePositions = new HashSet<>();
- for (Position firePosition : firePositions) {
- newFirePositions.addAll(neighbors.get(firePosition)); // Spread fire to neighbors
- }
- return newFirePositions;
- }
-
- private void extinguishNearbyFire(List<Position> modifiedPositions) {
- for (Position firefighterPosition : firefighterPositions) {
- List<Position> nearbyFires = neighbors.get(firefighterPosition);
- for (Position neighbor : nearbyFires) {
- if (firePositions.contains(neighbor)) {
- firePositions.remove(neighbor); // Extinguish fire in neighboring positions
- modifiedPositions.add(neighbor);
- }
- }
- }
- }
-
public List<Pair<Position, ModelElement>> getUpdatedElements() {
List<Pair<Position, ModelElement>> updatedElements = new ArrayList<>();
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index 16c1969b52165833705b52d9b0f4784abff33da2..453da0f232ca7f935532361f39568255a096d724 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -8,7 +8,7 @@ import model.ModelElement;
import model.FirefighterBoard;
import util.Position;
-public class FirefighterGrid extends Canvas {
+public class FirefighterGrid extends Canvas {
private int columns;
private int rows;
@@ -75,4 +75,12 @@ public class FirefighterGrid extends Canvas {
gc.strokeLine(0, row * boxHeight, getWidth(), row * boxHeight); // Horizontal lines
}
}
+
+ public int getColumns() {
+ return columns;
+ }
+
+ public int getRows() {
+ return rows;
+ }
}
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index 0c4f09ea7dcf7f85f785374602c50b5a022a0c82..957df8f7b5de19166fa715769c5e45131a2f44e0 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -3,7 +3,7 @@ package view;
import javafx.scene.paint.Color;
public enum ViewElement {
- ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLAUD(Color.YELLOW);
+ ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLOUD(Color.YELLOW),MOUTAIN(Color.GREEN),ROCKS(Color.LIGHTSKYBLUE);
final Color color;
diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java
index 25cc8dbca8acea698879df68a5006a179f281ecc..b06dd8d997826e23fc52541dbfcee35c3302d7b9 100644
--- a/src/test/java/model/FirefighterBoardTest.java
+++ b/src/test/java/model/FirefighterBoardTest.java
@@ -10,17 +10,17 @@ import static org.assertj.core.api.Assertions.*;
public class FirefighterBoardTest {
@Test
void testColumnCount(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
assertThat(board.columnCount()).isEqualTo(20);
}
@Test
void testRowCount(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
assertThat(board.rowCount()).isEqualTo(10);
}
@Test
void testStepNumber(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
for(int index = 0; index < 10; index++){
assertThat(board.stepNumber()).isEqualTo(index);
board.updateToNextGeneration();
@@ -29,7 +29,7 @@ public class FirefighterBoardTest {
}
@Test
void testGetState_afterSet(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0,0,0,0,0);
Position position = new Position(1,2);
assertThat(board.getState(position)).isEmpty();
board.setState(List.of(ModelElement.FIRE), position);
diff --git a/src/test/java/view/FirefighterGridTest.java b/src/test/java/view/FirefighterGridTest.java
index 4b45ebdca3b936b42c2b322b1294488341d180bb..68b6211ff9a6972e62a40a3498489ca3277d39fb 100644
--- a/src/test/java/view/FirefighterGridTest.java
+++ b/src/test/java/view/FirefighterGridTest.java
@@ -7,14 +7,14 @@ import static org.assertj.core.api.Assertions.assertThat;
public class FirefighterGridTest {
@Test
void testColumnCount(){
- Grid<ViewElement> grid = new FirefighterGrid();
- grid.setDimensions(20,10,10,10);
- assertThat(grid.columnCount()).isEqualTo(20);
+ FirefighterGrid grid = new FirefighterGrid();
+ grid.initialize(20,10,10,10,null);
+ assertThat(grid.getColumns()).isEqualTo(20);
}
@Test
void testRowCount(){
- Grid<ViewElement> grid = new FirefighterGrid();
- grid.setDimensions(20,10,10,10);
- assertThat(grid.rowCount()).isEqualTo(10);
+ FirefighterGrid grid = new FirefighterGrid();
+ grid.initialize(20,10,10,10,null);
+ assertThat(grid.getRows()).isEqualTo(10);
}
}