diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 356014674fb63d4fdcabb77d2a8a71be252803d0..60f04fb8ed0dbf47c0d6b2b724f22156ab0d42d7 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..9a511a813be5ebefe95f41960202ab7e488bf921 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..fc10cf49c3366adc3ff637427598ac9ff0c5c748 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..13f9e9815e8bb3d97985e796da0bdfd6435595c6 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..89e08843a3feb4c048d7fe4eed654ca8396e1573 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..f654f5f583e5ad45713c270e1cb7ee399ae5eebd 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..a2598dc370e909f84aaaf23ab32fc2c5bcec98e7 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
new file mode 100644
index 0000000000000000000000000000000000000000..7c671f6535833ab81a22e08adc523027457a7dcc
Binary files /dev/null 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..baeb228da53f85ea2c28489e1ffe6004e86806f4 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/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/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/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/distributions/firefighter-shadow.tar b/build/distributions/firefighter-shadow.tar
index a5c7784ec2465e0063d63410fe13538dd65eda6e..178357991f6f71188dc2c1ad2ba836026b096b40 100644
Binary files a/build/distributions/firefighter-shadow.tar and b/build/distributions/firefighter-shadow.tar differ
diff --git a/build/distributions/firefighter-shadow.zip b/build/distributions/firefighter-shadow.zip
index 0c1caf97cb1e82cb07f2de702cb277531e05b4b1..9b89b6be4b10237a2bada99e39129d9e188f8118 100644
Binary files a/build/distributions/firefighter-shadow.zip and b/build/distributions/firefighter-shadow.zip differ
diff --git a/build/distributions/firefighter.tar b/build/distributions/firefighter.tar
index cb82184ff5ea66324b8a972a3b10b5e605e3e053..88f694969b7e8c574cde69e664dda0f85a08c8b4 100644
Binary files a/build/distributions/firefighter.tar and b/build/distributions/firefighter.tar differ
diff --git a/build/distributions/firefighter.zip b/build/distributions/firefighter.zip
index 0884f890ea02c128b9a67be3865e20efba7031af..1e63bed2700b6223a700e6b6670602e0ac763de0 100644
Binary files a/build/distributions/firefighter.zip and b/build/distributions/firefighter.zip differ
diff --git a/build/libs/firefighter-all.jar b/build/libs/firefighter-all.jar
index 619374e47ddcafe0763e346a06e42f6272b0da1b..1d729f153e7c9738808aa5a02ee8aec812ac4b2e 100644
Binary files a/build/libs/firefighter-all.jar and b/build/libs/firefighter-all.jar differ
diff --git a/build/libs/firefighter.jar b/build/libs/firefighter.jar
index af06c4dfce194c8db370026c2252a79fff7393a4..86fdb21d8a7b6b948ae4975f5f6a3d508df54d95 100644
Binary files a/build/libs/firefighter.jar and b/build/libs/firefighter.jar differ
diff --git a/build/scripts/firefighter b/build/scripts/firefighter
index f14c33053ef5daa948cb848df0d5f2d8fe4204a1..2d0d80b9a9480c8c5de330291d4133ac325cc1ec 100755
--- a/build/scripts/firefighter
+++ b/build/scripts/firefighter
@@ -115,7 +115,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/lib/firefighter.jar:$APP_HOME/lib/javafx-fxml-21-linux.jar:$APP_HOME/lib/javafx-controls-21-linux.jar:$APP_HOME/lib/javafx-graphics-21-linux.jar:$APP_HOME/lib/javafx-base-21-linux.jar
+CLASSPATH=$APP_HOME/lib/firefighter.jar:$APP_HOME/lib/javafx-fxml-21-win.jar:$APP_HOME/lib/javafx-controls-21-win.jar:$APP_HOME/lib/javafx-graphics-21-win.jar:$APP_HOME/lib/javafx-base-21-win.jar
# Determine the Java command to use to start the JVM.
diff --git a/build/scripts/firefighter.bat b/build/scripts/firefighter.bat
index 8a549278323de8af8270f8c39555b9d64b6caed5..857694a25003015075bc2c5b0a8c46e60790987d 100644
--- a/build/scripts/firefighter.bat
+++ b/build/scripts/firefighter.bat
@@ -70,7 +70,7 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\lib\firefighter.jar;%APP_HOME%\lib\javafx-fxml-21-linux.jar;%APP_HOME%\lib\javafx-controls-21-linux.jar;%APP_HOME%\lib\javafx-graphics-21-linux.jar;%APP_HOME%\lib\javafx-base-21-linux.jar
+set CLASSPATH=%APP_HOME%\lib\firefighter.jar;%APP_HOME%\lib\javafx-fxml-21-win.jar;%APP_HOME%\lib\javafx-controls-21-win.jar;%APP_HOME%\lib\javafx-graphics-21-win.jar;%APP_HOME%\lib\javafx-base-21-win.jar
@rem Execute firefighter
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/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 8900e4bd34e6c066eeb8bce3f24a9e03c274bf0e..0519f42993fb1dda8cd20a0ea295b2c74c4499bc 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -17,12 +17,12 @@ public class SimulatorApplication extends javafx.application.Application {
private static final int COLUMN_COUNT = 20;
private static final int BOX_WIDTH = 30;
private static final int BOX_HEIGHT = 30;
- public static final int INITIAL_FIRE_COUNT = 5;
- public static final int INITIAL_FIREFIGHTER_COUNT = 4;
+ public static final int INITIAL_FIRE_COUNT = 4;
+ public static final int INITIAL_FIREFIGHTER_COUNT = 5;
public static final int INITIAL_ROAD_COUNT = 10;
public static final int INITIAL_CLOUD_COUNT = 3;
public static final int INITIAL_MOUTAIN_COUNT = 5;
- public static final int INITIAL_FIRE_TRUCK_COUNT = 2;
+ public static final int INITIAL_FIRE_TRUCK_COUNT = 3;
public static final int INITIAL_ROCKS_COUNT = 3;
private Stage primaryStage;
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);
+ }
+}