X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FEye.java;h=7d5d80401879470faa13c37560b705f4d1fedd63;hb=6977e6142a133673703769e092e6283dda73cf4f;hp=abbbfb70fabbc21f35cd3aca57a2d5f7397326f8;hpb=1c1189337121a1baa74961813e619c99b398a333;p=Persons_Comparator.git

diff --git a/src/Eye.java b/src/Eye.java
index abbbfb7..7d5d804 100644
--- a/src/Eye.java
+++ b/src/Eye.java
@@ -1,9 +1,10 @@
 import java.awt.Color;
 import java.util.List;
+import java.util.Arrays;
 
 public class Eye implements Comparable<Eye> {
     private Color color;
-    private List<Color> colorList;
+    private List<String> colorList = Arrays.asList("black", "green", "blue", "brown");
 
     Eye(String color) {
         setColor(color);
@@ -14,11 +15,28 @@ public class Eye implements Comparable<Eye> {
     }
 
     public void setColor(String color) {
-        this.color = Color.getColor(color);
+        if (validateColor(color)) {
+            if (color.equals("brown"))
+                this.color = new Color(88, 41, 0);
+            else
+                this.color = Color.getColor(color);
+
+        } else {
+            throw new IllegalArgumentException("Color must be " + colorList.toString());
+        }
+    }
+
+    private boolean validateColor(String color) {
+        return colorList.contains(color);
     }
 
     @Override
     public int compareTo(Eye eye) {
-        return 0;
+        double r_diff = this.getColor().getRed() - eye.getColor().getRed();
+        double g_diff = this.getColor().getGreen() - eye.getColor().getGreen();
+        double b_diff = this.getColor().getBlue() - eye.getColor().getBlue();
+        // See https://en.wikipedia.org/wiki/Color_difference
+        Double distance = Math.sqrt(2 * Math.pow(r_diff, 2) + 4 * Math.pow(g_diff, 2) + 3 * Math.pow(b_diff, 2));
+        return distance.intValue();
     }
 }