Lookup's: Moved NormalizeTable up to constructor

VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs

@@ -52,9 +52,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			Data.Clear();
-			NormalizeTable(table);
-
 			foreach (DataRow row in table.Rows) {
 				var name = row.Field<string>("technology");
 				foreach (DataColumn col in table.Columns) {
@@ -88,9 +85,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 			protected override void ParseData(DataTable table)
 			{
-				Data.Clear();
-				NormalizeTable(table);
-
 				foreach (DataRow row in table.Rows) {
 					var name = row.Field<string>("technology");
 					foreach (DataColumn col in table.Columns) {

VectoCore/VectoCore/Models/Declaration/Fan.cs

@@ -50,9 +50,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			Data.Clear();
-			NormalizeTable(table);
-
 			foreach (DataRow row in table.Rows) {
 				var name = row.Field<string>("technology");
 				foreach (DataColumn col in table.Columns) {

VectoCore/VectoCore/Models/Declaration/HVAC.cs

@@ -50,9 +50,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			Data.Clear();
-			NormalizeTable(table);
-
 			foreach (DataRow row in table.Rows) {
 				var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvclass"));
 				foreach (DataColumn col in table.Columns) {

VectoCore/VectoCore/Models/Declaration/LookupData.cs

@@ -41,17 +41,19 @@ namespace TUGraz.VectoCore.Models.Declaration
 {
 	public abstract class LookupData : LoggingObject
 	{
-		protected LookupData()
-		{
-			if (!string.IsNullOrWhiteSpace(ResourceId))
-				ParseData(ReadCsvResource(ResourceId));
-		}
-
 		protected abstract string ResourceId { get; }
 		protected abstract string ErrorMessage { get; }
-
 		protected abstract void ParseData(DataTable table);
 
+		protected LookupData()
+		{
+			if (!string.IsNullOrWhiteSpace(ResourceId)) {
+				var table = ReadCsvResource(ResourceId);
+				NormalizeTable(table);
+				ParseData(table);
+			}
+		}
+
 		protected static DataTable ReadCsvResource(string resourceId)
 		{
 			return VectoCSVFile.ReadStream(RessourceHelper.ReadStream(resourceId));

VectoCore/VectoCore/Models/Declaration/Payloads.cs

@@ -81,8 +81,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			NormalizeTable(table);
-
 			Data = table.Rows.Cast<DataRow>()
 				.ToDictionary(
 					kv => kv.ParseDouble("grossvehicleweight").SI<Kilogram>(),

VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs

@@ -50,9 +50,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			Data.Clear();
-			NormalizeTable(table);
-
 			foreach (DataRow row in table.Rows) {
 				var technology = row.Field<string>("technology");
 				foreach (DataColumn col in table.Columns) {

VectoCore/VectoCore/Models/Declaration/Segments.cs

@@ -61,7 +61,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			NormalizeTable(table);
 			_segmentTable = table.Copy();
 		}
 

VectoCore/VectoCore/Models/Declaration/StandardBodies.cs

@@ -79,7 +79,8 @@ namespace TUGraz.VectoCore.Models.Declaration
 	/// </summary>
 	public sealed class StandardBodies : LookupData<string, StandardBody>
 	{
-		public static StandardBody Empty = new StandardBody("", 0.SI<Kilogram>(), 0.SI<Kilogram>(), 0.SI<SquareMeter>(), null);
+		public static readonly StandardBody Empty = new StandardBody("", 0.SI<Kilogram>(), 0.SI<Kilogram>(),
+			0.SI<SquareMeter>(), null);
 
 		protected override string ResourceId
 		{
@@ -98,8 +99,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 		protected override void ParseData(DataTable table)
 		{
-			NormalizeTable(table);
-
 			Data = table.Rows.Cast<DataRow>().Select(k => new StandardBody(
 				k.Field<string>("name"),
 				k.ParseDoubleOrGetDefault("curbmass").SI<Kilogram>(),

VectoCore/VectoCore/Models/Declaration/SteeringPump.cs

@@ -84,9 +84,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 			protected override void ParseData(DataTable table)
 			{
-				NormalizeTable(table);
-				Data.Clear();
-
 				foreach (DataRow row in table.Rows) {
 					var hdvClass = VehicleClassHelper.Parse(row.Field<string>("hdvclass"));
 					foreach (DataColumn col in table.Columns) {
@@ -115,9 +112,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 			protected override void ParseData(DataTable table)
 			{
-				NormalizeTable(table);
-				Data.Clear();
-
 				Data = table.Rows.Cast<DataRow>().ToDictionary(
 					key => key.Field<string>("Technology"),
 					value => new SteeringPumpValues<double>(value.ParseDouble("UF"), value.ParseDouble("B"), value.ParseDouble("S")));
@@ -160,9 +154,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 			protected override void ParseData(DataTable table)
 			{
-				NormalizeTable(table);
-				Data.Clear();
-
 				foreach (DataRow row in table.Rows) {
 					var axleNumber = int.Parse(row.Field<string>("steeredaxles"));
 					foreach (DataColumn col in table.Columns) {

VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs

@@ -61,9 +61,6 @@ namespace TUGraz.VectoCore.Models.Declaration
 
 			protected override void ParseData(DataTable table)
 			{
-				NormalizeTable(table);
-				Data.Clear();
-
 				foreach (MissionType mission in Enum.GetValues(typeof(MissionType))) {
 					var values = table.Columns[mission.ToString().ToLower()].Values<string>().ToDouble().ToArray();
 					Data[mission] = new Entry { Urban = values[0], Rural = values[1], Motorway = values[2] };