implemented fan aux in declaration mode

VectoCore/Models/Declaration/DeclarationData.cs

@@ -9,51 +9,41 @@ namespace TUGraz.VectoCore.Models.Declaration
 	public class DeclarationData
 	{
 		private static DeclarationData _instance;
-		private readonly DeclarationSegments _segments;
-		private readonly DeclarationRims _rims;
-		private readonly DeclarationWheels _wheels;
-		private readonly DeclarationPT1 _pt1;
-		private readonly ElectricSystem _electricSystem;
-		private readonly DeclarationFan _fan;
+		private DeclarationSegments _segments;
+		private DeclarationRims _rims;
+		private DeclarationWheels _wheels;
+		private DeclarationPT1 _pt1;
+		private ElectricSystem _electricSystem;
+		private DeclarationFan _fan;
 
 		public static DeclarationWheels Wheels
 		{
-			get { return Instance()._wheels; }
+			get { return Instance()._wheels ?? (Instance()._wheels = new DeclarationWheels()); }
 		}
 
 		public static DeclarationRims Rims
 		{
-			get { return Instance()._rims; }
+			get { return Instance()._rims ?? (Instance()._rims = new DeclarationRims()); }
 		}
 
 		public static DeclarationSegments Segments
 		{
-			get { return Instance()._segments; }
+			get { return Instance()._segments ?? (Instance()._segments = new DeclarationSegments()); }
 		}
 
 		public static DeclarationPT1 PT1
 		{
-			get { return Instance()._pt1; }
+			get { return Instance()._pt1 ?? (Instance()._pt1 = new DeclarationPT1()); }
 		}
 
 		public static ElectricSystem ElectricSystem
 		{
-			get { return Instance()._electricSystem; }
+			get { return Instance()._electricSystem ?? (Instance()._electricSystem = new ElectricSystem()); }
 		}
 
 		public static DeclarationFan Fan
 		{
-			get { return Instance()._fan; }
-		}
-
-		private DeclarationData()
-		{
-			_wheels = new DeclarationWheels();
-			_rims = new DeclarationRims();
-			_segments = new DeclarationSegments();
-			_pt1 = new DeclarationPT1();
-			_electricSystem = new ElectricSystem();
-			_fan = new DeclarationFan();
+			get { return Instance()._fan ?? (Instance()._fan = new DeclarationFan()); }
 		}
 
 		private static DeclarationData Instance()
@@ -67,9 +57,11 @@ namespace TUGraz.VectoCore.Models.Declaration
 		private readonly Dictionary<Tuple<MissionType, string>, Watt> _data =
 			new Dictionary<Tuple<MissionType, string>, Watt>();
 
+		private const string DefaultTechnology = "Crankshaft mounted - Electronically controlled visco clutch (Default)";
+
 		protected override string ResourceId
 		{
-			get { return "TUGraz.VectoCore.Resources.Declaration.Fan-Tech.csv"; }
+			get { return "TUGraz.VectoCore.Resources.Declaration.VAUX.Fan-Tech.csv"; }
 		}
 
 		protected override void ParseData(DataTable table)
@@ -87,6 +79,9 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		public override Watt Lookup(MissionType mission, string technology)
 		{
+			if (string.IsNullOrWhiteSpace(technology.Trim())) {
+				technology = DefaultTechnology;
+			}
 			return _data[Tuple.Create(mission, technology)];
 		}
 	}

VectoCoreTest/Models/DeclarationDataTest.cs

 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -188,8 +187,6 @@ namespace TUGraz.VectoCore.Tests.Models
 					Assert.AreEqual(expect.Value[i], value.Double(), Tolerance);
 				}
 			}
-
-			Assert.Inconclusive();
 		}
 
 		[TestMethod]