diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 356014674fb63d4fdcabb77d2a8a71be252803d0..2c03c1aa334b9dd25fb6ba0f7f319b1dc09cc103 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 364735a916720d347b85ceef00df9a9a2254aa90..79610f3368aed3aa26a3b5db32da7fa515dd978f 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 c66a162ad97620144152aa3cbeb67b4087a68adb..2ce4fff0fdc25123170c3ff693e782569880e95f 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 fd6eb11de62d8a1380c454eda64c76dbbd9426dd..65bd0087b7ca40bb6be4f6ab1b6ed72b24766598 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 bc8e5d2dfc298a80508290e67d34e5f0a7146d78..b7f6bb8ab7b77c5eba29cbf5f7708483764e18fb 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 bdb8cb7aea7f8ef6495de3bf0c9c77121eb66ae2..5cede1d8265b17ceb058585f3e7af8e79423ae87 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 1d6bd7f9b379124754ac0373b7e217eec9eb7551..1374602b071f4ec880fa3f907b06b4dd53c9d4c7 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 4f21e809abe20807aa6e2c790ad3a4ea5ec019c3..7c671f6535833ab81a22e08adc523027457a7dcc 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index 64108db13ab8040948211250032367c6392ccdcb..ace323de4b19d73995c1120f22494767675e7288 100644
Binary files a/build/classes/java/main/app/SimulatorApplication.class and b/build/classes/java/main/app/SimulatorApplication.class differ
diff --git a/build/classes/java/main/app/SimulatorMain.class b/build/classes/java/main/app/SimulatorMain.class
index 1d13229f73ef27c233a432bc89aa3dffc086246a..b426382855daa4f8e3ff421f7108c0b298a18d65 100644
Binary files a/build/classes/java/main/app/SimulatorMain.class and b/build/classes/java/main/app/SimulatorMain.class differ
diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index 1f4f51d3c4da6dd5faadbc1331eafad5adb41878..ea1164e2a7267614b6a62ee05fc0e91154c3fd89 100644
Binary files a/build/classes/java/main/controller/Controller.class and b/build/classes/java/main/controller/Controller.class differ
diff --git a/build/classes/java/main/controller/PersistentToggleGroup.class b/build/classes/java/main/controller/PersistentToggleGroup.class
deleted file mode 100644
index 314954a9fd4ab6d48da5fec7067063879e670d62..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/controller/PersistentToggleGroup.class and /dev/null differ
diff --git a/build/classes/java/main/model/Board.class b/build/classes/java/main/model/Board.class
index a1f8169e45fef3872ae559ad22bdf5a3d6f63dfd..9384d2b533b1eef09f28e2e08c82c467056e8b53 100644
Binary files a/build/classes/java/main/model/Board.class and b/build/classes/java/main/model/Board.class differ
diff --git a/build/classes/java/main/model/BoardManager.class b/build/classes/java/main/model/BoardManager.class
deleted file mode 100644
index 401577047c6f4921c89315d5025414dabc2b9114..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/BoardManager.class and /dev/null differ
diff --git a/build/classes/java/main/model/FireManager.class b/build/classes/java/main/model/FireManager.class
deleted file mode 100644
index 2d3f092f581ff58397dd0fd321560bb0752f85af..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/FireManager.class and /dev/null differ
diff --git a/build/classes/java/main/model/FireSpreadStrategy.class b/build/classes/java/main/model/FireSpreadStrategy.class
deleted file mode 100644
index 862b54120a2e8906248f7344064808b18829c972..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/FireSpreadStrategy.class and /dev/null differ
diff --git a/build/classes/java/main/model/FirefighterBoard$1.class b/build/classes/java/main/model/FirefighterBoard$1.class
index 119af8394727bb7d71d86b6a356f890372fb769b..2ec5737e18f9a7140ef28b1af6677bf0711e0a46 100644
Binary files a/build/classes/java/main/model/FirefighterBoard$1.class and b/build/classes/java/main/model/FirefighterBoard$1.class differ
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index f61f42ca6ccdd9a05f2f36b96e3ac19a79295c29..05f1582bf0089ac1643f5b103029b98d978d7fde 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/model/FirefighterManager.class b/build/classes/java/main/model/FirefighterManager.class
deleted file mode 100644
index 4f554533aa2955f84bed62952c473f93e2380674..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/FirefighterManager.class and /dev/null differ
diff --git a/build/classes/java/main/model/FirefighterMovementStrategy.class b/build/classes/java/main/model/FirefighterMovementStrategy.class
deleted file mode 100644
index 1b4076d6366e98f96534d1d1bfde9412e1c1bb62..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/FirefighterMovementStrategy.class and /dev/null differ
diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index a754112236156144fdccdb51883328300f1874a3..a5b03701c2c8a06bca39cd1e8ee9afa216d058c6 100644
Binary files a/build/classes/java/main/model/ModelElement.class and b/build/classes/java/main/model/ModelElement.class differ
diff --git a/build/classes/java/main/model/NeighborManager.class b/build/classes/java/main/model/NeighborManager.class
deleted file mode 100644
index 7133104bbb463fd3f508b73accc7f98276064e7d..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/NeighborManager.class and /dev/null differ
diff --git a/build/classes/java/main/model/SimpleFireSpreadStrategy.class b/build/classes/java/main/model/SimpleFireSpreadStrategy.class
deleted file mode 100644
index 99f37d9599a845f4357686ac641025aef33c3430..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/SimpleFireSpreadStrategy.class and /dev/null differ
diff --git a/build/classes/java/main/model/SimpleFirefighterMovementStrategy.class b/build/classes/java/main/model/SimpleFirefighterMovementStrategy.class
deleted file mode 100644
index 34a2647bf859aa395a2e13fbc741a6e4e26a27f1..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/model/SimpleFirefighterMovementStrategy.class and /dev/null differ
diff --git a/build/classes/java/main/module-info.class b/build/classes/java/main/module-info.class
index 88bc26991b02427659843d54b36d2169ec1b6e75..0d23387b7d6d3e0b949e37105a02fac3cb15cbd6 100644
Binary files a/build/classes/java/main/module-info.class and b/build/classes/java/main/module-info.class differ
diff --git a/build/classes/java/main/util/Position.class b/build/classes/java/main/util/Position.class
deleted file mode 100644
index 7dbbd0104ae6dc1c44c869a30946c4ca30af8edf..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/util/Position.class and /dev/null differ
diff --git a/build/classes/java/main/util/TargetStrategy.class b/build/classes/java/main/util/TargetStrategy.class
deleted file mode 100644
index 29d1e02d75754f3461b19603c654e7b3c458f1cb..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/util/TargetStrategy.class and /dev/null differ
diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
deleted file mode 100644
index 621f52487062cf2afe1a5bf3435cf8b098e69dcc..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/view/FirefighterGrid.class and /dev/null differ
diff --git a/build/classes/java/main/view/Grid.class b/build/classes/java/main/view/Grid.class
deleted file mode 100644
index c4fa5e96b46909e2a89e512f2ad9c2d4d042260c..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/view/Grid.class and /dev/null differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
deleted file mode 100644
index 9e776bc14ee8cfc60beaf454877354f5567ee0ca..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/view/ViewElement.class and /dev/null differ
diff --git a/build/classes/java/test/model/FirefighterBoardTest.class b/build/classes/java/test/model/FirefighterBoardTest.class
index 700fb0a6e745978391eecb01f5d4ea423662260d..b8613853ab451c799c0f822b5798a026bfeef3e4 100644
Binary files a/build/classes/java/test/model/FirefighterBoardTest.class and b/build/classes/java/test/model/FirefighterBoardTest.class differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index a076ff2fe10d371efcb37f1bf51bb59b15becc60..0000000000000000000000000000000000000000
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/src/main/java/model/Initializer.java b/src/main/java/model/Initializer.java
index 38d44f464a6be37e5a98670c3e3565ce3429e601..130de09b11a1ea41c30d50a82f18eecc6c72f845 100644
--- a/src/main/java/model/Initializer.java
+++ b/src/main/java/model/Initializer.java
@@ -83,7 +83,8 @@ public class Initializer {
initializeMoutainsPositions();
initializeFireTruckPositions();
initializeRocksPositions();
-
+ initializeFirePositions();
+ initializeFirefighters();
}
private void initializeFirePositions() {
addRandomPositions(firePositions, initialFireCount);
diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java
index a9fcc623d6bf20f9e15781f2e22b79451b4c6be2..a853bfcaa42aed7568f6f0d74b4fda42b70d756d 100644
--- a/src/test/java/model/FirefighterBoardTest.java
+++ b/src/test/java/model/FirefighterBoardTest.java
@@ -35,5 +35,11 @@ public class FirefighterBoardTest {
board.setState(List.of(ModelElement.FIRE), position);
assertThat(board.getState(position)).containsExactly(ModelElement.FIRE);
}
+ @Test
+ void testReset(){
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0,0,0,0,0,0);
+ board.reset();
+ assertThat(board.stepNumber() == 0);
+ }
}
diff --git a/src/test/java/model/InitializerTest.java b/src/test/java/model/InitializerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..62f270b2494553a01c575d5bc6aa569615d7808b
--- /dev/null
+++ b/src/test/java/model/InitializerTest.java
@@ -0,0 +1,35 @@
+package model;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InitializerTest {
+ @Test
+ void testGetRowsCount(){
+ Initializer initializer = new Initializer(20, 10, 1, 3,10,5,3,3,3);
+ assertThat(initializer.getRowCount()).isEqualTo(10);
+ }
+ @Test
+ void testGetColumnCount(){
+ Initializer initializer = new Initializer(20, 10, 1, 3,10,5,3,3,3);
+ assertThat(initializer.getColumnCount()).isEqualTo(20);
+ }
+ @Test
+ void testGetInitialFireCount(){
+ Initializer initializer = new Initializer(20,10,10,10,10,10,10,10,10);
+ assertThat(initializer.getInitialFireCount() == 10);
+ }
+ @Test
+ void testGetInitialFirefighterCount(){
+ Initializer initializer = new Initializer(20,10,10,10,10,10,10,10,10);
+ assertThat(initializer.getInitialFirefighterCount() == 10);
+ }
+ @Test
+ void testGetStep(){
+ Initializer initializer = new Initializer(20,10,10,10,10,10,10,10,10);
+ assertThat(initializer.getStep() == 0);
+ }
+}