From 701421fafb5fe552838c8dc42642d23053947f9d Mon Sep 17 00:00:00 2001
From: Hatim Saidi <hatim.saidi@etu.univ-amu.fr>
Date: Thu, 24 Nov 2022 21:42:16 +0100
Subject: [PATCH] test
---
.../java/util/DistinctColorGenerator.java | 30 +++++++++++++++++++
.../main/java/util/RandomColorGenerator.java | 24 +++++++++++++++
app/src/main/java/util/RandomUtil.java | 4 +--
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 app/src/main/java/util/DistinctColorGenerator.java
create mode 100644 app/src/main/java/util/RandomColorGenerator.java
diff --git a/app/src/main/java/util/DistinctColorGenerator.java b/app/src/main/java/util/DistinctColorGenerator.java
new file mode 100644
index 0000000..3f00c7c
--- /dev/null
+++ b/app/src/main/java/util/DistinctColorGenerator.java
@@ -0,0 +1,30 @@
+package util;
+
+import javafx.scene.paint.Color;
+import model.Cell;
+import model.ColorGenerator;
+
+import java.util.List;
+
+public class DistinctColorGenerator implements ColorGenerator {
+ private List<Color> colors;
+ private Color defaultcolor;
+
+ public DistinctColorGenerator(List<Color>colors,Color defaultcolor){
+ this.colors = colors;
+ this.defaultcolor = defaultcolor;
+ }
+
+ @Override
+ public Color nextColor(Cell cell) {
+ for(int i = 0;i< colors.size()-1;i++){
+ for (int j= 0;j<cell.getNeighbours().size()-1;j++){
+ if(colors.get(i)!= cell.getNeighbours().get(j).getColor()){
+ return colors.get(i);
+ }
+ }
+ }
+
+ return defaultcolor;
+ }
+}
diff --git a/app/src/main/java/util/RandomColorGenerator.java b/app/src/main/java/util/RandomColorGenerator.java
new file mode 100644
index 0000000..1865fdf
--- /dev/null
+++ b/app/src/main/java/util/RandomColorGenerator.java
@@ -0,0 +1,24 @@
+package util;
+
+import model.Cell;
+import model.ColorGenerator;
+import javafx.scene.paint.Color;
+import java.util.List;
+import java.util.Random;
+
+public class RandomColorGenerator implements ColorGenerator {
+ private List<Color> colors;
+ private Random randomGenerator;
+
+
+ public RandomColorGenerator(List<Color> colors, Random randomGenerator){
+ this.colors = colors;
+ this.randomGenerator =randomGenerator;
+ }
+
+ @Override
+ public Color nextColor(Cell cell) {
+ return colors.get(randomGenerator.nextInt(colors.size()));
+ }
+
+}
diff --git a/app/src/main/java/util/RandomUtil.java b/app/src/main/java/util/RandomUtil.java
index 8bd2ec4..abbbef7 100644
--- a/app/src/main/java/util/RandomUtil.java
+++ b/app/src/main/java/util/RandomUtil.java
@@ -12,10 +12,10 @@ public class RandomUtil {
}
public static <T> T randomElement(T[] elements, Random random){
- return elements[random.nextInt(elements.length-1)];
+ return elements[random.nextInt(elements.length)];
}
public static <T> T randomElement(List<T> elements, Random random){
- return elements.get(random.nextInt(elements.size()-1));
+ return elements.get(random.nextInt(elements.size()));
}
}
--
GitLab