Skip to content
Snippets Groups Projects
Commit 2b08df44 authored by BELHACHEMI Mehdi's avatar BELHACHEMI Mehdi
Browse files

improving code

parent 6fb5b806
No related branches found
No related tags found
No related merge requests found
......@@ -43,9 +43,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public void initializeElements() {
obstacles.clear();
extinguishers.clear();
fires.clear();
for(ModelElement modelElement : ModelElement.values()){
for(int elementCount = 0; elementCount< modelElement.getInitialNumber();elementCount++){
Position position = randomPosition();
......@@ -94,7 +91,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public List<Position> updateToNextGeneration() {
Fire fire = new Fire(randomPosition());
Fire fire = new Fire(null);
List<Position> modifiedPositions = new ArrayList<>();
for(Extinguisher element : extinguishers.values()){
......@@ -124,6 +121,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
@Override
public void reset() {
step = 0;
obstacles.clear();
extinguishers.clear();
fires.clear();
initializeElements();
}
......
......@@ -25,12 +25,12 @@ public abstract class Extinguisher implements model.Elements.element {
public void setPosition(Position position) {
this.position = position;
}
public ModelElement getElement(){
return this.element;
}
public void extinguish(Board board, Position position) {
if (board.getFires().containsKey(position)) {
board.getFires().remove(position);
......
......@@ -15,12 +15,14 @@ import util.Position;
public enum ModelElement {
FIREFIGHTER(5),
FIRE(20),
FIRE(25),
CLOUD(10),
ROAD(5),
MOUNTAIN(5),
ROCAILLE(3),
MOTORIZEDFIREFIGHTER(5);
MOTORIZEDFIREFIGHTER(3);
private final int initialNumber;
......@@ -34,7 +36,6 @@ public enum ModelElement {
}
public element getModelElementClass(Position position){
return switch (this){
case FIRE -> new Fire(position);
case ROAD -> new Road(position);
......
......@@ -6,7 +6,7 @@ public enum ViewElement {
FIREFIGHTER(Color.BLUE),
FIRE(Color.RED),
CLOUD(Color.LIGHTSKYBLUE),
ROAD(Color.GRAY),
ROAD(Color.BLACK),
MOUNTAIN(Color.BROWN),
ROCAILLE(Color.GREEN),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment