renamed variables in interface, explicit interface implementation in JSONVehicleData

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -116,29 +116,31 @@ namespace TUGraz.VectoCommon.InputData
 		/// P052  
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		RetarderType RetarderType { get; }
+		RetarderType Type { get; }
 
 		/// <summary>
 		/// P053
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		double RetarderRatio { get; }
+		double Ratio { get; }
 
 		/// <summary>
 		/// P054
 		/// P057, P058
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable RetarderLossMap { get; }
+		DataTable LossMap { get; }
 	}
 
 	public interface IAngularGearInputData : IComponentInputData
 	{
-		AngularGearType AngularGearType { get; }
+		AngularGearType Type { get; }
+
+		double Ratio { get; }
 
-		double AngularGearRatio { get; }
+		DataTable LossMap { get; }
 
-		DataTable AngularGearLossMap { get; }
+		double Efficiency { get; }
 	}
 
 	public interface IAxleDeclarationInputData : IComponentInputData

VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IRetarderInputData
 
-		public virtual RetarderType RetarderType
+		RetarderType IRetarderInputData.Type
 		{
 			get
 			{
@@ -155,12 +155,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual double RetarderRatio
+		double IRetarderInputData.Ratio
 		{
 			get { return Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<double>(JsonKeys.Vehicle_Retarder_Ratio); }
 		}
 
-		public virtual DataTable RetarderLossMap
+		DataTable IRetarderInputData.LossMap
 		{
 			get
 			{
@@ -176,7 +176,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IAngularGearInputData
 
-		public AngularGearType AngularGearType
+		AngularGearType IAngularGearInputData.Type
 		{
 			get
 			{
@@ -186,12 +186,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public double AngularGearRatio
+		double IAngularGearInputData.Ratio
 		{
 			get { return Body.GetEx(JsonKeys.Vehicle_AngularGear).GetEx<double>(JsonKeys.Vehicle_AngularGear_Ratio); }
 		}
 
-		public DataTable AngularGearLossMap
+		DataTable IAngularGearInputData.LossMap
 		{
 			get
 			{
@@ -202,6 +202,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
+		double IAngularGearInputData.Efficiency
+		{
+			get { return Body.GetEx(JsonKeys.Vehicle_AngularGear).GetEx<double>(JsonKeys.Vehicle_AngularGear_Efficiency); }
+		}
+
 		#endregion
 
 		public string Vendor