Merge pull request #120 in VECTO/vecto-sim from...

Merge pull request #120 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-198-split-inputdataprovider-interfaces to develop

* commit '4131eee3':
  renaming file
  moving engineering input data interfaces to a separate file
  split driver data into engineering and declaration, separate engineerign and declaration input data provider (top level)
  adapt aux data container
  adapt factories
  adapt DataObjectAdapters
  adapt json input provider
  split input data interfaces into declaration data and engineering data

VectoCore/InputData/InputData.cs → VectoCore/InputData/DeclarationInputData.cs

@@ -37,23 +37,11 @@ using TUGraz.VectoCore.Utils;
 
 namespace TUGraz.VectoCore.InputData
 {
-	public interface IJobInputData
+	public interface IDeclarationJobInputData
 	{
 		bool SavedInDeclarationMode { get; }
 
-		IVehicleInputData Vehicle { get; }
-
-		/// <summary>
-		/// P008  Cycles
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		IList<ICycleData> Cycles { get; }
-
-		/// <summary>
-		/// P001
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		bool EngineOnlyMode { get; }
+		IVehicleDeclarationInputData Vehicle { get; }
 
 		string JobName { get; }
 	}
@@ -77,7 +65,7 @@ namespace TUGraz.VectoCore.InputData
 		IntegrityStatus IntegrityStatus { get; }
 	}
 
-	public interface IVehicleInputData : IComponentInputData
+	public interface IVehicleDeclarationInputData : IComponentInputData
 	{
 		/// <summary>
 		/// P036
@@ -86,16 +74,16 @@ namespace TUGraz.VectoCore.InputData
 		VehicleCategory VehicleCategory { get; }
 
 		/// <summary>
-		/// P038  Curb Weight Vehicle
+		/// P037  
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		Kilogram CurbWeight { get; }
+		AxleConfiguration AxleConfiguration { get; }
 
 		/// <summary>
-		/// P039  Curb Weight Extra Trailer/Body
+		/// P038  Curb Weight Vehicle
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		Kilogram CurbWeightExtra { get; }
+		Kilogram CurbWeightChassis { get; }
 
 		/// <summary>
 		/// P041  Max. vehicle weight
@@ -103,18 +91,6 @@ namespace TUGraz.VectoCore.InputData
 		/// </summary>
 		Kilogram GrossVehicleMassRating { get; }
 
-		/// <summary>
-		/// P040  Loading
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Kilogram Loading { get; }
-
-		/// <summary>
-		/// P049
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Meter DynamicTyreRadius { get; }
-
 		/// <summary>
 		/// P146  DragCoefficient * Cross Section Area - Truck & Trailer
 		/// cf. VECTO Input Parameters.xlsx
@@ -134,31 +110,13 @@ namespace TUGraz.VectoCore.InputData
 		/// </summary>
 		string Rim { get; }
 
-		/// <summary>
-		/// P037  
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		AxleConfiguration AxleConfiguration { get; }
 
 		/// <summary>
 		/// parameters for every axle
 		/// P044, P045, P046, P047, P048, P108
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		IList<IAxleInputData> Axles { get; }
-
-		/// <summary>
-		/// P050
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		CrossWindCorrectionMode CrossWindCorrectionMode { get; }
-
-		/// <summary>
-		/// P051
-		/// P055, P056
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		DataTable CrosswindCorrectionMap { get; }
+		IList<IAxleDeclarationInputData> Axles { get; }
 
 		/// <summary>
 		/// P053
@@ -167,6 +125,7 @@ namespace TUGraz.VectoCore.InputData
 		double RetarderRatio { get; }
 	}
 
+
 	public interface IRetarderInputData : IComponentInputData
 	{
 		/// <summary>
@@ -183,7 +142,7 @@ namespace TUGraz.VectoCore.InputData
 		DataTable LossMap { get; }
 	}
 
-	public interface IAxleInputData : IComponentInputData
+	public interface IAxleDeclarationInputData : IComponentInputData
 	{
 		/// <summary>
 		/// P108  
@@ -210,22 +169,9 @@ namespace TUGraz.VectoCore.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		Newton TyreTestLoad { get; }
-
-		/// <summary>
-		/// P044 (0 - 1)
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double AxleWeightShare { get; }
-
-		/// <summary>
-		/// P048
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		KilogramSquareMeter Inertia { get; }
 	}
 
-
-	public interface IGearboxInputData : IComponentInputData
+	public interface IGearboxDeclarationInputData : IComponentInputData
 	{
 		/// <summary>
 		/// P076
@@ -233,72 +179,11 @@ namespace TUGraz.VectoCore.InputData
 		/// </summary>
 		GearboxType Type { get; }
 
-		/// <summary>
-		/// P080
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		KilogramSquareMeter Inertia { get; }
-
-		/// <summary>
-		/// P081
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Second TractionInterruption { get; }
-
 		/// <summary>
 		/// P078, P079, P077, P082, P145 (for every gear)
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		IList<ITransmissionInputData> Gears { get; }
-
-		/// <summary>
-		/// P084
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		bool SkipGears { get; }
-
-		/// <summary>
-		/// P086
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Second ShiftTime { get; }
-
-		/// <summary>
-		/// P083
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		bool EarlyShiftUp { get; }
-
-		/// <summary>
-		/// P085
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double TorqueReserve { get; }
-
-		/// <summary>
-		/// P087
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond StartSpeed { get; }
-
-		/// <summary>
-		/// P088
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSquareSecond StartAcceleration { get; }
-
-		/// <summary>
-		/// P089
-		/// [%] (0-1)
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double StartTorqueReserve { get; }
-
-		/// <summary>
-		/// P090, P091, P092, P127
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		ITorqueConverterInputData TorqueConverter { get; }
 	}
 
 	public interface ITransmissionInputData
@@ -382,7 +267,7 @@ namespace TUGraz.VectoCore.InputData
 		DataTable TCData { get; }
 	}
 
-	public interface IEngineInputData : IComponentInputData
+	public interface IEngineDeclarationInputData : IComponentInputData
 	{
 		/// <summary>
 		/// P061
@@ -397,52 +282,47 @@ namespace TUGraz.VectoCore.InputData
 		PerSecond IdleSpeed { get; }
 
 		/// <summary>
-		/// P067
-		/// P072, P073, P074
-		/// cf. VECTO Input Parameters.xlsx
-		/// engine speed in rpm, torque in NM, fuel consumption in g/h
-		/// </summary>
-		DataTable FuelConsumptionMap { get; }
-
-		/// <summary>
-		/// P144
-		/// P068, P069, P70, P71
+		/// P111
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable FullLoadCurve { get; }
+		KilogramPerWattSecond WHTCMotorway { get; }
 
 		/// <summary>
-		/// P062
+		/// P110
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		KilogramSquareMeter Inertia { get; }
+		KilogramPerWattSecond WHTCRural { get; }
 
 		/// <summary>
-		/// P111
+		/// P109
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		KilogramPerWattSecond WHTCMotorway { get; }
+		KilogramPerWattSecond WHTCUrban { get; }
 
 		/// <summary>
-		/// P110
+		/// P067
+		/// P072, P073, P074
 		/// cf. VECTO Input Parameters.xlsx
+		/// engine speed in rpm, torque in NM, fuel consumption in g/h
 		/// </summary>
-		KilogramPerWattSecond WHTCRural { get; }
+		DataTable FuelConsumptionMap { get; }
 
 		/// <summary>
-		/// P109
+		/// P144
+		/// P068, P069, P70, P71
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		KilogramPerWattSecond WHTCUrban { get; }
+		DataTable FullLoadCurve { get; }
 	}
 
-	public interface IAuxiliariesInputData
+	public interface IAuxiliariesDeclarationInputData
 	{
 		bool SavedInDeclarationMode { get; }
 
-		IList<IAuxiliaryInputData> Auxiliaries { get; }
+		IList<IAuxiliaryDeclarationInputData> Auxiliaries { get; }
 	}
 
+
 	public interface ICycleData
 	{
 		string Name { get; }
@@ -454,97 +334,39 @@ namespace TUGraz.VectoCore.InputData
 		DataTable CycleData { get; }
 	}
 
-	public interface IDriverInputData
+	public interface IDriverDeclarationInputData
 	{
 		bool SavedInDeclarationMode { get; }
 
-		IStartStopInputData StartStop { get; }
-		ILookaheadCoastingInputData Lookahead { get; }
-		IOverSpeedEcoRollInputData OverSpeedEcoRoll { get; }
+		IStartStopDeclarationInputData StartStop { get; }
 
-		/// <summary>
-		/// P009; P033, P034, P035
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		DataTable AccelerationCurve { get; }
+		IOverSpeedEcoRollDeclarationInputData OverSpeedEcoRoll { get; }
 	}
 
-	public interface IOverSpeedEcoRollInputData
+
+	public interface IOverSpeedEcoRollDeclarationInputData
 	{
 		/// <summary>
 		/// P015
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		DriverData.DriverMode Mode { get; }
-
-		/// <summary>
-		/// P016
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond MinSpeed { get; }
-
-		/// <summary>
-		/// P017
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond OverSpeed { get; }
-
-		/// <summary>
-		/// P018
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond UnderSpeed { get; }
 	}
 
-	public interface ILookaheadCoastingInputData
-	{
-		/// <summary>
-		/// P019
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		bool Enabled { get; }
 
-		/// <summary>
-		/// P020
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSquareSecond Deceleration { get; }
-
-		/// <summary>
-		/// P021
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond MinSpeed { get; }
-	}
 
-	public interface IStartStopInputData
+	public interface IStartStopDeclarationInputData
 	{
 		/// <summary>
 		/// P010  StartStop - enabled
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		bool Enabled { get; }
+	}
 
-		/// <summary>
-		/// P011  StartStop - Max speed
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		MeterPerSecond MaxSpeed { get; }
 
-		/// <summary>
-		/// P012  StartStop - Min ICE-ON Time
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Second MinTime { get; }
 
-		/// <summary>
-		/// P013  StartStop - Activation Delay
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		Second Delay { get; }
-	}
-
-	public interface IAuxiliaryInputData
+	public interface IAuxiliaryDeclarationInputData
 	{
 		bool SavedInDeclarationMode { get; }
 
@@ -571,29 +393,6 @@ namespace TUGraz.VectoCore.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		IList<string> TechList { get; }
-
-		/// <summary>
-		/// P022  Aux-InputFile: transmission ratio
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double TransmissionRatio { get; }
-
-		/// <summary>
-		/// P023  Aux-InputFile: efficiency to engine
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double EfficiencyToEngine { get; }
-
-		/// <summary>
-		/// P024  Aux-InputFile: efficiency to supply
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		double EfficiencyToSupply { get; }
-
-		/// <summary>
-		/// P025, P026, P027  Aux-InputFile: map
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		DataTable DemandMap { get; }
 	}
+
 }
\ No newline at end of file

VectoCore/InputData/EngineeringInputData.cs

+using System.Collections.Generic;
+using System.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData
+{
+	public interface IEngineeringJobInputData : IDeclarationJobInputData
+	{
+		new IVehicleEngineeringInputData Vehicle { get; }
+
+		/// <summary>
+		/// P008  Cycles
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		IList<ICycleData> Cycles { get; }
+
+		/// <summary>
+		/// P001
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		bool EngineOnlyMode { get; }
+	}
+
+	public interface IVehicleEngineeringInputData : IVehicleDeclarationInputData
+	{
+		/// <summary>
+		/// P039  Curb Weight Extra Trailer/Body
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Kilogram CurbWeightExtra { get; }
+
+		/// <summary>
+		/// P040  Loading
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Kilogram Loading { get; }
+
+		/// <summary>
+		/// parameters for every axle
+		/// P044, P045, P046, P047, P048, P108
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		new IList<IAxleEngineeringInputData> Axles { get; }
+
+		/// <summary>
+		/// P049
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Meter DynamicTyreRadius { get; }
+
+		/// <summary>
+		/// P050
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		CrossWindCorrectionMode CrossWindCorrectionMode { get; }
+
+		/// <summary>
+		/// P051
+		/// P055, P056
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		DataTable CrosswindCorrectionMap { get; }
+	}
+
+
+	public interface IAxleEngineeringInputData : IAxleDeclarationInputData
+	{
+		/// <summary>
+		/// P044 (0 - 1)
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double AxleWeightShare { get; }
+
+		/// <summary>
+		/// P048
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		KilogramSquareMeter Inertia { get; }
+	}
+
+
+	public interface IGearboxEngineeringInputData : IGearboxDeclarationInputData
+	{
+		/// <summary>
+		/// P080
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		KilogramSquareMeter Inertia { get; }
+
+		/// <summary>
+		/// P081
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Second TractionInterruption { get; }
+
+		/// <summary>
+		/// P086
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Second ShiftTime { get; }
+
+		/// <summary>
+		/// P083
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		bool EarlyShiftUp { get; }
+
+		/// <summary>
+		/// P085
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double TorqueReserve { get; }
+
+		/// <summary>
+		/// P087
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond StartSpeed { get; }
+
+		/// <summary>
+		/// P088
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSquareSecond StartAcceleration { get; }
+
+		/// <summary>
+		/// P089
+		/// [%] (0-1)
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double StartTorqueReserve { get; }
+
+		/// <summary>
+		/// P084
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		bool SkipGears { get; }
+
+
+		/// <summary>
+		/// P090, P091, P092, P127
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		ITorqueConverterInputData TorqueConverter { get; }
+	}
+
+	public interface IEngineEngineeringInputData : IEngineDeclarationInputData
+	{
+		/// <summary>
+		/// P062
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		KilogramSquareMeter Inertia { get; }
+	}
+
+
+	public interface IAuxiliariesEngineeringInputData : IAuxiliariesDeclarationInputData
+	{
+		new IList<IAuxiliaryEngineeringInputData> Auxiliaries { get; }
+	}
+
+
+	public interface IDriverEngineeringInputData : IDriverDeclarationInputData
+	{
+		new IStartStopEngineeringInputData StartStop { get; }
+
+		new IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll { get; }
+
+		/// <summary>
+		/// P009; P033, P034, P035
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		DataTable AccelerationCurve { get; }
+
+		ILookaheadCoastingInputData Lookahead { get; }
+	}
+
+
+	public interface IOverSpeedEcoRollEngineeringInputData : IOverSpeedEcoRollDeclarationInputData
+	{
+		/// <summary>
+		/// P016
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond MinSpeed { get; }
+
+		/// <summary>
+		/// P017
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond OverSpeed { get; }
+
+		/// <summary>
+		/// P018
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond UnderSpeed { get; }
+	}
+
+	public interface IStartStopEngineeringInputData : IStartStopDeclarationInputData
+	{
+		/// <summary>
+		/// P011  StartStop - Max speed
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond MaxSpeed { get; }
+
+		/// <summary>
+		/// P012  StartStop - Min ICE-ON Time
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Second MinTime { get; }
+
+		/// <summary>
+		/// P013  StartStop - Activation Delay
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		Second Delay { get; }
+	}
+
+
+	public interface ILookaheadCoastingInputData
+	{
+		/// <summary>
+		/// P019
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		bool Enabled { get; }
+
+		/// <summary>
+		/// P020
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSquareSecond Deceleration { get; }
+
+		/// <summary>
+		/// P021
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		MeterPerSecond MinSpeed { get; }
+	}
+
+	public interface IAuxiliaryEngineeringInputData : IAuxiliaryDeclarationInputData
+	{
+		/// <summary>
+		/// P022  Aux-InputFile: transmission ratio
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double TransmissionRatio { get; }
+
+		/// <summary>
+		/// P023  Aux-InputFile: efficiency to engine
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double EfficiencyToEngine { get; }
+
+		/// <summary>
+		/// P024  Aux-InputFile: efficiency to supply
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		double EfficiencyToSupply { get; }
+
+		/// <summary>
+		/// P025, P026, P027  Aux-InputFile: map
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		DataTable DemandMap { get; }
+	}
+}
\ No newline at end of file

VectoCore/InputData/FileIO/JSON/JSONEngineData.cs

@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	///  }
 	/// }
 	/// </code>
-	public class JSONEngineDataV3 : JSONFile, IEngineInputData
+	public class JSONEngineDataV3 : JSONFile, IEngineEngineeringInputData
 	{
 		public JSONEngineDataV3(JObject data, string fileName) : base(data, fileName) {}
 

VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs

@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	///		...
 	///		]
 	/// }
-	public class JSONGearboxDataV5 : JSONFile, IGearboxInputData, IAxleGearInputData, ITorqueConverterInputData
+	public class JSONGearboxDataV5 : JSONFile, IGearboxEngineeringInputData, IAxleGearInputData, ITorqueConverterInputData
 	{
 		public JSONGearboxDataV5(JObject data, string filename) : base(data, filename) {}
 

VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -186,15 +186,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	///   }
 	/// }
 	/// </code>
-	public class JSONInputDataV2 : JSONFile, IInputDataProvider, IJobInputData, IDriverInputData, IAuxiliariesInputData
+	public class JSONInputDataV2 : JSONFile, IEngineeringInputDataProvider, IDeclarationInputDataProvider,
+		IEngineeringJobInputData, IDriverEngineeringInputData, IAuxiliariesEngineeringInputData
 	{
-		protected IGearboxInputData Gearbox;
+		protected IGearboxEngineeringInputData Gearbox;
 
 		protected IAxleGearInputData AxleGear;
 
-		protected IEngineInputData Engine;
+		protected IEngineEngineeringInputData Engine;
 
-		protected IVehicleInputData VehicleData;
+		protected IVehicleEngineeringInputData VehicleData;
 
 		protected IRetarderInputData Retarder;
 
@@ -242,12 +243,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IInputDataProvider
 
-		public virtual IJobInputData JobInputData()
+		public virtual IEngineeringJobInputData JobInputData()
 		{
 			return this;
 		}
 
-		public virtual IVehicleInputData VehicleInputData
+		IVehicleDeclarationInputData IDeclarationInputDataProvider.VehicleInputData
+		{
+			get { return VehicleInputData; }
+		}
+
+		IGearboxDeclarationInputData IDeclarationInputDataProvider.GearboxInputData
+		{
+			get { return GearboxInputData; }
+		}
+
+		IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData()
+		{
+			return JobInputData();
+		}
+
+		public virtual IVehicleEngineeringInputData VehicleInputData
 		{
 			get
 			{
@@ -258,7 +274,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IGearboxInputData GearboxInputData
+		public virtual IGearboxEngineeringInputData GearboxInputData
 		{
 			get
 			{
@@ -280,7 +296,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IEngineInputData EngineInputData
+		IEngineDeclarationInputData IDeclarationInputDataProvider.EngineInputData
+		{
+			get { return EngineInputData; }
+		}
+
+		public virtual IEngineEngineeringInputData EngineInputData
 		{
 			get
 			{
@@ -291,11 +312,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IAuxiliariesInputData AuxiliaryInputData()
+		public virtual IAuxiliariesEngineeringInputData AuxiliaryInputData()
 		{
 			return this;
 		}
 
+		IDriverEngineeringInputData IEngineeringInputDataProvider.DriverInputData
+		{
+			get { return this; }
+		}
+
+		IAuxiliariesDeclarationInputData IDeclarationInputDataProvider.AuxiliaryInputData()
+		{
+			return AuxiliaryInputData();
+		}
+
 		public virtual IRetarderInputData RetarderInputData
 		{
 			get
@@ -307,7 +338,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IDriverInputData DriverInputData
+		public virtual IDriverDeclarationInputData DriverInputData
 		{
 			get { return this; }
 		}
@@ -316,7 +347,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region IJobInputData
 
-		public virtual IVehicleInputData Vehicle
+		public virtual IVehicleEngineeringInputData Vehicle
 		{
 			get { return VehicleData; }
 		}
@@ -356,6 +387,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return Body.GetEx(JsonKeys.Job_EngineOnlyMode).Value<bool>(); }
 		}
 
+		IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle
+		{
+			get { return Vehicle; }
+		}
+
 		public virtual string JobName
 		{
 			get { return _jobname; }
@@ -365,7 +401,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#region DriverInputData
 
-		public virtual IStartStopInputData StartStop
+		public virtual IStartStopEngineeringInputData StartStop
 		{
 			get
 			{
@@ -379,6 +415,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
+		IOverSpeedEcoRollDeclarationInputData IDriverDeclarationInputData.OverSpeedEcoRoll
+		{
+			get
+			{
+				var overspeed = Body.GetEx(JsonKeys.DriverData_OverspeedEcoRoll);
+				return new OverSpeedEcoRollInputData() {
+					Mode = DriverData.ParseDriverMode(overspeed.GetEx<string>(JsonKeys.DriverData_OverspeedEcoRoll_Mode))
+				};
+			}
+		}
+
 		public virtual ILookaheadCoastingInputData Lookahead
 		{
 			get
@@ -392,7 +439,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IOverSpeedEcoRollInputData OverSpeedEcoRoll
+		IStartStopDeclarationInputData IDriverDeclarationInputData.StartStop
+		{
+			get { return StartStop; }
+		}
+
+		public virtual IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll
 		{
 			get
 			{
@@ -433,11 +485,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#endregion
 
-		public virtual IList<IAuxiliaryInputData> Auxiliaries
+		public virtual IList<IAuxiliaryEngineeringInputData> Auxiliaries
 		{
-			get
+			get { return AuxData().Cast<IAuxiliaryEngineeringInputData>().ToList(); }
+		}
+
+		IList<IAuxiliaryDeclarationInputData> IAuxiliariesDeclarationInputData.Auxiliaries
 		{
-				var retVal = new List<IAuxiliaryInputData>();
+			get { return AuxData().Cast<IAuxiliaryDeclarationInputData>().ToList(); }
+		}
+
+		private IList<AuxiliaryDataInputData> AuxData()
+		{
+			var retVal = new List<AuxiliaryDataInputData>();
 			foreach (var aux in Body["Aux"] ?? Enumerable.Empty<JToken>()) {
 				var auxData = new AuxiliaryDataInputData {
 					ID = aux.GetEx<string>("ID"),
@@ -463,4 +523,3 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		}
 	}
 }
\ No newline at end of file
-}
\ No newline at end of file

VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs

@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public static IVehicleInputData ReadJsonVehicle(string filename)
+		public static IVehicleEngineeringInputData ReadJsonVehicle(string filename)
 		{
 			var json = ReadFile(filename);
 			var version = ReadVersion(json);
@@ -72,7 +72,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public static IGearboxInputData ReadGearbox(string filename)
+		public static IGearboxEngineeringInputData ReadGearbox(string filename)
 		{
 			var json = ReadFile(filename);
 			var version = ReadVersion(json);
@@ -84,7 +84,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public static IEngineInputData ReadEngine(string filename)
+		public static IEngineEngineeringInputData ReadEngine(string filename)
 		{
 			var json = ReadFile(filename);
 			var version = ReadVersion(json);

VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs

@@ -41,7 +41,7 @@ using TUGraz.VectoCore.Utils;
 
 namespace TUGraz.VectoCore.InputData.FileIO.JSON
 {
-	public class JSONVehicleDataV7 : JSONFile, IVehicleInputData, IRetarderInputData
+	public class JSONVehicleDataV7 : JSONFile, IVehicleEngineeringInputData, IRetarderInputData
 	{
 		public JSONVehicleDataV7(JObject data, string fileName) : base(data, fileName) {}
 
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual Kilogram CurbWeight
+		public virtual Kilogram CurbWeightChassis
 		{
 			get { return Body.GetEx<double>(JsonKeys.Vehicle_CurbWeight).SI<Kilogram>(); }
 		}
@@ -111,9 +111,17 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public virtual IList<IAxleInputData> Axles
+		public virtual IList<IAxleEngineeringInputData> Axles
 		{
-			get
+			get { return AxleWheels().Cast<IAxleEngineeringInputData>().ToList(); }
+		}
+
+		IList<IAxleDeclarationInputData> IVehicleDeclarationInputData.Axles
+		{
+			get { return AxleWheels().Cast<IAxleDeclarationInputData>().ToList(); }
+		}
+
+		private IEnumerable<AxleInputData> AxleWheels()
 		{
 			return
 				Body.GetEx(JsonKeys.Vehicle_AxleConfiguration).GetEx(JsonKeys.Vehicle_AxleConfiguration_Axles).Select(
@@ -124,8 +132,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 						RollResistanceCoefficient = axle.GetEx<double>(JsonKeys.Vehicle_Axles_RollResistanceCoefficient),
 						TyreTestLoad = axle.GetEx<double>(JsonKeys.Vehicle_Axles_TyreTestLoad).SI<Newton>(),
 						AxleWeightShare = axle.GetEx<double>("AxleWeightShare")
-						}).Cast<IAxleInputData>().ToList();
-			}
+					});
 		}
 
 		public virtual DataTable CrosswindCorrectionMap

VectoCore/InputData/IInputDataProvider.cs

@@ -34,22 +34,44 @@ using System.Deployment.Internal;
 
 namespace TUGraz.VectoCore.InputData
 {
-	public interface IInputDataProvider
+	public interface IInputDataProvider {}
+
+	public interface IDeclarationInputDataProvider : IInputDataProvider
+	{
+		IDeclarationJobInputData JobInputData();
+
+		IVehicleDeclarationInputData VehicleInputData { get; }
+
+		IGearboxDeclarationInputData GearboxInputData { get; }
+
+		IAxleGearInputData AxleGearInputData { get; }
+
+		IEngineDeclarationInputData EngineInputData { get; }
+
+		IAuxiliariesDeclarationInputData AuxiliaryInputData();
+
+		IRetarderInputData RetarderInputData { get; }
+
+		IDriverDeclarationInputData DriverInputData { get; }
+	}
+
+
+	public interface IEngineeringInputDataProvider : IInputDataProvider
 	{
-		IJobInputData JobInputData();
+		IEngineeringJobInputData JobInputData();
 
-		IVehicleInputData VehicleInputData { get; }
+		IVehicleEngineeringInputData VehicleInputData { get; }
 
-		IGearboxInputData GearboxInputData { get; }
+		IGearboxEngineeringInputData GearboxInputData { get; }
 
 		IAxleGearInputData AxleGearInputData { get; }
 
-		IEngineInputData EngineInputData { get; }
+		IEngineEngineeringInputData EngineInputData { get; }
 
-		IAuxiliariesInputData AuxiliaryInputData();
+		IAuxiliariesEngineeringInputData AuxiliaryInputData();
 
 		IRetarderInputData RetarderInputData { get; }
 
-		IDriverInputData DriverInputData { get; }
+		IDriverEngineeringInputData DriverInputData { get; }
 	}
 }
\ No newline at end of file

VectoCore/InputData/Impl/InputData.cs

@@ -45,7 +45,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 		public DataTable CycleData { get; internal set; }
 	}
 
-	public class StartStopInputData : IStartStopInputData
+	public class StartStopInputData : IStartStopEngineeringInputData
 	{
 		public bool Enabled { get; internal set; }
 
@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 		public MeterPerSecond MinSpeed { get; internal set; }
 	}
 
-	public class OverSpeedEcoRollInputData : IOverSpeedEcoRollInputData
+	public class OverSpeedEcoRollInputData : IOverSpeedEcoRollEngineeringInputData
 	{
 		public DriverData.DriverMode Mode { get; internal set; }
 
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 		public bool TorqueConverterActive { get; internal set; }
 	}
 
-	public class AxleInputData : IAxleInputData
+	public class AxleInputData : IAxleEngineeringInputData
 	{
 		public bool SavedInDeclarationMode
 		{
@@ -127,7 +127,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 		public KilogramSquareMeter Inertia { get; internal set; }
 	}
 
-	public class AuxiliaryDataInputData : IAuxiliaryInputData
+	public class AuxiliaryDataInputData : IAuxiliaryEngineeringInputData
 	{
 		public bool SavedInDeclarationMode { get; internal set; }
 

VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs

@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 	{
 		// =========================
 
-		internal VehicleData SetCommonVehicleData(IVehicleInputData data)
+		internal VehicleData SetCommonVehicleData(IVehicleDeclarationInputData data)
 		{
 			var retVal = new VehicleData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 				IntegrityStatus = data.IntegrityStatus,
 				VehicleCategory = data.VehicleCategory,
 				AxleConfiguration = data.AxleConfiguration,
-				CurbWeight = data.CurbWeight,
+				CurbWeight = data.CurbWeightChassis,
 				//CurbWeigthExtra = data.CurbWeightExtra.SI<Kilogram>(),
 				//Loading = data.Loading.SI<Kilogram>(),
 				GrossVehicleMassRating = data.GrossVehicleMassRating,
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal RetarderData SetCommonRetarderData(IRetarderInputData data, IVehicleInputData vehicle)
+		internal RetarderData SetCommonRetarderData(IRetarderInputData data, IVehicleDeclarationInputData vehicle)
 		{
 			var retarder = new RetarderData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retarder;
 		}
 
-		internal CombustionEngineData SetCommonCombustionEngineData(IEngineInputData data)
+		internal CombustionEngineData SetCommonCombustionEngineData(IEngineDeclarationInputData data)
 		{
 			var retVal = new CombustionEngineData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal GearboxData SetCommonGearboxData(IGearboxInputData data)
+		internal GearboxData SetCommonGearboxData(IGearboxDeclarationInputData data)
 		{
 			return new GearboxData {
 				SavedInDeclarationMode = data.SavedInDeclarationMode,

VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 {
 	public class DeclarationDataAdapter : AbstractSimulationDataAdapter
 	{
-		public DriverData CreateDriverData(IDriverInputData data)
+		public DriverData CreateDriverData(IDriverDeclarationInputData data)
 		{
 			if (!data.SavedInDeclarationMode) {
 				WarnDeclarationMode("DriverData");
@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal VehicleData CreateVehicleData(IVehicleInputData data, Mission mission, Kilogram loading)
+		internal VehicleData CreateVehicleData(IVehicleDeclarationInputData data, Mission mission, Kilogram loading)
 		{
 			if (!data.SavedInDeclarationMode) {
 				WarnDeclarationMode("VehicleData");
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal CombustionEngineData CreateEngineData(IEngineInputData engine)
+		internal CombustionEngineData CreateEngineData(IEngineDeclarationInputData engine)
 		{
 			if (!engine.SavedInDeclarationMode) {
 				WarnDeclarationMode("EngineData");
@@ -146,7 +146,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal GearboxData CreateGearboxData(IGearboxInputData gearbox, CombustionEngineData engine)
+		internal GearboxData CreateGearboxData(IGearboxDeclarationInputData gearbox, CombustionEngineData engine)
 		{
 			if (!gearbox.SavedInDeclarationMode) {
 				WarnDeclarationMode("GearboxData");
@@ -199,7 +199,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 		}
 
 
-		public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesInputData auxInputData,
+		public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesDeclarationInputData auxInputData,
 			MissionType mission, VehicleClass hvdClass)
 		{
 			if (!auxInputData.SavedInDeclarationMode) {
@@ -260,7 +260,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			Log.Warn("{0} not in Declaration Mode!", inputData);
 		}
 
-		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
+		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleDeclarationInputData vehicle)
 		{
 			return SetCommonRetarderData(retarder, vehicle);
 		}

VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs

@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 {
 	public class EngineeringDataAdapter : AbstractSimulationDataAdapter
 	{
-		internal VehicleData CreateVehicleData(IVehicleInputData data)
+		internal VehicleData CreateVehicleData(IVehicleEngineeringInputData data)
 		{
 			if (data.SavedInDeclarationMode) {
 				WarnEngineeringMode("VehicleData");
@@ -95,7 +95,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			Log.Warn("{0} is in Declaration Mode but is used for Engineering Mode!", msg);
 		}
 
-		internal CombustionEngineData CreateEngineData(IEngineInputData engine)
+		internal CombustionEngineData CreateEngineData(IEngineEngineeringInputData engine)
 		{
 			if (engine.SavedInDeclarationMode) {
 				WarnEngineeringMode("EngineData");
@@ -108,7 +108,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		internal GearboxData CreateGearboxData(IGearboxInputData gearbox, CombustionEngineData engineData)
+		internal GearboxData CreateGearboxData(IGearboxEngineeringInputData gearbox, CombustionEngineData engineData)
 		{
 			if (gearbox.SavedInDeclarationMode) {
 				WarnEngineeringMode("GearboxData");
@@ -157,7 +157,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			return retVal;
 		}
 
-		public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesInputData auxInputData)
+		public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesEngineeringInputData auxInputData)
 		{
 			if (auxInputData.SavedInDeclarationMode) {
 				WarnEngineeringMode("AuxData");
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			}).Concat(new VectoRunData.AuxData { ID = "", DemandType = AuxiliaryDemandType.Direct }.ToEnumerable()).ToList();
 		}
 
-		internal DriverData CreateDriverData(IDriverInputData driver)
+		internal DriverData CreateDriverData(IDriverEngineeringInputData driver)
 		{
 			if (driver.SavedInDeclarationMode) {
 				WarnEngineeringMode("DriverData");
@@ -210,7 +210,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 		}
 
 		//=================================
-		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleInputData vehicle)
+		public RetarderData CreateRetarderData(IRetarderInputData retarder, IVehicleEngineeringInputData vehicle)
 		{
 			return SetCommonRetarderData(retarder, vehicle);
 		}

VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs

@@ -47,11 +47,11 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 		protected static Dictionary<MissionType, DrivingCycleData> CyclesCache =
 			new Dictionary<MissionType, DrivingCycleData>();
 
-		protected IInputDataProvider InputDataProvider;
+		protected IDeclarationInputDataProvider InputDataProvider;
 
 		protected DeclarationReport Report;
 
-		internal DeclarationModeVectoRunDataFactory(IInputDataProvider dataProvider, DeclarationReport report)
+		internal DeclarationModeVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, DeclarationReport report)
 		{
 			InputDataProvider = dataProvider;
 			Report = report;
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			var dao = new DeclarationDataAdapter();
 			var segment = GetVehicleClassification(InputDataProvider.VehicleInputData.VehicleCategory,
 				InputDataProvider.VehicleInputData.AxleConfiguration,
-				InputDataProvider.VehicleInputData.GrossVehicleMassRating, InputDataProvider.VehicleInputData.CurbWeight);
+				InputDataProvider.VehicleInputData.GrossVehicleMassRating, InputDataProvider.VehicleInputData.CurbWeightChassis);
 			var driverdata = dao.CreateDriverData(InputDataProvider.DriverInputData);
 			driverdata.AccelerationCurve = AccelerationCurveData.ReadFromStream(segment.AccelerationFile);
 

VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs

@@ -38,7 +38,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 {
 	public class EngineOnlyVectoRunDataFactory : EngineeringModeVectoRunDataFactory
 	{
-		internal EngineOnlyVectoRunDataFactory(IInputDataProvider dataProvider) : base(dataProvider) {}
+		internal EngineOnlyVectoRunDataFactory(IEngineeringInputDataProvider dataProvider) : base(dataProvider) {}
 
 		public override IEnumerable<VectoRunData> NextRun()
 		{

VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs

@@ -45,9 +45,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 	{
 		protected DriverData Driver;
 
-		protected IInputDataProvider InputDataProvider;
+		protected IEngineeringInputDataProvider InputDataProvider;
 
-		internal EngineeringModeVectoRunDataFactory(IInputDataProvider dataProvider)
+		internal EngineeringModeVectoRunDataFactory(IEngineeringInputDataProvider dataProvider)
 		{
 			InputDataProvider = dataProvider;
 		}

VectoCore/Models/Simulation/Impl/SimulatorFactory.cs

@@ -68,17 +68,29 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			ModWriter = writer;
 			switch (mode) {
 				case ExecutionMode.Declaration:
+					var declDataProvider = dataProvider as IDeclarationInputDataProvider;
+					if (declDataProvider == null) {
+						throw new VectoException("InputDataProvider does not implement DeclarationData interface");
+					}
 					report = report ?? new PDFDeclarationReport(writer);
 					var windowsIdentity = WindowsIdentity.GetCurrent();
 					report.Creator = windowsIdentity != null ? windowsIdentity.Name : "N/A";
-					report.JobName = dataProvider.JobInputData().JobName;
-					DataReader = new DeclarationModeVectoRunDataFactory(dataProvider, report);
+					report.JobName = declDataProvider.JobInputData().JobName;
+					DataReader = new DeclarationModeVectoRunDataFactory(declDataProvider, report);
 					break;
 				case ExecutionMode.Engineering:
-					DataReader = new EngineeringModeVectoRunDataFactory(dataProvider);
+					var engDataProvider = dataProvider as IEngineeringInputDataProvider;
+					if (engDataProvider == null) {
+						throw new VectoException("InputDataProvider does not implement Engineering interface");
+					}
+					DataReader = new EngineeringModeVectoRunDataFactory(engDataProvider);
 					break;
 				case ExecutionMode.EngineOnly:
-					DataReader = new EngineOnlyVectoRunDataFactory(dataProvider);
+					var engineDataProvider = dataProvider as IEngineeringInputDataProvider;
+					if (engineDataProvider == null) {
+						throw new VectoException("InputDataProvider does not implement Engineering interface");
+					}
+					DataReader = new EngineOnlyVectoRunDataFactory(engineDataProvider);
 					break;
 				default:
 					throw new VectoException("Unkown factory mode in SimulatorFactory: {0}", mode);

VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs

@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 			}
 		}
 
-		internal AuxiliaryData(IAuxiliaryInputData data)
+		internal AuxiliaryData(IAuxiliaryEngineeringInputData data)
 		{
 			TransmissionRatio = data.TransmissionRatio;
 			EfficiencyToEngine = data.EfficiencyToEngine;

VectoCore/VectoCore.csproj

@@ -110,6 +110,7 @@
     <Compile Include="Configuration\Constants.cs" />
     <Compile Include="Exceptions\VectoExceptions.cs" />
     <Compile Include="Exceptions\VectoSimulationException.cs" />
+    <Compile Include="InputData\EngineeringInputData.cs" />
     <Compile Include="InputData\FileIO\JSON\JsonExtensionMethods.cs" />
     <Compile Include="InputData\Impl\InputData.cs" />
     <Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
@@ -118,7 +119,7 @@
     <Compile Include="InputData\FileIO\JSON\JSONInputDataFactory.cs" />
     <Compile Include="InputData\FileIO\JSON\JSONVehicleData.cs" />
     <Compile Include="InputData\IInputDataProvider.cs" />
-    <Compile Include="InputData\InputData.cs" />
+    <Compile Include="InputData\DeclarationInputData.cs" />
     <Compile Include="InputData\IntegrityStatus.cs" />
     <Compile Include="InputData\IVectoRunDataFactory.cs" />
     <Compile Include="InputData\Reader\DataObjectAdaper\AbstractSimulationDataAdapter.cs" />

VectoCoreTest/FileIO/JsonTest.cs

@@ -90,9 +90,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
 			((JObject)json["Body"]).Property("Cycles").Remove();
 
-			AssertHelper.Exception<InvalidFileFormatException>(() => {
-				var tmp = new JSONInputDataV2(json, TestJobFile).Cycles;
-			}, "Key Cycles not found");
+			AssertHelper.Exception<InvalidFileFormatException>(
+				() => { var tmp = new JSONInputDataV2(json, TestJobFile).Cycles; }, "Key Cycles not found");
 		}
 
 		[TestMethod]
@@ -113,7 +112,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			((JObject)json["Body"]).Property("VACC").Remove();
 
 			AssertHelper.Exception<VectoException>(() => {
-				var tmp = new JSONInputDataV2(json, TestJobFile).DriverInputData.AccelerationCurve;
+				IEngineeringInputDataProvider input = new JSONInputDataV2(json, TestJobFile);
+				var tmp = input.DriverInputData.AccelerationCurve;
 			}, "AccelerationCurve (VACC) required");
 		}
 
@@ -124,7 +124,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
 			json["Body"]["VACC"] = "Truck";
 
-			var tmp = new JSONInputDataV2(json, TestJobFile).DriverInputData.AccelerationCurve;
+			IEngineeringInputDataProvider input = new JSONInputDataV2(json, TestJobFile);
+			var tmp = input.DriverInputData.AccelerationCurve;
 			Assert.IsNotNull(tmp);
 		}
 
@@ -134,8 +135,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
 			((JObject)json["Body"]).Property("LAC").Remove();
 
-			AssertHelper.Exception<VectoException>(() => {
-				var tmp = new JSONInputDataV2(json, TestJobFile).DriverInputData.Lookahead;
+			AssertHelper.Exception<VectoException>(
+				() => {
+					IEngineeringInputDataProvider input = new JSONInputDataV2(json, TestJobFile);
+					var tmp = input.DriverInputData.Lookahead;
 				}, "Key LAC not found");
 		}
 
@@ -145,9 +148,9 @@ namespace TUGraz.VectoCore.Tests.FileIO
 			var json = (JObject)JToken.ReadFrom(new JsonTextReader(File.OpenText(TestJobFile)));
 			((JObject)json["Body"]).Property("OverSpeedEcoRoll").Remove();
 
-			AssertHelper.Exception<VectoException>(() => {
-				var tmp = new JSONInputDataV2(json, TestJobFile).DriverInputData.OverSpeedEcoRoll;
-			}, "Key OverSpeedEcoRoll not found");
+			AssertHelper.Exception<VectoException>(
+				() => { var tmp = new JSONInputDataV2(json, TestJobFile).DriverInputData.OverSpeedEcoRoll; },
+				"Key OverSpeedEcoRoll not found");
 		}
 	}
 

VectoCoreTest/FileIO/SimulationDataReaderTest.cs

@@ -32,6 +32,8 @@
 using System.IO;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCore.Exceptions;
+using TUGraz.VectoCore.InputData;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.Reader.Impl;
 using TUGraz.VectoCore.Models.Declaration;
@@ -50,7 +52,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
 		public void ReadDeclarationJobFile()
 		{
 			var dataProvider = JSONInputDataFactory.ReadJsonJob(DeclarationJob);
-			var reader = new DeclarationModeVectoRunDataFactory(dataProvider, null);
+			var declarationProvider = dataProvider as IDeclarationInputDataProvider;
+			if (declarationProvider == null) {
+				throw new VectoException("Failed to cas to Engineering InputDataProvider");
+			}
+			var reader = new DeclarationModeVectoRunDataFactory(declarationProvider, null);
 			//reader.SetJobFile(DeclarationJob);
 
 			var runData = reader.NextRun().First();