Merge branch 'dataset-standardisation' into 'main'

Standardise dataset collections

See merge request Wacton/Unicolour!97

Author: waacton

Unicolour.Datasets/ArtistPaint.cs

@@ -494,7 +494,7 @@ public static class ArtistPaint
         },
         K1, K2, nameof(TitaniumWhite));
 
-    public static IEnumerable<Pigment> All => new List<Pigment>
+    public static IEnumerable<Pigment> All => new[]
     {
         BismuthVanadateYellow, BoneBlack,
         CadmiumOrange, CadmiumRedLight, CeruleanBlueChromium, CobaltBlue,

Unicolour.Datasets/Cividis.cs

@@ -10,7 +10,7 @@ internal Cividis()
     public override Unicolour Map(double x) => InterpolateColourTable(Lookup, x);
     public override string ToString() => nameof(Cividis);
 
-    public static readonly Unicolour[] Lookup =
+    public static readonly IEnumerable<Unicolour> Lookup = new Unicolour[]
     {
         new(Config, ColourSpace.Rgb, 0, 0.138068, 0.311105),
         new(Config, ColourSpace.Rgb, 0, 0.141013, 0.317579),

Unicolour.Datasets/Colourmap.cs

@@ -50,9 +50,9 @@ public IEnumerable<Unicolour> Palette(int count)
         return palette;
     }
 
-    protected static Unicolour InterpolateColourTable(Unicolour[] colourTable, double x)
+    protected static Unicolour InterpolateColourTable(IEnumerable<Unicolour> colourTable, double x)
     {
-        var (lowerColour, upperColour, mixAmount) = Lut.Lookup(colourTable, x);
+        var (lowerColour, upperColour, mixAmount) = Lut.Lookup(colourTable.ToArray(), x);
         return lowerColour.Mix(upperColour, ColourSpace.Rgb, mixAmount);
     }
 }

Unicolour.Datasets/Crest.cs

@@ -10,7 +10,7 @@ internal Crest()
     public override Unicolour Map(double x) => InterpolateColourTable(Lookup, x);
     public override string ToString() => nameof(Crest);
 
-    public static readonly Unicolour[] Lookup = 
+    public static readonly IEnumerable<Unicolour> Lookup = new Unicolour[]
     {
         new(Config, ColourSpace.Rgb, 0.6468274, 0.80289262, 0.56592265),
         new(Config, ColourSpace.Rgb, 0.64233318, 0.80081141, 0.56639461),

Unicolour.Datasets/EbnerFairchild.cs

@@ -9,7 +9,7 @@ public static class EbnerFairchild
     public static readonly Unicolour White = new(Config, ColourSpace.Xyz, WhiteXyz.Tuple);
 
     public static readonly Unicolour Hue0Ref = new(Config, ColourSpace.Xyz, 0.4092, 0.2812, 0.3060);
-    public static readonly List<Unicolour> AllHue0 = new()
+    public static readonly IEnumerable<Unicolour> AllHue0 = new[]
     {
         Hue0Ref,
         new(Config, ColourSpace.Xyz, 0.024951, 0.019086, 0.020329),	
@@ -35,7 +35,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue24Ref = new(Config, ColourSpace.Xyz, 0.3953, 0.2812, 0.1845);
-    public static readonly List<Unicolour> AllHue24 = new()
+    public static readonly IEnumerable<Unicolour> AllHue24 = new[]
     {
         Hue24Ref,
         new(Config, ColourSpace.Xyz, 0.024364, 0.019086, 0.014688),	
@@ -61,7 +61,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue48Ref = new(Config, ColourSpace.Xyz, 0.3577, 0.2812, 0.1125);
-    public static readonly List<Unicolour> AllHue48 = new()
+    public static readonly IEnumerable<Unicolour> AllHue48 = new[]
     {
         Hue48Ref,
         new(Config, ColourSpace.Xyz, 0.036781, 0.029891, 0.014811),	
@@ -87,7 +87,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue72Ref = new(Config, ColourSpace.Xyz, 0.5151, 0.4828, 0.1778);
-    public static readonly List<Unicolour> AllHue72 = new()
+    public static readonly IEnumerable<Unicolour> AllHue72 = new[]
     {
         Hue72Ref,
         new(Config, ColourSpace.Xyz, 0.033197, 0.029891, 0.011480),	
@@ -113,7 +113,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue96Ref = new(Config, ColourSpace.Xyz, 0.5184, 0.5668, 0.2112);
-    public static readonly List<Unicolour> AllHue96 = new()
+    public static readonly IEnumerable<Unicolour> AllHue96 = new[]
     {
         Hue96Ref,
         new(Config, ColourSpace.Xyz, 0.028909, 0.029891, 0.010142),	
@@ -139,7 +139,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue120Ref = new(Config, ColourSpace.Xyz, 0.3765, 0.4828, 0.1994);
-    public static readonly List<Unicolour> AllHue120 = new()
+    public static readonly IEnumerable<Unicolour> AllHue120 = new[]
     {
         Hue120Ref,
         new(Config, ColourSpace.Xyz, 0.023295, 0.029891, 0.012151),	
@@ -165,7 +165,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue144Ref = new(Config, ColourSpace.Xyz, 0.2873, 0.4828, 0.2109);
-    public static readonly List<Unicolour> AllHue144 = new()
+    public static readonly IEnumerable<Unicolour> AllHue144 = new[]
     {
         Hue144Ref,
         new(Config, ColourSpace.Xyz, 0.020570, 0.029891, 0.016832),	
@@ -191,7 +191,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue168Ref = new(Config, ColourSpace.Xyz, 0.3076, 0.4828, 0.4277);
-    public static readonly List<Unicolour> AllHue168 = new()
+    public static readonly IEnumerable<Unicolour> AllHue168 = new[]
     {
         Hue168Ref,
         new(Config, ColourSpace.Xyz, 0.021080, 0.029891, 0.027904),	
@@ -217,7 +217,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue192Ref = new(Config, ColourSpace.Xyz, 0.3488, 0.4828, 0.6019);
-    public static readonly List<Unicolour> AllHue192 = new()
+    public static readonly IEnumerable<Unicolour> AllHue192 = new[]
     {
         Hue192Ref,
         new(Config, ColourSpace.Xyz, 0.023453, 0.029891, 0.037174),	
@@ -243,7 +243,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue216Ref = new(Config, ColourSpace.Xyz, 0.3787, 0.4828, 0.7231);
-    public static readonly List<Unicolour> AllHue216 = new()
+    public static readonly IEnumerable<Unicolour> AllHue216 = new[]
     {
         Hue216Ref,
         new(Config, ColourSpace.Xyz, 0.024666, 0.029891, 0.044851),	
@@ -269,7 +269,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue240Ref = new(Config, ColourSpace.Xyz, 0.3421, 0.4075, 0.7197);
-    public static readonly List<Unicolour> AllHue240 = new()
+    public static readonly IEnumerable<Unicolour> AllHue240 = new[]
     {
         Hue240Ref,
         new(Config, ColourSpace.Xyz, 0.026197, 0.029891, 0.049052),	
@@ -294,7 +294,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue264Ref = new(Config, ColourSpace.Xyz, 0.3149, 0.3405, 0.6623);
-    public static readonly List<Unicolour> AllHue264 = new()
+    public static readonly IEnumerable<Unicolour> AllHue264 = new[]
     {
         Hue264Ref,
         new(Config, ColourSpace.Xyz, 0.027982, 0.029891, 0.086685),	
@@ -320,7 +320,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue288Ref = new(Config, ColourSpace.Xyz, 0.2051, 0.1842, 0.5713);
-    public static readonly List<Unicolour> AllHue288 = new()
+    public static readonly IEnumerable<Unicolour> AllHue288 = new[]
     {
         Hue288Ref,
         new(Config, ColourSpace.Xyz, 0.030398, 0.029891, 0.061233),	
@@ -349,7 +349,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue312Ref = new(Config, ColourSpace.Xyz, 0.2765, 0.1842, 0.6201);
-    public static readonly List<Unicolour> AllHue312 = new()
+    public static readonly IEnumerable<Unicolour> AllHue312 = new[]
     {
         Hue312Ref,
         new(Config, ColourSpace.Xyz, 0.037048, 0.029891, 0.059648),	
@@ -379,7 +379,7 @@ public static class EbnerFairchild
     };
 
     public static readonly Unicolour Hue336Ref = new(Config, ColourSpace.Xyz, 0.4562, 0.2812, 0.5520);
-    public static readonly List<Unicolour> AllHue336 = new()
+    public static readonly IEnumerable<Unicolour> AllHue336 = new[]
     {
         Hue336Ref,
         new(Config, ColourSpace.Xyz, 0.059792, 0.029891, 0.067983),	

Unicolour.Datasets/Flare.cs

@@ -10,7 +10,7 @@ internal Flare()
     public override Unicolour Map(double x) => InterpolateColourTable(Lookup, x);
     public override string ToString() => nameof(Flare);
 
-    public static readonly Unicolour[] Lookup = 
+    public static readonly IEnumerable<Unicolour> Lookup = new Unicolour[]
     {
         new(Config, ColourSpace.Rgb, 0.92907237, 0.68878959, 0.50411509),
         new(Config, ColourSpace.Rgb, 0.92891402, 0.68494686, 0.50173994),

Unicolour.Datasets/HungBerns.cs

@@ -58,23 +58,23 @@ public static class HungBerns
     public static readonly Unicolour MagentaRed75 = new(Config, ColourSpace.Xyz, 0.5677, 0.3553, 0.5313);
     public static readonly Unicolour MagentaRedRef = new(Config, ColourSpace.Xyz, 0.6436, 0.3553, 0.5366);
 
-    public static readonly List<Unicolour> AllRed = new() { Red25, Red50, Red75, RedRef };
-    public static readonly List<Unicolour> AllRedYellow = new() { RedYellow25, RedYellow50, RedYellow75, RedYellowRef };
-    public static readonly List<Unicolour> AllYellow = new() { Yellow25, Yellow50, Yellow75, YellowRef };
-    public static readonly List<Unicolour> AllYellowGreen = new() { YellowGreen25, YellowGreen50, YellowGreen75, YellowGreenRef };
-    public static readonly List<Unicolour> AllGreen = new() { Green25, Green50, Green75, GreenRef };
-    public static readonly List<Unicolour> AllGreenCyan = new() { GreenCyan25, GreenCyan50, GreenCyan75, GreenCyanRef };
-    public static readonly List<Unicolour> AllCyan = new() { Cyan25, Cyan50, Cyan75, CyanRef };
-    public static readonly List<Unicolour> AllCyanBlue = new() { CyanBlue25, CyanBlue50, CyanBlue75, CyanBlueRef };
-    public static readonly List<Unicolour> AllBlue = new() { Blue25, Blue50, Blue75, BlueRef };
-    public static readonly List<Unicolour> AllBlueMagenta = new() { BlueMagenta25, BlueMagenta50, BlueMagenta75, BlueMagentaRef };
-    public static readonly List<Unicolour> AllMagenta = new() { Magenta25, Magenta50, Magenta75, MagentaRef };
-    public static readonly List<Unicolour> AllMagentaRed = new() { MagentaRed25, MagentaRed50, MagentaRed75, MagentaRedRef };
+    public static readonly IEnumerable<Unicolour> AllRed = new[] { Red25, Red50, Red75, RedRef };
+    public static readonly IEnumerable<Unicolour> AllRedYellow = new[] { RedYellow25, RedYellow50, RedYellow75, RedYellowRef };
+    public static readonly IEnumerable<Unicolour> AllYellow = new[] { Yellow25, Yellow50, Yellow75, YellowRef };
+    public static readonly IEnumerable<Unicolour> AllYellowGreen = new[] { YellowGreen25, YellowGreen50, YellowGreen75, YellowGreenRef };
+    public static readonly IEnumerable<Unicolour> AllGreen = new[] { Green25, Green50, Green75, GreenRef };
+    public static readonly IEnumerable<Unicolour> AllGreenCyan = new[] { GreenCyan25, GreenCyan50, GreenCyan75, GreenCyanRef };
+    public static readonly IEnumerable<Unicolour> AllCyan = new[] { Cyan25, Cyan50, Cyan75, CyanRef };
+    public static readonly IEnumerable<Unicolour> AllCyanBlue = new[] { CyanBlue25, CyanBlue50, CyanBlue75, CyanBlueRef };
+    public static readonly IEnumerable<Unicolour> AllBlue = new[] { Blue25, Blue50, Blue75, BlueRef };
+    public static readonly IEnumerable<Unicolour> AllBlueMagenta = new[] { BlueMagenta25, BlueMagenta50, BlueMagenta75, BlueMagentaRef };
+    public static readonly IEnumerable<Unicolour> AllMagenta = new[] { Magenta25, Magenta50, Magenta75, MagentaRef };
+    public static readonly IEnumerable<Unicolour> AllMagentaRed = new[] { MagentaRed25, MagentaRed50, MagentaRed75, MagentaRedRef };
 
-    public static readonly List<Unicolour> All25 = new() { Red25, RedYellow25, Yellow25, YellowGreen25, Green25, GreenCyan25, Cyan25, CyanBlue25, Blue25, BlueMagenta25, Magenta25, MagentaRed25 };
-    public static readonly List<Unicolour> All50 = new() { Red50, RedYellow50, Yellow50, YellowGreen50, Green50, GreenCyan50, Cyan50, CyanBlue50, Blue50, BlueMagenta50, Magenta50, MagentaRed50 };
-    public static readonly List<Unicolour> All75 = new() { Red75, RedYellow75, Yellow75, YellowGreen75, Green75, GreenCyan75, Cyan75, CyanBlue75, Blue75, BlueMagenta75, Magenta75, MagentaRed75 };
-    public static readonly List<Unicolour> AllRef = new() { RedRef, RedYellowRef, YellowRef, YellowGreenRef, GreenRef, GreenCyanRef, CyanRef, CyanBlueRef, BlueRef, BlueMagentaRef, MagentaRef, MagentaRedRef };
+    public static readonly IEnumerable<Unicolour> All25 = new[] { Red25, RedYellow25, Yellow25, YellowGreen25, Green25, GreenCyan25, Cyan25, CyanBlue25, Blue25, BlueMagenta25, Magenta25, MagentaRed25 };
+    public static readonly IEnumerable<Unicolour> All50 = new[] { Red50, RedYellow50, Yellow50, YellowGreen50, Green50, GreenCyan50, Cyan50, CyanBlue50, Blue50, BlueMagenta50, Magenta50, MagentaRed50 };
+    public static readonly IEnumerable<Unicolour> All75 = new[] { Red75, RedYellow75, Yellow75, YellowGreen75, Green75, GreenCyan75, Cyan75, CyanBlue75, Blue75, BlueMagenta75, Magenta75, MagentaRed75 };
+    public static readonly IEnumerable<Unicolour> AllRef = new[] { RedRef, RedYellowRef, YellowRef, YellowGreenRef, GreenRef, GreenCyanRef, CyanRef, CyanBlueRef, BlueRef, BlueMagentaRef, MagentaRef, MagentaRedRef };
 
     public static IEnumerable<Unicolour> All => new List<Unicolour>()
         .Concat(AllRed)

Unicolour.Datasets/Icefire.cs

@@ -10,7 +10,7 @@ internal Icefire()
     public override Unicolour Map(double x) => InterpolateColourTable(Lookup, x);
     public override string ToString() => nameof(Icefire);
 
-    public static readonly Unicolour[] Lookup = 
+    public static readonly IEnumerable<Unicolour> Lookup = new Unicolour[]
     {
         new(Config, ColourSpace.Rgb, 0.73936227, 0.90443867, 0.85757238),
         new(Config, ColourSpace.Rgb, 0.72888063, 0.89639109, 0.85488394),

Unicolour.Datasets/Inferno.cs

@@ -10,7 +10,7 @@ internal Inferno()
     public override Unicolour Map(double x) => InterpolateColourTable(Lookup, x);
     public override string ToString() => nameof(Inferno);
 
-    public static readonly Unicolour[] Lookup = 
+    public static readonly IEnumerable<Unicolour> Lookup = new Unicolour[]
     {
         new(Config, ColourSpace.Rgb, 0.001462, 0.000466, 0.013866),
         new(Config, ColourSpace.Rgb, 0.002267, 0.00127, 0.01857),

Unicolour.Datasets/MacAdam.cs

@@ -5,16 +5,16 @@ public static class MacAdam
 {
     private static readonly Configuration Config = new(RgbConfiguration.StandardRgb, XyzConfiguration.D65);
 
-    public static readonly Unicolour[] Limits10 = MacAdamLimits.Get(0.10).Select(chromaticity => new Unicolour(Config, chromaticity, 0.10)).ToArray();
-    public static readonly Unicolour[] Limits20 = MacAdamLimits.Get(0.20).Select(chromaticity => new Unicolour(Config, chromaticity, 0.20)).ToArray();
-    public static readonly Unicolour[] Limits30 = MacAdamLimits.Get(0.30).Select(chromaticity => new Unicolour(Config, chromaticity, 0.30)).ToArray();
-    public static readonly Unicolour[] Limits40 = MacAdamLimits.Get(0.40).Select(chromaticity => new Unicolour(Config, chromaticity, 0.40)).ToArray();
-    public static readonly Unicolour[] Limits50 = MacAdamLimits.Get(0.50).Select(chromaticity => new Unicolour(Config, chromaticity, 0.50)).ToArray();
-    public static readonly Unicolour[] Limits60 = MacAdamLimits.Get(0.60).Select(chromaticity => new Unicolour(Config, chromaticity, 0.60)).ToArray();
-    public static readonly Unicolour[] Limits70 = MacAdamLimits.Get(0.70).Select(chromaticity => new Unicolour(Config, chromaticity, 0.70)).ToArray();
-    public static readonly Unicolour[] Limits80 = MacAdamLimits.Get(0.80).Select(chromaticity => new Unicolour(Config, chromaticity, 0.80)).ToArray();
-    public static readonly Unicolour[] Limits90 = MacAdamLimits.Get(0.90).Select(chromaticity => new Unicolour(Config, chromaticity, 0.90)).ToArray();
-    public static readonly Unicolour[] Limits95 = MacAdamLimits.Get(0.95).Select(chromaticity => new Unicolour(Config, chromaticity, 0.95)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits10 = MacAdamLimits.Get(0.10).Select(chromaticity => new Unicolour(Config, chromaticity, 0.10)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits20 = MacAdamLimits.Get(0.20).Select(chromaticity => new Unicolour(Config, chromaticity, 0.20)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits30 = MacAdamLimits.Get(0.30).Select(chromaticity => new Unicolour(Config, chromaticity, 0.30)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits40 = MacAdamLimits.Get(0.40).Select(chromaticity => new Unicolour(Config, chromaticity, 0.40)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits50 = MacAdamLimits.Get(0.50).Select(chromaticity => new Unicolour(Config, chromaticity, 0.50)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits60 = MacAdamLimits.Get(0.60).Select(chromaticity => new Unicolour(Config, chromaticity, 0.60)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits70 = MacAdamLimits.Get(0.70).Select(chromaticity => new Unicolour(Config, chromaticity, 0.70)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits80 = MacAdamLimits.Get(0.80).Select(chromaticity => new Unicolour(Config, chromaticity, 0.80)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits90 = MacAdamLimits.Get(0.90).Select(chromaticity => new Unicolour(Config, chromaticity, 0.90)).ToArray();
+    public static readonly IEnumerable<Unicolour> Limits95 = MacAdamLimits.Get(0.95).Select(chromaticity => new Unicolour(Config, chromaticity, 0.95)).ToArray();
 
     public static IEnumerable<Unicolour> All => new List<Unicolour>()
         .Concat(Limits10)