1 files changed, 49 insertions, 22 deletions

diff --git a/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
index cbec7e86b..5541bc286 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/ColorLib_TST.cs
@@ -9,6 +9,8 @@ using Google.Protobuf;
 using Tango.PMR;
 using System.Collections.Generic;
 using Tango.BL;
+using System.IO;
+using System.Diagnostics;
 
 namespace Tango.UnitTesting
 {
@@ -37,45 +39,70 @@ namespace Tango.UnitTesting
             conversionInput.ThreadA = 2.2555;
             conversionInput.ThreadB = -10.9325;
 
-            using (ObservablesContext db = ObservablesContext.CreateDefault())
+            var cct = File.ReadAllBytes(@"D:\Development\Tango\Software\ColorData\CCT\test.cct");
+
+            conversionInput.ForwardData = ByteString.CopyFrom(cct);
+
+            conversionInput.InputCoordinates.InputLiquids.Add(new InputLiquid()
             {
-                var cct = db.Ccts.FirstOrDefault();
+                LiquidType = PMR.ColorLab.LiquidType.Cyan,
+                CalibrationData = GenerateCalibrationData(PMR.ColorLab.LiquidType.Cyan),
+                MaxNanoliterPerCentimeter = 200,
+            });
 
-                Assert.IsNotNull(cct);
+            conversionInput.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = PMR.ColorLab.LiquidType.Magenta,
+                CalibrationData = GenerateCalibrationData(PMR.ColorLab.LiquidType.Magenta),
+                MaxNanoliterPerCentimeter = 200,
+            });
 
-                conversionInput.ForwardData = ByteString.CopyFrom(cct.ForwardData);
-                conversionInput.InverseData = ByteString.CopyFrom(cct.InverseData);
+            conversionInput.InputCoordinates.InputLiquids.Add(new InputLiquid()
+            {
+                LiquidType = PMR.ColorLab.LiquidType.Yellow,
+                CalibrationData = GenerateCalibrationData(PMR.ColorLab.LiquidType.Yellow),
+                MaxNanoliterPerCentimeter = 200,
+            });
 
-                var machine = db.Machines.FirstOrDefault();
-                Assert.IsNotNull(machine);
+            //using (ObservablesContext db = ObservablesContext.CreateDefault())
+            //{
+            //    var cct = db.Ccts.FirstOrDefault();
 
-                var configuration = machine.Configuration;
-                var rml = db.Rmls.FirstOrDefault();
+            //    Assert.IsNotNull(cct);
 
-                Assert.IsNotNull(rml);
+            //    conversionInput.ForwardData = ByteString.CopyFrom(cct.ForwardData);
+            //    conversionInput.InverseData = ByteString.CopyFrom(cct.InverseData);
 
-                List<LiquidTypesRml> factors = configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == rml.Guid).ToList();
+            //    var machine = db.Machines.FirstOrDefault();
+            //    Assert.IsNotNull(machine);
 
-                foreach (var idsPack in configuration.IdsPacks.OrderBy(x => x.PackIndex))
-                {
-                    InputLiquid inputLiquid = new InputLiquid();
-                    inputLiquid.LiquidType = idsPack.LiquidType.ToColorLibLiquidType();
+            //    var configuration = machine.Configuration;
+            //    var rml = db.Rmls.FirstOrDefault();
 
-                    Assert.IsFalse(configuration.IdsPacks.IndexOf(idsPack) > factors.Count - 1);
+            //    Assert.IsNotNull(rml);
 
-                    inputLiquid.MaxNanoliterPerCentimeter = factors[configuration.IdsPacks.IndexOf(idsPack)].MaxNlPerCm;
+            //    List<LiquidTypesRml> factors = configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == rml.Guid).ToList();
 
-                    inputLiquid.CalibrationData = GenerateCalibrationData(inputLiquid.LiquidType);
+            //    foreach (var idsPack in configuration.IdsPacks.OrderBy(x => x.PackIndex))
+            //    {
+            //        InputLiquid inputLiquid = new InputLiquid();
+            //        inputLiquid.LiquidType = idsPack.LiquidType.ToColorLibLiquidType();
 
-                    conversionInput.InputCoordinates.InputLiquids.Add(inputLiquid);
-                }
-            }
+            //        Assert.IsFalse(configuration.IdsPacks.IndexOf(idsPack) > factors.Count - 1);
+
+            //        inputLiquid.MaxNanoliterPerCentimeter = factors[configuration.IdsPacks.IndexOf(idsPack)].MaxNlPerCm;
+
+            //        inputLiquid.CalibrationData = GenerateCalibrationData(inputLiquid.LiquidType);
+
+            //        conversionInput.InputCoordinates.InputLiquids.Add(inputLiquid);
+            //    }
+            //}
 
 
             NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(Convert);
             ConversionOutput output = nativePMR.Invoke(conversionInput);
 
-            Assert.IsTrue(output.SingleCoordinates.OutputLiquids.Count == conversionInput.InputCoordinates.InputLiquids.Count);
+            Debug.WriteLine(output);
         }
 
         [TestMethod]