Heavy commit:

 * Added 1 nanometer-step CIE's XYZ matching functions
 * Added test to the spectrum -> CIE's XYZ color space conversion

Author: castarco

ColorSharp/ColorSharp.csproj

@@ -67,6 +67,9 @@
     <Compile Include="src\InternalUtils\Structs.cs" />
     <Compile Include="src\ColorSpaces\ColorConversionStrategy.cs" />
     <Compile Include="src\Illuminants\D65.cs" />
+    <Compile Include="src\MatchingFunctions\CIE1931XYZ1NmMatchingFunctionX.cs" />
+    <Compile Include="src\MatchingFunctions\CIE1931XYZ1NmMatchingFunctionY.cs" />
+    <Compile Include="src\MatchingFunctions\CIE1931XYZ51NmMatchingFunctionZ.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

ColorSharp/src/ColorSpaces/CIExyY.cs

@@ -47,10 +47,12 @@ public sealed class CIExyY : AConvertibleColor
 
 			#region static properties
 			// Light wavelengths coordinates in the CIE's 1931 xyY color sapce.
-			static xyYPoint[] Sharkfin;
+			static xyYPoint[] Sharkfin1Nm;
+			static xyYPoint[] Sharkfin5Nm;
 
 			// Sharkfin transformation with performance purposes.
-			static xyYPoint[] SortedSharkfin;
+			static xyYPoint[] SortedSharkfin1Nm;
+			static xyYPoint[] SortedSharkfin5Nm;
 			#endregion
 
 			#region readonly properties
@@ -80,10 +82,28 @@ public sealed class CIExyY : AConvertibleColor
 			 */
 			static CIExyY()
 			{
-				var mfX = CIE1931XYZ5NmMatchingFunctionX.Instance.Amplitudes;
-				var mfY = CIE1931XYZ5NmMatchingFunctionY.Instance.Amplitudes;
-				var mfZ = CIE1931XYZ5NmMatchingFunctionZ.Instance.Amplitudes;
+				computeSharkfin (
+					CIE1931XYZ5NmMatchingFunctionX.Instance.Amplitudes,
+					CIE1931XYZ5NmMatchingFunctionY.Instance.Amplitudes,
+					CIE1931XYZ5NmMatchingFunctionZ.Instance.Amplitudes,
+					ref Sharkfin5Nm,
+					ref SortedSharkfin5Nm
+				);
+
+				computeSharkfin (
+					CIE1931XYZ1NmMatchingFunctionX.Instance.Amplitudes,
+					CIE1931XYZ1NmMatchingFunctionY.Instance.Amplitudes,
+					CIE1931XYZ1NmMatchingFunctionZ.Instance.Amplitudes,
+					ref Sharkfin1Nm,
+					ref SortedSharkfin1Nm
+				);
+			}
 
+			/**
+			 * Computes the 'sharkin' points. 
+			 */
+			static void computeSharkfin(double[] mfX, double[] mfY, double[] mfZ, ref xyYPoint[] Sharkfin, ref xyYPoint[] SortedSharkfin)
+			{
 				var n = mfX.Length;
 
 				Sharkfin = new xyYPoint[n];
@@ -126,9 +146,9 @@ public override bool IsInsideColorSpace()
 				if (y > 1.0 - x || y < (x - 0.25) * 0.5 || y < 0.4 - x * 4 || y >= 0.85)
 					return false;
 
-				xyYPoint[] points = new xyYPoint[SortedSharkfin.Length + 1];
-				Array.Copy (SortedSharkfin, 0, points, 0, SortedSharkfin.Length);
-				points[SortedSharkfin.Length] = new xyYPoint{x=x, y=y};
+				xyYPoint[] points = new xyYPoint[SortedSharkfin5Nm.Length + 1];
+				Array.Copy (SortedSharkfin5Nm, 0, points, 0, SortedSharkfin5Nm.Length);
+				points[SortedSharkfin5Nm.Length] = new xyYPoint{x=x, y=y};
 
 				xyYPoint[] convexHull = findConvexHull (points);
 
@@ -159,7 +179,7 @@ public override CIExyY ToCIExyY (ConversionStrategy strategy = ConversionStrateg
 			/**
 			 * <inheritdoc />
 			 */
-			public override SRGB ToSRGB (ConversionStrategy strategy = ConversionStrategy.Default)
+			public override SRGB ToSRGB (ConversionStrategy strategy = ConversionStrategy.ForceLowTruncate|ConversionStrategy.ForceHighStretch)
 			{
 				return ToCIEXYZ ().ToSRGB (strategy);
 			}

ColorSharp/src/ColorSpaces/ColorConversionStrategy.cs

@@ -40,7 +40,6 @@ namespace ColorSpaces
 		[Flags]
 		public enum ConversionStrategy
 		{
-
 			WaveLength5NmStep = 0,
 			WaveLength1NmStep = 1,
 

ColorSharp/src/LightSpectrums/ALightSpectrum.cs

@@ -98,13 +98,21 @@ protected ALightSpectrum(AConvertibleColor dataSource=null) : base(dataSource) {
 			 */
 			public override CIEXYZ ToCIEXYZ (ConversionStrategy strategy=ConversionStrategy.Default)
 			{
-				// TODO : Check ConversionStrategy
-
-				AMatchingFunction[] MFs = {
-					CIE1931XYZ5NmMatchingFunctionX.Instance,
-					CIE1931XYZ5NmMatchingFunctionY.Instance,
-					CIE1931XYZ5NmMatchingFunctionZ.Instance
-				};
+				AMatchingFunction[] MFs;
+
+				if ((strategy & ConversionStrategy.WaveLength1NmStep) != 0) {
+					MFs = new AMatchingFunction[] {
+						CIE1931XYZ1NmMatchingFunctionX.Instance,
+						CIE1931XYZ1NmMatchingFunctionY.Instance,
+						CIE1931XYZ1NmMatchingFunctionZ.Instance
+					};
+				} else { // By default we choose 5 Nm
+					MFs = new AMatchingFunction[] {
+						CIE1931XYZ5NmMatchingFunctionX.Instance,
+						CIE1931XYZ5NmMatchingFunctionY.Instance,
+						CIE1931XYZ5NmMatchingFunctionZ.Instance
+					};
+				}
 
 				return new CIEXYZ (
 					MFs [0].DoConvolution (this), MFs [1].DoConvolution (this), MFs [2].DoConvolution (this), DataSource ?? this
@@ -122,7 +130,7 @@ public override CIExyY ToCIExyY (ConversionStrategy strategy = ConversionStrateg
 			/**
 			 * <inheritdoc />
 			 */
-			public override SRGB ToSRGB(ConversionStrategy strategy = ConversionStrategy.Default)
+			public override SRGB ToSRGB(ConversionStrategy strategy = ConversionStrategy.ForceLowTruncate|ConversionStrategy.ForceHighStretch)
 			{
 				return ToCIEXYZ ().ToSRGB (strategy);
 			}