From 6ab73222c2ca36acc8626d0bd58b16bd2586765b Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 20:56:54 +0100
Subject: [PATCH] Tache 4 (La methode nextColor(Cell cell) de la classe
DistinctColorGenerator).
---
.../main/java/model/DistinctColorGenerator.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/model/DistinctColorGenerator.java b/app/src/main/java/model/DistinctColorGenerator.java
index b580a3b..c8f60f9 100644
--- a/app/src/main/java/model/DistinctColorGenerator.java
+++ b/app/src/main/java/model/DistinctColorGenerator.java
@@ -15,6 +15,18 @@ public class DistinctColorGenerator implements ColorGenerator {
}
@Override
public Color nextColor(Cell cell) {
- return null;
+ List<Cell> neighbours = cell.getNeighbours();
+ for (Color color : this.colors) {
+ boolean cellNotUsed = true;
+ for (Cell newCell : neighbours) {
+ if (color==cell.getColor())
+ { cellNotUsed = false; }
+ }
+ if (cellNotUsed == true) {
+ return color;
+ }
+ }
+ return this.defaultColor;
}
}
+
--
GitLab