From 98c6136c8e2dd49a2549a77374136a8f0659eb3d Mon Sep 17 00:00:00 2001
From: Yanis O <oualanyanis01@gmail.com>
Date: Wed, 13 Nov 2024 13:48:55 +0100
Subject: [PATCH] [Ajout] Interface Scenario
---
src/main/java/model/EntityScenario.java | 14 ++++++++++++++
src/main/java/model/FireFighterScenario.java | 8 ++------
src/main/java/model/Scenario.java | 7 +++++++
3 files changed, 23 insertions(+), 6 deletions(-)
create mode 100644 src/main/java/model/EntityScenario.java
create mode 100644 src/main/java/model/Scenario.java
diff --git a/src/main/java/model/EntityScenario.java b/src/main/java/model/EntityScenario.java
new file mode 100644
index 0000000..094862a
--- /dev/null
+++ b/src/main/java/model/EntityScenario.java
@@ -0,0 +1,14 @@
+package model;
+
+import util.Matrix;
+import util.Position;
+
+public abstract class EntityScenario implements Scenario{
+ public void initScenario(Matrix<Entity> matrix){
+ for(int x = 0; x < matrix.getRows(); x++){
+ for(int y = 0; y < matrix.getColumns(); y++){
+ matrix.set(x,y, new EmptySquare(new Position(x, y)));
+ }
+ }
+ }
+}
diff --git a/src/main/java/model/FireFighterScenario.java b/src/main/java/model/FireFighterScenario.java
index ac42555..a01a9dd 100644
--- a/src/main/java/model/FireFighterScenario.java
+++ b/src/main/java/model/FireFighterScenario.java
@@ -7,17 +7,13 @@ import util.Matrix;
import util.Position;
-public class FireFighterScenario implements Board<Entity>{
+public class FireFighterScenario extends EntityScenario implements Board<Entity>{
private Matrix<Entity> matrix;
private int step;
public FireFighterScenario(int columns, int rows, int initialFireCount, int initialFireFightersCount){
this.matrix = new Matrix<Entity>(columns, rows);
- for(int x = 0; x < matrix.getRows(); x++){
- for(int y = 0; y < matrix.getColumns(); y++){
- matrix.set(x,y, new EmptySquare(new Position(x, y)));
- }
- }
+
this.step = 0;
}
public Entity getState(Position position){
diff --git a/src/main/java/model/Scenario.java b/src/main/java/model/Scenario.java
new file mode 100644
index 0000000..f4dfc48
--- /dev/null
+++ b/src/main/java/model/Scenario.java
@@ -0,0 +1,7 @@
+package model;
+
+import util.Matrix;
+
+public interface Scenario {
+ public void initScenario(Matrix<Entity> matrix);
+}
--
GitLab