updated IEPC_S rundatafactory creation

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs

@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
 
 		public override VectoSimulationJobType VehicleType
 		{
-			get => VectoSimulationJobType.BatteryElectricVehicle;
+			get => VectoSimulationJobType.IEPC_E;
 		}
 	}
 
@@ -239,7 +239,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
 
 		public override VectoSimulationJobType VehicleType
 		{
-			get => VectoSimulationJobType.SerialHybridVehicle;
+			get => VectoSimulationJobType.IEPC_S;
 		}
 
 		public override bool HybridElectricHDV => true;

VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryNinjectModule.cs

@@ -186,8 +186,9 @@ namespace TUGraz.VectoCore.InputData.Reader
 				_vehicleStringHelper.GetName(VehicleCategoryHelper.CompletedBus, VectoSimulationJobType.SerialHybridVehicle,
 					ArchitectureID.S4));
 			Bind<IVectoRunDataFactory>().To<DeclarationModeCompletedBusRunDataFactory.HEV_S_IEPC>().Named(
-				_vehicleStringHelper.GetName(VehicleCategoryHelper.CompletedBus, VectoSimulationJobType.SerialHybridVehicle,
+				_vehicleStringHelper.GetName(VehicleCategoryHelper.CompletedBus, VectoSimulationJobType.IEPC_S,
 					ArchitectureID.S_IEPC));
+
 			Bind<IVectoRunDataFactory>().To<DeclarationModeCompletedBusRunDataFactory.HEV_P1>().Named(
 				_vehicleStringHelper.GetName(VehicleCategoryHelper.CompletedBus, VectoSimulationJobType.ParallelHybridVehicle,
 					ArchitectureID.P1));

VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryFactoryTest.cs

@@ -637,6 +637,27 @@ namespace TUGraz.VectoCore.Tests.InputData.RunDataFactory
 			var type = arch.ToString().StartsWith("P")
 				? VectoSimulationJobType.ParallelHybridVehicle
 				: VectoSimulationJobType.SerialHybridVehicle;
+
+
+			switch (arch) {
+				case ArchitectureID.P1:
+				case ArchitectureID.P2:
+				case ArchitectureID.P2_5:
+				case ArchitectureID.P3:
+				case ArchitectureID.P4:
+					type = VectoSimulationJobType.ParallelHybridVehicle;
+					break;
+				case ArchitectureID.S2:
+				case ArchitectureID.S3:
+				case ArchitectureID.S4:
+					type = VectoSimulationJobType.SerialHybridVehicle;
+					break;
+				case ArchitectureID.S_IEPC:
+					type = VectoSimulationJobType.IEPC_S;
+					break;
+				default:
+					throw new ArgumentOutOfRangeException(nameof(arch), arch, null);
+			}
 			mock.Setup(p => p.JobInputData.Vehicle.ArchitectureID).
 				Returns(arch);
 			mock.Setup(p => p.JobInputData.JobType).