Skip to content
Snippets Groups Projects
Commit 5a4fff6e authored by CHAHINE Rami's avatar CHAHINE Rami
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gradle/8.10.2/executionHistory/executionHistory.lock
#	.gradle/8.10.2/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/main/java/model/FireManager.java
#	src/main/java/model/FirefighterManager.java
parents b437d8b9 2709f81d
No related branches found
No related tags found
No related merge requests found
No preview for this file type
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
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
Project member :
Project members :
member 1 : Mansour Chadi
......
......@@ -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) {
......
package util;
public record Position(int row, int column) {
public int getRow() {
return row;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment