move retarder ratio property to vehicle input provider

VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -120,6 +120,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return ReadTableData(Body.GetEx<string>("CdCorrFile"), "CrosswindCorrection File"); }
 		}
 
+		public virtual double RetarderRatio
+		{
+			get { return Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<double>(JsonKeys.Vehicle_Retarder_Ratio); }
+		}
+
 		#endregion
 
 		#region IRetarderInputData
@@ -140,10 +145,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual double Ratio
-		{
-			get { return Body.GetEx(JsonKeys.Vehicle_Retarder).GetEx<double>(JsonKeys.Vehicle_Retarder_Ratio); }
-		}
 
 		public virtual DataTable LossMap
 		{

VectoCore/InputData/InputData.cs

@@ -146,6 +146,12 @@ namespace TUGraz.VectoCore.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		DataTable CrosswindCorrectionMap { get; }
+
+		/// <summary>
+		/// P053
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double RetarderRatio { get; }
 	}
 
 	public interface IRetarderInputData : IComponentInputData
@@ -156,12 +162,6 @@ namespace TUGraz.VectoCore.InputData
 		/// </summary>
 		RetarderData.RetarderType Type { get; }
 
-		/// <summary>
-		/// P053
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double Ratio { get; }
-
 		/// <summary>
 		/// P054
 		/// P057, P058

VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs

@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal RetarderData SetCommonRetarderData(IRetarderInputData data)
+		internal RetarderData SetCommonRetarderData(IRetarderInputData data, IVehicleInputData vehicle)
 		{
 			var retarder = new RetarderData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			};
 			if (retarder.Type == RetarderData.RetarderType.Primary || retarder.Type == RetarderData.RetarderType.Secondary) {
 				retarder.LossMap = RetarderLossMap.Create(data.LossMap);
-				retarder.Ratio = data.Ratio;
+				retarder.Ratio = vehicle.RetarderRatio;
 			}
 			return retarder;
 		}

VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -247,9 +247,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			Log.Warn("{0} not in Declaration Mode!", inputData);
 		}
 
-		public RetarderData CreateRetarderData(IRetarderInputData retarder)
+		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
 		{
-			return SetCommonRetarderData(retarder);
+			return SetCommonRetarderData(retarder, vehicle);
 		}
 
 

VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs

@@ -197,9 +197,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 		}
 
 		//=================================
-		public RetarderData CreateRetarderData(IRetarderInputData retarder)
+		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
 		{
-			return SetCommonRetarderData(retarder);
+			return SetCommonRetarderData(retarder, vehicle);
 		}
 	}
 }
\ No newline at end of file

VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs

@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 
 			var gearboxData = dao.CreateGearboxData(InputDataProvider.GearboxInputData, engineData);
 			var axlegearData = dao.CreateAxleGearData(InputDataProvider.AxleGearInputData);
-			var retarderData = dao.CreateRetarderData(InputDataProvider.RetarderInputData);
+			var retarderData = dao.CreateRetarderData(InputDataProvider.RetarderInputData, InputDataProvider.VehicleInputData);
 
 			if (Report != null) {
 				var powertrainConfig = new VectoRunData() {

VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs

@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 				VehicleData = dao.CreateVehicleData(InputDataProvider.VehicleInputData),
 				DriverData = driver,
 				Aux = dao.CreateAuxiliaryData(InputDataProvider.AuxiliaryInputData()),
-				Retarder = dao.CreateRetarderData(InputDataProvider.RetarderInputData),
+				Retarder = dao.CreateRetarderData(InputDataProvider.RetarderInputData, InputDataProvider.VehicleInputData),
 				Cycle = DrivingCycleDataReader.ReadFromDataTable(cycle.CycleData, cycle.Name),
 				IsEngineOnly = InputDataProvider.JobInputData().EngineOnlyMode
 			});