refactoring/adding torqueconverter input data

VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs

@@ -69,7 +69,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	///		]
 	/// }
 	// ReSharper disable once InconsistentNaming
-	public class JSONGearboxDataV5 : JSONFile, IGearboxEngineeringInputData, IAxleGearInputData, ITorqueConverterInputData
+	public class JSONGearboxDataV5 : JSONFile, IGearboxEngineeringInputData, IAxleGearInputData,
+		ITorqueConverterEngineeringInputData
 	{
 		public JSONGearboxDataV5(JObject data, string filename) : base(data, filename) {}
 
@@ -205,7 +206,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return Body.GetEx<double>(JsonKeys.Gearbox_StartTorqueReserve) / 100.0; }
 		}
 
-		public virtual ITorqueConverterInputData TorqueConverter
+		public virtual ITorqueConverterEngineeringInputData TorqueConverter
 		{
 			get { return this; }
 		}
@@ -244,14 +245,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region ITorqueConverterInputData
 
-		public virtual bool Enabled
-		{
-			get
-			{
-				return false;
-				// TODO mk-2016-05-09: JSON ITorqueConverterInputData.Enabled always true --> as soon as TC is implemented, set to correct value!
-			}
-		}
+		// deprecated: AT transmission has to have a torque converter. 
+		//public virtual bool Enabled
+		//{
+		//	get
+		//	{
+		//		return false;
+		//		// TODO mk-2016-05-09: JSON ITorqueConverterInputData.Enabled always true --> as soon as TC is implemented, set to correct value!
+		//	}
+		//}
 
 		public virtual PerSecond ReferenceRPM
 		{
@@ -274,7 +276,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		KilogramSquareMeter ITorqueConverterInputData.Inertia
+		KilogramSquareMeter ITorqueConverterEngineeringInputData.Inertia
 		{
 			get
 			{

VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -111,6 +111,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	{
 		protected IGearboxEngineeringInputData Gearbox;
 		protected IAxleGearInputData AxleGear;
+		protected ITorqueConverterEngineeringInputData TorqueConverter;
 		public IAngularGearInputData AngularGear;
 		protected IEngineEngineeringInputData Engine;
 		protected IVehicleEngineeringInputData VehicleData;
@@ -128,6 +129,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 				}
 
 				AxleGear = Gearbox as IAxleGearInputData;
+				TorqueConverter = Gearbox as ITorqueConverterEngineeringInputData;
 
 				Engine = JSONInputDataFactory.ReadEngine(
 					Path.Combine(BasePath, Body.GetEx(JsonKeys.Vehicle_EngineFile).Value<string>()));
@@ -165,6 +167,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return GearboxInputData; }
 		}
 
+		ITorqueConverterDeclarationInputData IDeclarationInputDataProvider.TorqueConverterInputData
+		{
+			get { return TorqueConverterInputData; }
+		}
+
+		public ITorqueConverterEngineeringInputData TorqueConverterInputData
+		{
+			get
+			{
+				if (TorqueConverter == null) {
+					throw new InvalidFileFormatException("TorqueConverterData not found");
+				}
+				return TorqueConverter;
+			}
+		}
+
 		IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData()
 		{
 			return JobInputData();

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs

@@ -189,8 +189,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			retVal.StartSpeed = DeclarationData.Gearbox.StartSpeed;
 			retVal.StartAcceleration = DeclarationData.Gearbox.StartAcceleration;
 
-			retVal.HasTorqueConverter = false;
-
 			TransmissionLossMap gearLossMap;
 			retVal.Gears = gears.Select((gear, i) => {
 				try {

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

@@ -140,8 +140,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			retVal.StartSpeed = gearbox.StartSpeed;
 			retVal.StartAcceleration = gearbox.StartAcceleration;
 
-			retVal.HasTorqueConverter = gearbox.TorqueConverter.Enabled;
-
 			retVal.Gears = gears.Select((gear, i) => {
 				TransmissionLossMap lossMap;
 				if (gear.LossMap != null) {

VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs

@@ -92,13 +92,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 		[Required, SIRange(double.Epsilon, 2)]
 		public MeterPerSquareSecond StartAcceleration { get; internal set; }
 
-		/// <summary>
-		/// Gets a value indicating whether this instance has torque converter.
-		/// </summary>
-		/// <value>
-		/// <c>true</c> if this instance has torque converter; otherwise, <c>false</c>.
-		/// </value>
-		public bool HasTorqueConverter { get; internal set; }
+		///// <summary>
+		///// Gets a value indicating whether this instance has torque converter.
+		///// </summary>
+		///// <value>
+		///// <c>true</c> if this instance has torque converter; otherwise, <c>false</c>.
+		///// </value>
+		//public bool HasTorqueConverter { get; internal set; }
 
 		[Required, SIRange(0, double.MaxValue)]
 		public Second UpshiftAfterDownshiftDelay { get; internal set; }