From dabbc26ab638d6602d9b0a0e3d61d7f6e452f92d Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 21:23:36 +0100
Subject: [PATCH] =?UTF-8?q?Tache=204=20(Test=C3=A9=20+=20rectification).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/java/model/DistinctColorGenerator.java | 2 +-
app/src/main/java/model/UniformExceptOneGenerator.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/model/DistinctColorGenerator.java b/app/src/main/java/model/DistinctColorGenerator.java
index c8f60f9..792f3af 100644
--- a/app/src/main/java/model/DistinctColorGenerator.java
+++ b/app/src/main/java/model/DistinctColorGenerator.java
@@ -19,7 +19,7 @@ public class DistinctColorGenerator implements ColorGenerator {
for (Color color : this.colors) {
boolean cellNotUsed = true;
for (Cell newCell : neighbours) {
- if (color==cell.getColor())
+ if (color==newCell.getColor())
{ cellNotUsed = false; }
}
if (cellNotUsed == true) {
diff --git a/app/src/main/java/model/UniformExceptOneGenerator.java b/app/src/main/java/model/UniformExceptOneGenerator.java
index 336ded4..be38373 100644
--- a/app/src/main/java/model/UniformExceptOneGenerator.java
+++ b/app/src/main/java/model/UniformExceptOneGenerator.java
@@ -18,7 +18,7 @@ public class UniformExceptOneGenerator implements ColorGenerator{
public Color nextColor(Cell cell) {
counter++;
if(counter==2){
- return this.uniColor;
+ return this.excepColor;
}
- return this.excepColor; }
+ return this.uniColor; }
}
--
GitLab