diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..2608b80fe74892bfa218f0ca7cb206cf3b859641 Binary files /dev/null and b/build/tmp/compileTestJava/previous-compilation-data.bin differ diff --git a/src/main/java/model/FireManager.java b/src/main/java/model/FireManager.java index 4a02bef52c9579429886e5c5653dfcd60deb0450..2cdbe648076928554742623f63b18abf35eeb094 100644 --- a/src/main/java/model/FireManager.java +++ b/src/main/java/model/FireManager.java @@ -1,7 +1,11 @@ package model; -public class FireManager extends Manager{ +import util.Position; + +import java.util.Set; +public class FireManager extends Manager{ + private Set<Position> firePositions; public FireManager(FirefighterBoard board) { super(board,ModelElement.FIRE, new ModelElement[]{ModelElement.ROAD, ModelElement.MOUNTAIN}); } @@ -10,4 +14,8 @@ public class FireManager extends Manager{ public void update() { ; } + private void extinguish(Position position) { + firePositions.remove(position); + } + } diff --git a/src/main/java/model/FirefighterManager.java b/src/main/java/model/FirefighterManager.java index 1185c741a2aa219b73c8b636a1df253454f9427a..eef19de9fd3879ed591d16d6ad26206bd4a61c5a 100644 --- a/src/main/java/model/FirefighterManager.java +++ b/src/main/java/model/FirefighterManager.java @@ -8,11 +8,11 @@ import java.util.List; public abstract class FirefighterManager extends Manager { private List<Position> firefighterPositions; private int speed; + model.TargetStrategy targetStrategy; public FirefighterManager(FirefighterBoard board,ModelElement managed,ModelElement[] obstacle,int speed) { super(board,managed,obstacle); this.speed=speed; } - @Override public void update() { for(int i=0;i<speed;i++) { @@ -23,6 +23,7 @@ public abstract class FirefighterManager extends Manager { List<Position> modifiedPosition = new ArrayList<>(); List<Position> firefighterNewPositions = new ArrayList<>(); for (Position firefighterPosition : firefighterPositions) { + Position newFirefighterPosition = targetStrategy.neighborClosestToFire(firefighterPosition, firePositions, neighbors); diff --git a/src/main/java/model/Manager.java b/src/main/java/model/Manager.java index 3ec846d0de5a90fd49c32252cd0a5fa41b46cd46..fc0e0e940f092b44144912006114355bcee7de16 100644 --- a/src/main/java/model/Manager.java +++ b/src/main/java/model/Manager.java @@ -1,4 +1,6 @@ package model; +import util.Position; + import java.util.ArrayList; public abstract class Manager { @@ -11,6 +13,8 @@ public abstract class Manager { this.managed = managed; this.Obstacles = obstacle; } + public void initialize(){ + } public abstract void update(); }