Added BlackBodySpectrum

Author: castarco

ColorSharp.sln

@@ -33,6 +33,6 @@ Global
 		$0.VersionControlPolicy = $2
 		$2.inheritsSet = Mono
 		description = A .Net/Mono library to handle color spaces (and light spectrums!)
-		version = 0.9.3
+		version = 0.10.0
 	EndGlobalSection
 EndGlobal

ColorSharp/ColorSharp.csproj

@@ -11,7 +11,7 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>colorsharp.snk</AssemblyOriginatorKeyFile>
-    <ReleaseVersion>0.9.3</ReleaseVersion>
+    <ReleaseVersion>0.10.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

ColorSharp/ColorSharp.nuspec

@@ -11,11 +11,12 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <releaseNotes>
- - Updated MathNet.Numerics dependency
- - Added HashCode to light spectrum objects
- - Minor performance tweaks
+- Added new Illuminants
+- Added new Matching Functions
+- Improved spectrum -> color conversion mechanism
+- Minor API breaks.
     </releaseNotes>
-    <copyright>Copyright 2014</copyright>
+    <copyright>Copyright 2014-2015</copyright>
     <tags>Light Color Colour CIEXYZ CIExyY sRGB</tags>
   </metadata>
 </package>

ColorSharp/Properties/AssemblyInfo.cs

@@ -46,7 +46,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("0.9.3.*")]
+[assembly: AssemblyVersion ("0.10.0.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

ColorSharp/src/LightSpectrums/BlackBodySpectrum.cs

@@ -78,23 +78,9 @@ public BlackBodySpectrum (double cct, double minWaveLength, double maxWaveLength
 			public override double EvaluateAt (double waveLength)
 			{
 				// 2*h*c² = 2 * 299792458 * 1.98644568e-25 = 1.1910428661813628e-16
-				double a = (
-					1.1910428661813628e-16 / (
-						Math.Pow(waveLength, 5) * (
-							Math.Exp(1.98644568e-25 / (waveLength * CCT * 1.3806488e-23)) - 1.0
-						)
-					)
-				);
-
-				double b = (
-					(3.7417749e-16 * Math.Pow(waveLength, -5.0) / Math.PI) * Math.Pow(
-						(Math.Exp(1.4388e-2 / (waveLength * CCT)) - 1), -1
-					)
-				);
-
-				Console.WriteLine (a + " <--> " + b);
-
-				return a;
+				return (1.1910428661813628e19 /*1.1910428661813628e-16*/ / (
+					Math.Pow(waveLength/* * 1e-7*/, 5.0) * (Math.Exp(0.014387769576158687 / (waveLength * CCT)) - 1.0)
+				));
 			}
 
 			public override double GetMaxValueOnSupport ()

ColorSharpTests/ColorSharpTests.csproj

@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Litipk.ColorSharpTests</RootNamespace>
     <AssemblyName>ColorSharpTests</AssemblyName>
-    <ReleaseVersion>0.9.3</ReleaseVersion>
+    <ReleaseVersion>0.10.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +40,7 @@
     <Compile Include="tests\Illuminants\D65Test.cs" />
     <Compile Include="tests\Illuminants\ATest.cs" />
     <Compile Include="tests\ColorSpaces\AColorTest.cs" />
+    <Compile Include="tests\LightSpectrums\BlackBodySpectrumTest.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

ColorSharpTests/tests/LightSpectrums/BlackBodySpectrumTest.cs

@@ -0,0 +1,46 @@
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2014 Andrés Correa Casablanca
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+* Contributors:
+*  - Andrés Correa Casablanca <castarco@gmail.com , castarco@litipk.com>
+*/
+
+
+using NUnit.Framework;
+using Litipk.ColorSharp.LightSpectrums;
+
+
+namespace Litipk.ColorSharpTests
+{
+	[TestFixture]
+	public class BlackBodySpectrumTest
+	{
+		[Test]
+		public void TestEvaluateAt()
+		{
+
+		}
+	}
+}
+