X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FEye.java;h=bf83b8a0410ac43b17604fdae45f82f8935aa655;hb=b974e749af3a4b2df3737b2d361233c704dcc4d8;hp=a165830f8a1f3cb67354d4c3a97fe48951798c90;hpb=883508cad71557d375580ce52a4e093f131405db;p=Persons_Comparator.git diff --git a/src/Eye.java b/src/Eye.java index a165830..bf83b8a 100644 --- a/src/Eye.java +++ b/src/Eye.java @@ -36,7 +36,7 @@ public class Eye implements Comparable { this.color = Color.getColor(color); } else { - throw new IllegalArgumentException("Color must be " + colorsList); + throw new IllegalArgumentException("Color must be" + new Eye().toString()); } } @@ -62,8 +62,18 @@ public class Eye implements Comparable { 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 + //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(); } + + @Override + public String toString() { + StringBuilder stringBuilder = new StringBuilder(); + for (String c : colorsList) { + stringBuilder.append(" "); + stringBuilder.append(c); + } + return stringBuilder.toString(); + } }