diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d03f4645480ef42a4a935d004a2a6567ab21e501..267adf260927eb5a89b797caca8536fd39ec8438 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Project Repports/Rapport3.md b/Project Repports/Rapport3.md index 0920fdd2454d9dde3064a3ad5d8a5d658925b292..82d410533f742a16b276ce5a38d2d202f046bfcc 100644 --- a/Project Repports/Rapport3.md +++ b/Project Repports/Rapport3.md @@ -1,2 +1,8 @@ Nous avions finis d'implementer le firefighterBoard mais nous avons constater des erreurs lors de l'execution -nous allons maintenant travailler pour fixer ces erruers \ No newline at end of file +nous allons maintenant travailler pour fixer ces erruers + +Nous avons Modifier les classes Manager afin de fixer les erreurs qui parvenait lors de l'éxécution du programme +cependant il faudrait ajuster encore le code comme les firefighters sont entrain de mourir ce qui ne dervrais +pas ce passer. + +Avant la prochaine seance nous allons corriger le code en sorte que ça fonctionne correctement \ No newline at end of file diff --git a/README.md b/README.md index b527db6c91c2f3ec9bd7164f25265387a1dba3fb..07b93ef8ffbfe4519227ec5b3281aa47c05b88d9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Project member : +Project members : member 1 : Mansour Chadi diff --git a/src/main/java/model/SimpleFirefighterMovementStrategy.java b/src/main/java/model/SimpleFirefighterMovementStrategy.java index 8257204d68738111737056180309f5632b67fe23..a8f59ec2a646f3cb564eed761865d002c847a492 100644 --- a/src/main/java/model/SimpleFirefighterMovementStrategy.java +++ b/src/main/java/model/SimpleFirefighterMovementStrategy.java @@ -18,7 +18,7 @@ public class SimpleFirefighterMovementStrategy implements FirefighterMovementStr } } - return closestFire != null ? closestFire : current; + return closestFire != null && !closestFire.equals(current) ? closestFire : current; } private int calculateDistance(Position a, Position b) { diff --git a/src/main/java/util/Position.java b/src/main/java/util/Position.java index 8a0d2b66724d1516a82912d4a2d55f37533578fc..02378270620c981a9be8e314becc93703e738407 100644 --- a/src/main/java/util/Position.java +++ b/src/main/java/util/Position.java @@ -1,6 +1,8 @@ package util; public record Position(int row, int column) { + + public int getRow() { return row; }