Merge pull request #237 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:develop to develop

* commit '0fdb1f1d':
  read WHTCEngineering correction factor

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

@@ -212,6 +212,11 @@ namespace TUGraz.VectoCommon.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		KilogramSquareMeter Inertia { get; }
+
+		/// <summary>
+		/// P170
+		/// </summary>
+		double WHTCEngineering { get; }
 	}
 
 	public interface IAuxiliariesEngineeringInputData

VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs

@@ -96,6 +96,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return Body.GetEx<double>(JsonKeys.Engine_Inertia).SI<KilogramSquareMeter>(); }
 		}
 
+		public virtual double WHTCEngineering
+		{
+			get { return 1; }
+		}
+
 		public virtual double WHTCMotorway
 		{
 			get { return Body.GetEx<double>(JsonKeys.Engine_WHTC_Motorway); }

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs

@@ -113,6 +113,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			retVal.Inertia = engine.Inertia;
 			retVal.FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve);
 			retVal.FullLoadCurve.EngineData = retVal;
+			retVal.WHTCCorrectionFactor = engine.WHTCEngineering;
 			return retVal;
 		}
 

VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs

@@ -53,5 +53,6 @@ namespace TUGraz.VectoCore.Tests.Utils
 		public DataTable FuelConsumptionMap { get; set; }
 		public DataTable FullLoadCurve { get; set; }
 		public KilogramSquareMeter Inertia { get; set; }
+		public double WHTCEngineering { get; set; }
 	}
 }
\ No newline at end of file