From d082e98d8cc0cf23d5c80a36e50907a19843b76e Mon Sep 17 00:00:00 2001
From: arnaudlabourel <arnaud.labourel@univ-amu.fr>
Date: Fri, 27 Oct 2023 09:11:18 +0200
Subject: [PATCH] renaming returned variables in update functions
---
src/main/java/model/FirefighterBoard.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 3251952..97abb90 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -58,23 +58,23 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
public List<Position> updateToNextGeneration() {
- List<Position> result = updateFirefighters();
- result.addAll(updateFires());
+ List<Position> modifiedPositions = updateFirefighters();
+ modifiedPositions.addAll(updateFires());
step++;
- return result;
+ return modifiedPositions;
}
private List<Position> updateFires() {
- List<Position> result = new ArrayList<>();
+ List<Position> modifiedPositions = new ArrayList<>();
if (step % 2 == 0) {
List<Position> newFirePositions = new ArrayList<>();
for (Position fire : firePositions) {
newFirePositions.addAll(neighbors(fire));
}
firePositions.addAll(newFirePositions);
- result.addAll(newFirePositions);
+ modifiedPositions.addAll(newFirePositions);
}
- return result;
+ return modifiedPositions;
}
@@ -84,22 +84,22 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
private List<Position> updateFirefighters() {
- List<Position> result = new ArrayList<>();
+ List<Position> modifiedPosition = new ArrayList<>();
List<Position> firefighterNewPositions = new ArrayList<>();
for (Position firefighterPosition : firefighterPositions) {
Position newFirefighterPosition = neighborClosestToFire(firefighterPosition);
firefighterNewPositions.add(newFirefighterPosition);
extinguish(newFirefighterPosition);
- result.add(firefighterPosition);
- result.add(newFirefighterPosition);
+ modifiedPosition.add(firefighterPosition);
+ modifiedPosition.add(newFirefighterPosition);
List<Position> neighborFirePositions = neighbors(newFirefighterPosition).stream()
.filter(firePositions::contains).toList();
for(Position firePosition : neighborFirePositions)
extinguish(firePosition);
- result.addAll(neighborFirePositions);
+ modifiedPosition.addAll(neighborFirePositions);
}
firefighterPositions = firefighterNewPositions;
- return result;
+ return modifiedPosition;
}
@Override
--
GitLab