added types for completed buses, renamed IMrfVehicleGroup to IReportVehicleOutputGroup

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs

@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 	public abstract class AbstractCustomerReport : IXMLCustomerReport
     {
 		protected readonly ICustomerInformationFileFactory _cifFactory;
-
+		protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
 		protected XElement Vehicle { get; set; }
 
 		protected AbstractCustomerReport(ICustomerInformationFileFactory cifFactory)

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFNinjectModule.cs

@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 using Ninject.Activation;
+using Ninject.Extensions.ContextPreservation;
 using Ninject.Extensions.Factory;
 using Ninject.Extensions.NamedScope;
 using TUGraz.VectoCommon.InputData;
@@ -24,6 +25,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void Load()
 		{
+			LoadModule<ContextPreservationModule>();
 			Bind<ICustomerInformationFileFactory>().ToFactory(() => new CombineArgumentsToNameInstanceProvider(
 				nameCombinationMethod, 6, 6, typeof(ICustomerInformationFileFactory).GetMethod(nameof(ICustomerInformationFileFactory
 					.GetCustomerReport)))).InSingletonScope();
@@ -32,7 +34,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 				ToParams(VehicleCategoryHelper.Lorry, VectoSimulationJobType.ConventionalVehicle,
 					ArchitectureID.UNKNOWN, false, false, false)));
 
-
 			Bind<IXMLCustomerReport>().To<HEV_PxLorry_CIF>().Named(nameCombinationMethod(
 				ToParams(VehicleCategoryHelper.Lorry, VectoSimulationJobType.ParallelHybridVehicle,
 					ArchitectureID.UNKNOWN, false, false, false)));
@@ -51,49 +52,178 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 			Bind<IXMLCustomerReport>().To<HEV_IEPC_Lorry_CIF>().Named(nameCombinationMethod(
 				ToParams(VehicleCategoryHelper.Lorry, VectoSimulationJobType.SerialHybridVehicle,
-					ArchitectureID.UNKNOWN, false,true, false)));
-
-
+					ArchitectureID.S_IEPC, false,true, false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_E2_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E2,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_E3_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E3,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_E4_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E4,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_IEPC_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E_IEPC,
+					false,
+					true,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_IEPC_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E_IEPC,
+					false,
+					true,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_IEPC_Lorry_CIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(
+					VehicleCategoryHelper.Lorry,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.E_IEPC,
+					false,
+					true,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<Conventional_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(VehicleCategoryHelper.CompletedBus,
+					VectoSimulationJobType.ConventionalVehicle,
+					ArchitectureID.UNKNOWN,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<HEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(VehicleCategoryHelper.CompletedBus,
+					VectoSimulationJobType.SerialHybridVehicle,
+					ArchitectureID.UNKNOWN,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<HEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(VehicleCategoryHelper.CompletedBus,
+					VectoSimulationJobType.ParallelHybridVehicle,
+					ArchitectureID.UNKNOWN,
+					false,
+					false,
+					false)));
+
+			Bind<IXMLCustomerReport>().To<PEV_CompletedBusCIF>().Named(nameCombinationMethod.Invoke(
+				ToParams(VehicleCategoryHelper.CompletedBus,
+					VectoSimulationJobType.BatteryElectricVehicle,
+					ArchitectureID.UNKNOWN,
+					false,
+					false,
+					false)));
 
 
 			#region VehicleTypes
-			Bind<IXmlTypeWriter>().To<CIFConventionalLorryVehicleWriter>()
+			Bind<IXmlTypeWriter>().To<CIFConventionalLorryVehicleWriter>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalLorryVehicleType());
 
-			Bind<IXmlTypeWriter>().To<CIF_HEVPx_LorryVehicleWriter>()
+			Bind<IXmlTypeWriter>().To<CIF_HEVPx_LorryVehicleWriter>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_PxLorryVehicleType());
 
+			Bind<IXmlTypeWriter>().To<CIF_HEV_S2_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S2_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_HEV_S3_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S3_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_HEV_S4_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_S4_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_HEV_IEPC_S_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_IEPC_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_PEV_E2_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E2_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_PEV_E3_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E3_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_PEV_E4_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_E4_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_PEV_IEPC_LorryVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_IEPC_LorryVehicleType());
+
+			Bind<IXmlTypeWriter>().To<CIF_ConventionalCompletedBusVehicleWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventional_CompletedBusVehicleType());
+
 			#endregion
 			#region VehicleGroups
-			Bind<IMrfXmlGroup>().To<GeneralVehicleSequenceGroupCIF>()
+			Bind<IReportVehicleOutputGroup>().To<GeneralVehicleOutputSequenceGroupCif>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetGeneralVehicleSequenceGroupWriter());
-			Bind<IMrfXmlGroup>().To<LorryGeneralVehicleSequenceGroupCIF>()
+			Bind<IReportOutputGroup>().To<LorryGeneralVehicleSequenceGroupCIF>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetLorryGeneralVehicleSequenceGroupWriter());
-			Bind<IMrfXmlGroup>().To<ConventionalLorryVehicleSequenceGroupCIF>()
+			Bind<IReportOutputGroup>().To<ConventionalLorryVehicleSequenceGroupCIF>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetConventionalLorryVehicleSequenceGroupWriter());
-
+			Bind<IReportOutputGroup>().To<HEV_LorryVehicleTypeGroupCIF>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_LorryVehicleTypeGroup());
+			Bind<IReportOutputGroup>().To<HEV_VehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetHEV_VehicleSequenceGroupWriter());
+			Bind<IReportOutputGroup>().To<PEV_LorryVehicleTypeGroupCIF>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_LorryVehicleTypeGroup());
+			Bind<IReportOutputGroup>().To<PEV_VehicleSequenceGroupWriter>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetPEV_VehicleSequenceGroupWriter());
+
+			Bind<IReportOutputGroup>().To<CompletedBusVehicleTypeGroup>().When(AccessedViaCIFFactory)
+				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetCompletedBusVehicleTypeGroup());
 
 			#endregion
 			#region ComponentGroups
-			Bind<IMrfXmlGroup>().To<ComponentGroupWriters>()
+			Bind<IReportOutputGroup>().To<ComponentGroupWriters>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetEngineGroup());
-			Bind<IMrfXmlGroup>().To<TransmissionGroup>()
+			Bind<IReportOutputGroup>().To<TransmissionGroup>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetTransmissionGroup());
-			Bind<IMrfXmlGroup>().To<AxleWheelsGroup>()
+			Bind<IReportOutputGroup>().To<AxleWheelsGroup>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetAxleWheelsGroup());
-			Bind<IMrfXmlGroup>().To<ElectricMachineGroup>()
+			Bind<IReportOutputGroup>().To<ElectricMachineGroup>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetElectricMachineGroup());
-			Bind<IMrfXmlGroup>().To<REESSGroup>()
+			Bind<IReportOutputGroup>().To<REESSGroup>().When(AccessedViaCIFFactory)
 				.NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetREESSGroup());
+			Bind<IReportOutputGroup>().To<LorryAuxGroup>().When(AccessedViaCIFFactory).
+				NamedLikeFactoryMethod((ICustomerInformationFileFactory f) => f.GetLorryAuxGroup());
+
 			#endregion
 
-			
-			
 
-			
-		}
 
 
+		}
+
+		private bool AccessedViaCIFFactory(IRequest request)
+		{
+			if (request.ParentRequest == null) {
+				return false;
+			}
+			return typeof(ICustomerInformationFileFactory).IsAssignableFrom(request.ParentRequest.Service);
+		}
 
 		#endregion
 	}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/AbstractCIFGroupWriter.cs

@@ -11,7 +11,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
 {
-    public abstract class AbstractCIFGroupWriter : IMrfXmlGroup
+    public abstract class AbstractCIFGroupWriter : IReportOutputGroup
     {
 		protected XNamespace _mrf = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9";
 		protected XNamespace _cif = "urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9";

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs

@@ -124,9 +124,16 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
 		{
 			var result = new List<XElement>();
-			var totalRatedPropulsionPower =
-				inputData.JobInputData.Vehicle.Components.ElectricMachines.Entries
-					.Where(e => e.Position != PowertrainPosition.GEN).Sum((e => e.ElectricMachine.R85RatedPower));
+			Watt totalRatedPropulsionPower = null;
+			if (inputData.JobInputData.Vehicle.ArchitectureID == ArchitectureID.S_IEPC || inputData.JobInputData.Vehicle.ArchitectureID == ArchitectureID.E_IEPC) {
+				totalRatedPropulsionPower = inputData.JobInputData.Vehicle.Components.IEPC.R85RatedPower;
+			} else {
+				totalRatedPropulsionPower =
+					inputData.JobInputData.Vehicle.Components.ElectricMachines.Entries
+						.Where(e => e.Position != PowertrainPosition.GEN).Sum((e => e.ElectricMachine.R85RatedPower));
+			}
+			
+			
 			result.Add(new XElement(_cif + "TotalRatedPropulsionPower", totalRatedPropulsionPower.ValueAsUnit("kW")));
 			result.Add(new XElement(_cif + "MaxContinousPropulsionPower", "TODO"));
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs

@@ -12,15 +12,23 @@ using TUGraz.VectoCore.Utils;
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CIFWriter
 {
-    public class GeneralVehicleSequenceGroupCIF : AbstractCIFGroupWriter
+    public class GeneralVehicleOutputSequenceGroupCif : AbstractCIFGroupWriter, IReportVehicleOutputGroup
 	{
-		public GeneralVehicleSequenceGroupCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+		public GeneralVehicleOutputSequenceGroupCif(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
 		#region Overrides of AbstractCIFGroupWriter
 
 		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
 		{
-			var vehicleData = inputData.JobInputData.Vehicle;
+			return GetElements(inputData.JobInputData.Vehicle);
+		}
+
+		#endregion
+
+		#region Implementation of IReportVehicleOutputGroup
+
+		public IList<XElement> GetElements(IVehicleDeclarationInputData vehicleData)
+		{
 			var result = new List<XElement>() {
 				new XElement(_cif + XMLNames.Vehicle_VIN, vehicleData.VIN),
 				new XElement(_cif + XMLNames.Vehicle_VehicleCategory, vehicleData.LegislativeClass.ToXMLFormat()),
@@ -91,7 +99,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
 		{
 			var result = new List<XElement>();
-			result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData));
+			result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle));
 			result.AddRange(_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData));
 			result.AddRange(_cifFactory.GetHEV_VehicleSequenceGroupWriter().GetElements(inputData));
 
@@ -100,6 +108,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		#endregion
 	}
+	public class PEV_LorryVehicleTypeGroupCIF : AbstractCIFGroupWriter
+	{
+		public PEV_LorryVehicleTypeGroupCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+		#region Overrides of AbstractCIFGroupWriter
+
+		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+		{
+			var result = new List<XElement>();
+			result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle));
+			result.AddRange(_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData));
+			result.AddRange(_cifFactory.GetPEV_VehicleSequenceGroupWriter().GetElements(inputData));
+
+			return result;
+		}
+
+		#endregion
+	}
 
 
 	public class HEV_VehicleSequenceGroupWriter : AbstractCIFGroupWriter
@@ -125,4 +151,47 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		#endregion
 	}
+
+
+	public class PEV_VehicleSequenceGroupWriter : AbstractCIFGroupWriter
+	{
+		public PEV_VehicleSequenceGroupWriter(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+		#region Overrides of AbstractCIFGroupWriter
+
+		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+		{
+			var result = new List<XElement>();
+			var ovCc = inputData.JobInputData.Vehicle.OvcHev;
+			result.AddRange(new List<XElement>() {
+				new XElement(_cif + "PEVArchitecture", inputData.JobInputData.Vehicle.ArchitectureID.GetLabel()),
+				new XElement(_cif + "OffVehicleChargingCapability", ovCc)
+			});
+			if (ovCc)
+			{
+				result.Add(new XElement(_cif + "OffVehicleChargingMaxPower", inputData.JobInputData.Vehicle.MaxChargingPower.ValueAsUnit("kW")));
+			}
+			return result;
+		}
+
+		#endregion
+	}
+
+
+	public class CompletedBusVehicleTypeGroup : AbstractCIFGroupWriter
+	{
+		public CompletedBusVehicleTypeGroup(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+
+		#region Overrides of AbstractCIFGroupWriter
+
+		public override IList<XElement> GetElements(IDeclarationInputDataProvider inputData)
+		{
+			var completedBusData = inputData as IMultistageBusInputDataProvider;
+			var result = new List<XElement>();
+			result.AddRange(_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(completedBusData.JobInputData.ConsolidateManufacturingStage.Vehicle));
+			return result;
+		}
+
+		#endregion
+	}
 }

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleWriter.cs

@@ -33,6 +33,25 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		public abstract XElement GetElement(IDeclarationInputDataProvider inputData);
 
 		#endregion
+
+
+		protected XElement GetRetarder(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Retarder,
+				inputData.JobInputData.Vehicle.Components.RetarderInputData.Type != RetarderType.None);
+		}
+
+		protected XElement GetAxleRatio(IDeclarationInputDataProvider inputData, bool optional = false)
+		{
+			if (!optional || (inputData.JobInputData.Vehicle.Components.AxleGearInputData != null)) {
+				return new XElement(_cif + XMLNames.Axlegear_Ratio,
+					inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio.ToXMLFormat(2));
+			} else {
+				return null;
+			}
+			
+		}
+		
 	}
 
 
@@ -49,14 +68,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		public override XElement GetElement(IDeclarationInputDataProvider inputData)
 		{
 			return new XElement(_cif + XMLNames.Component_Vehicle,
-					_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData),
+					_cifFactory.GetGeneralVehicleSequenceGroupWriter().GetElements(inputData.JobInputData.Vehicle),
 					_cifFactory.GetLorryGeneralVehicleSequenceGroupWriter().GetElements(inputData),
 					_cifFactory.GetConventionalLorryVehicleSequenceGroupWriter().GetElements(inputData),
 					_mrfFactory.GetConventionalADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
 					_cifFactory.GetEngineGroup().GetElements(inputData),
 					_cifFactory.GetTransmissionGroup().GetElements(inputData),
-					new XElement(_cif + XMLNames.Component_Retarder, inputData.JobInputData.Vehicle.Components.RetarderInputData.Type != RetarderType.None),
-					new XElement(_cif + XMLNames.Axlegear_Ratio, inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio.ToXMLFormat(2)),
+					GetRetarder(inputData),
+					GetAxleRatio(inputData),
 					_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
 					_cifFactory.GetLorryAuxGroup().GetElements(inputData)
 			);
@@ -90,5 +109,204 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		#endregion
 	}
 
+	public class CIF_HEV_S2_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_HEV_S2_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetEngineGroup().GetElements(inputData),
+				_cifFactory.GetTransmissionGroup().GetElements(inputData),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_HEV_S3_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_HEV_S3_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetEngineGroup().GetElements(inputData),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_HEV_S4_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_HEV_S4_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetEngineGroup().GetElements(inputData),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_HEV_IEPC_S_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_HEV_IEPC_S_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetHEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetHEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetEngineGroup().GetElements(inputData),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData, true),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_PEV_E2_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_PEV_E2_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetTransmissionGroup().GetElements(inputData),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_PEV_E3_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_PEV_E3_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_PEV_E4_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_PEV_E4_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_PEV_IEPC_LorryVehicleWriter : VehicleWriter
+	{
+		public CIF_PEV_IEPC_LorryVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetPEV_LorryVehicleTypeGroup().GetElements(inputData),
+				_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS),
+				GetRetarder(inputData),
+				GetAxleRatio(inputData, true),
+				_cifFactory.GetAxleWheelsGroup().GetElements(inputData),
+				_cifFactory.GetElectricMachineGroup().GetElements(inputData),
+				_cifFactory.GetREESSGroup().GetElements(inputData),
+				_cifFactory.GetLorryAuxGroup().GetElements(inputData)
+			);
+		}
+
+		#endregion
+	}
+
+	public class CIF_ConventionalCompletedBusVehicleWriter : VehicleWriter
+	{
+		public CIF_ConventionalCompletedBusVehicleWriter(ICustomerInformationFileFactory cifFactory, IManufacturerReportFactory mrfFactory) : base(cifFactory, mrfFactory) { }
+
+		#region Overrides of VehicleWriter
+
+		public override XElement GetElement(IDeclarationInputDataProvider inputData)
+		{
+			return new XElement(_cif + XMLNames.Component_Vehicle,
+				_cifFactory.GetCompletedBusVehicleTypeGroup().GetElements(inputData));
+		}
 
+		#endregion
+	}
 }

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/LorryCustomerInformationFile.cs → VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs

@@ -7,29 +7,30 @@ using System.Xml.Linq;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport;
 using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9.CustomerInformationFile
 {
-    public abstract class LorryCustomerInformationFile : AbstractCustomerReport
+    public abstract class CustomerInformationFile : AbstractCustomerReport
     {
-		//protected XNamespace _cif = XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
-		//public LorryManufacturerReportBase(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory) { }
-
-		//protected void GenerateReport(string outputDataType)
-		//{
-		//	Report = new XDocument(new XElement(_mrf + "VectoOutput",
-		//		new XAttribute("xmlns", _mrf),
-		//		new XAttribute(XNamespace.Xmlns + "xsi", xsi),
-		//		new XAttribute(xsi + "type", $"{outputDataType}"),
-		//		Vehicle,
-		//		new XElement(_mrf + "Results")));
-		//}
-
-		protected LorryCustomerInformationFile(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
-	}
+        public static XNamespace Cif => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9");
 
-	public class ConventionalLorry_CIF : LorryCustomerInformationFile
+		protected void GenerateReport(string outputDataType)
+		{
+			Report = new XDocument(new XElement(Cif + "VectoOutput",
+				new XAttribute("xmlns", Cif),
+				new XAttribute(XNamespace.Xmlns + "xsi", xsi),
+				new XAttribute(XNamespace.Xmlns + "mrf", LorryManufacturerReportBase.Mrf),
+				new XAttribute(xsi + "type", $"{outputDataType}"),
+				Vehicle));
+			//;new XElement(Cif + "Results")));
+		}
+
+        protected CustomerInformationFile(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
+	}
+    #region LorryCIF
+    public class ConventionalLorry_CIF : CustomerInformationFile
 	{
 		public ConventionalLorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -38,12 +39,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
 			Vehicle = _cifFactory.GetConventionalLorryVehicleType().GetElement(inputData);
+			GenerateReport("ConventionalLorryOutputType");
 		}
 
 		#endregion
 	}
 
-	public class HEV_PxLorry_CIF : LorryCustomerInformationFile
+	public class HEV_PxLorry_CIF : CustomerInformationFile
 	{
 		public HEV_PxLorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -53,11 +55,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		{
 			var vehicle = _cifFactory.GetHEV_PxLorryVehicleType();
 			Vehicle = _cifFactory.GetHEV_PxLorryVehicleType().GetElement(inputData);
+			GenerateReport("HEV_Px_LorryOutputType");
 		}
 		#endregion
 	}
 
-	public class HEV_S2_Lorry_CIF : LorryCustomerInformationFile
+	public class HEV_S2_Lorry_CIF : CustomerInformationFile
 	{
 		public HEV_S2_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -65,13 +68,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetHEV_S2_LorryVehicleType().GetElement(inputData);
+			GenerateReport("HEV_S2_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class HEV_S3_Lorry_CIF : LorryCustomerInformationFile
+	public class HEV_S3_Lorry_CIF : CustomerInformationFile
 	{
 		public HEV_S3_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -79,13 +83,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetHEV_S3_LorryVehicleType().GetElement(inputData);
+			GenerateReport("HEV_S3_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class HEV_S4_Lorry_CIF : LorryCustomerInformationFile
+	public class HEV_S4_Lorry_CIF : CustomerInformationFile
 	{
 		public HEV_S4_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -93,13 +98,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetHEV_S4_LorryVehicleType().GetElement(inputData);
+			GenerateReport("HEV_S4_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class HEV_IEPC_Lorry_CIF : LorryCustomerInformationFile
+	public class HEV_IEPC_Lorry_CIF : CustomerInformationFile
 	{
 		public HEV_IEPC_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -107,13 +113,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetHEV_IEPC_LorryVehicleType().GetElement(inputData);
+			GenerateReport("HEV_IEPC_S_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class PEV_E2_Lorry_CIF : LorryCustomerInformationFile
+	public class PEV_E2_Lorry_CIF : CustomerInformationFile
 	{
 		public PEV_E2_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -121,13 +128,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetPEV_E2_LorryVehicleType().GetElement(inputData);
+			GenerateReport("PEV_E2_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class PEV_E3_Lorry_CIF : LorryCustomerInformationFile
+	public class PEV_E3_Lorry_CIF : CustomerInformationFile
 	{
 		public PEV_E3_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -135,13 +143,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetPEV_E3_LorryVehicleType().GetElement(inputData);
+			GenerateReport("PEV_E3_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class PEV_E4_Lorry_CIF : LorryCustomerInformationFile
+	public class PEV_E4_Lorry_CIF : CustomerInformationFile
 	{
 		public PEV_E4_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -149,13 +158,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetPEV_E4_LorryVehicleType().GetElement(inputData);
+			GenerateReport("PEV_E4_LorryVehicleType");
 		}
 
 		#endregion
 	}
 
-	public class PEV_IEPC_Lorry_CIF : LorryCustomerInformationFile
+	public class PEV_IEPC_Lorry_CIF : CustomerInformationFile
 	{
 		public PEV_IEPC_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
 
@@ -163,9 +173,63 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			throw new NotImplementedException();
+			Vehicle = _cifFactory.GetPEV_IEPC_LorryVehicleType().GetElement(inputData);
+			GenerateReport("PEV_IEPC_LorryVehicleType");
 		}
 
 		#endregion
 	}
+
+    #endregion
+
+
+
+
+
+
+
+
+
+    #region CompletedBus
+    public class Conventional_CompletedBusCIF : CustomerInformationFile
+    {
+        public Conventional_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+        {
+        }
+
+        public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+        {
+			Vehicle = _cifFactory.GetConventional_CompletedBusVehicleType().GetElement(inputData);
+			GenerateReport("Conventional_CompletedBusOutputType");
+        }
+    }
+
+
+	public class HEV_CompletedBusCIF : CustomerInformationFile
+	{
+		public HEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+		{
+		}
+
+		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+		{
+			Vehicle = _cifFactory.GetHEV_CompletedBusVehicleType().GetElement(inputData);
+			GenerateReport("HEV_CompltedBusOutputType");
+		}
+	}
+
+	public class PEV_CompletedBusCIF : CustomerInformationFile
+	{
+		public PEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+		{
+		}
+
+		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
+		{
+			Vehicle = _cifFactory.GetPEV_CompletedBusVehicleType().GetElement(inputData);
+			GenerateReport("PEV_CompltedBusOutputType");
+		}
+	}
+
+	#endregion
 }

VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ICustomerInformationFileFactory.cs

@@ -29,16 +29,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 		IXmlTypeWriter GetPEV_IEPC_LorryVehicleType();
 
 
-		IMrfXmlGroup GetGeneralVehicleSequenceGroupWriter();
-		IMrfXmlGroup GetLorryGeneralVehicleSequenceGroupWriter();
-		IMrfXmlGroup GetConventionalLorryVehicleSequenceGroupWriter();
-		IMrfXmlGroup GetEngineGroup();
-		IMrfXmlGroup GetTransmissionGroup();
-		IMrfXmlGroup GetAxleWheelsGroup();
-		IMrfXmlGroup GetLorryAuxGroup();
-		IMrfXmlGroup GetHEV_VehicleSequenceGroupWriter();
-		IMrfXmlGroup GetHEV_LorryVehicleTypeGroup();
-		IMrfXmlGroup GetElectricMachineGroup();
-		IMrfXmlGroup GetREESSGroup();
+		IXmlTypeWriter GetConventional_CompletedBusVehicleType();
+		IXmlTypeWriter GetHEV_CompletedBusVehicleType();
+		IXmlTypeWriter GetPEV_CompletedBusVehicleType();
+
+
+		IReportVehicleOutputGroup GetGeneralVehicleSequenceGroupWriter();
+		IReportOutputGroup GetLorryGeneralVehicleSequenceGroupWriter();
+		IReportOutputGroup GetConventionalLorryVehicleSequenceGroupWriter();
+		IReportOutputGroup GetEngineGroup();
+		IReportOutputGroup GetTransmissionGroup();
+		IReportOutputGroup GetAxleWheelsGroup();
+		IReportOutputGroup GetLorryAuxGroup();
+		IReportOutputGroup GetHEV_VehicleSequenceGroupWriter();
+		IReportOutputGroup GetHEV_LorryVehicleTypeGroup();
+		IReportOutputGroup GetElectricMachineGroup();
+		IReportOutputGroup GetREESSGroup();
+		IReportOutputGroup GetPEV_LorryVehicleTypeGroup();
+		IReportOutputGroup GetPEV_VehicleSequenceGroupWriter();
+		IReportOutputGroup GetCompletedBusVehicleTypeGroup();
 	}
 }

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/IManufacturerReportFactory.cs

@@ -22,6 +22,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 		IXmlTypeWriter GetPEV_E2_LorryVehicleType();
 		IXmlTypeWriter GetPEV_E3_LorryVehicleType();
 		IXmlTypeWriter GetPEV_E4_LorryVehicleType();
+		IXmlTypeWriter GetPEV_IEPC_LorryVehicleType();
 
 
 
@@ -73,18 +74,18 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 
 
 
-		IMrfVehicleGroup GetGeneralVehicleOutputGroup();
+		IReportVehicleOutputGroup GetGeneralVehicleOutputGroup();
 
 
-		IMrfXmlGroup GetGeneralLorryVehicleOutputGroup();
-		IMrfXmlGroup GetHEV_VehicleSequenceGroup();
-		IMrfXmlGroup GetPEV_VehicleSequenceGroup();
-		IMrfXmlGroup GetConventionalLorryVehicleOutputGroup();
-		IMrfXmlGroup GetHEV_lorryVehicleOutputGroup();
-		IMrfXmlGroup GetPEV_lorryVehicleOutputGroup();
-		IMrfXmlGroup GetHEV_lorryVehicleOutputSequenceGroup();
-		IMrfXmlGroup GetPrimaryBusGeneralVehicleOutputGroup();
-		IMrfXmlGroup GetHEV_PrimaryBusVehicleOutputGroup();
+		IReportOutputGroup GetGeneralLorryVehicleOutputGroup();
+		IReportOutputGroup GetHEV_VehicleSequenceGroup();
+		IReportOutputGroup GetPEV_VehicleSequenceGroup();
+		IReportOutputGroup GetConventionalLorryVehicleOutputGroup();
+		IReportOutputGroup GetHEV_lorryVehicleOutputGroup();
+		IReportOutputGroup GetPEV_lorryVehicleOutputGroup();
+		IReportOutputGroup GetHEV_lorryVehicleOutputSequenceGroup();
+		IReportOutputGroup GetPrimaryBusGeneralVehicleOutputGroup();
+		IReportOutputGroup GetHEV_PrimaryBusVehicleOutputGroup();
 
 
 
@@ -130,10 +131,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 		IMRFBusAuxiliariesType GetCompletedBusElectricSystemType();
 
 
-		IMrfXmlGroup GetPEV_PrimaryBusVehicleOutputGroup();
-		IMrfXmlGroup GetCompletedBusGeneralVehicleOutputGroup();
-		IMrfVehicleGroup GetCompletedBusSequenceGroup();
-		IMrfVehicleGroup GetCompletedBusDimensionSequenceGroup();
+		IReportOutputGroup GetPEV_PrimaryBusVehicleOutputGroup();
+		IReportOutputGroup GetCompletedBusGeneralVehicleOutputGroup();
+		IReportVehicleOutputGroup GetCompletedBusSequenceGroup();
+		IReportVehicleOutputGroup GetCompletedBusDimensionSequenceGroup();
 		IMrfBusAuxGroup GetCompletedBus_HVACSystemGroup();
 		IMrfVehicleType GetBoostingLimitationsType();
 	}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs

@@ -6,17 +6,17 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 {
 	internal abstract class LorryManufacturerReportBase : AbstractManufacturerReport
 	{
-		protected XNamespace _mrf = XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
+		public static XNamespace Mrf => XNamespace.Get("urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9");
 		public LorryManufacturerReportBase(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory) { }
 
 		protected void GenerateReport(string outputDataType)
 		{
-			Report = new XDocument(new XElement(_mrf + "VectoOutput",
-				new XAttribute("xmlns", _mrf),
+			Report = new XDocument(new XElement(Mrf + "VectoOutput",
+				new XAttribute("xmlns", Mrf),
 				new XAttribute(XNamespace.Xmlns + "xsi", xsi),
 				new XAttribute(xsi + "type", $"{outputDataType}"),
 				Vehicle,
-				new XElement(_mrf + "Results")));
+				new XElement(Mrf + "Results")));
 		}
 	}
 
@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			Vehicle = _mRFReportFactory.GetHEV_IEPC_S_LorryComponentsType().GetElement(inputData);
+			Vehicle = _mRFReportFactory.GetHEV_IEPC_S_LorryVehicleType().GetElement(inputData);
 			GenerateReport("HEV-IEPC-S_LorryManufacturerOutputDataType");
 		}
 
@@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 
 		public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
 		{
-			Vehicle = _mRFReportFactory.GetHEV_IEPC_S_LorryVehicleType().GetElement(inputData);
+			Vehicle = _mRFReportFactory.GetPEV_IEPC_LorryVehicleType().GetElement(inputData);
 			GenerateReport("PEV-IEPC_LorryManufacturerOutputDataType");
 		}
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/AbstractMRFGroupWriter.cs

@@ -9,12 +9,12 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
 {
-    public abstract class AbstractMrfXmlGroup : IMrfXmlGroup
+    public abstract class AbstractReportOutputGroup : IReportOutputGroup
     {
 		protected readonly IManufacturerReportFactory _mrfFactory;
 		protected XNamespace _mrf = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9";
 
-		protected AbstractMrfXmlGroup(IManufacturerReportFactory mrfFactory)
+		protected AbstractReportOutputGroup(IManufacturerReportFactory mrfFactory)
 		{
 			_mrfFactory = mrfFactory;
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/GeneralVehicleOutputXmlGroup.cs

@@ -13,9 +13,9 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
 {
-    public class GeneralVehicleOutputXmlGroup : AbstractMrfXmlGroup, IMrfVehicleGroup
+    public class GeneralVehicleOutputOutputXmlGroup : AbstractReportOutputGroup, IReportVehicleOutputGroup
     {
-		public GeneralVehicleOutputXmlGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+		public GeneralVehicleOutputOutputXmlGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 
 		#region Overrides of AbstractMRFGroupWriter
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/HEV-VehicleSequenceGroup.cs

@@ -10,7 +10,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.Lorry
 {
-    internal class HEV_VehicleSequenceGroup : AbstractMrfXmlGroup
+    internal class HEV_VehicleSequenceGroup : AbstractReportOutputGroup
     {
 		public HEV_VehicleSequenceGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs

@@ -10,7 +10,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.Lorry
 {
-    internal class PEV_VehicleSequenceGroup : AbstractMrfXmlGroup
+    internal class PEV_VehicleSequenceGroup : AbstractReportOutputGroup
     {
 		public PEV_VehicleSequenceGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs

@@ -11,7 +11,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.CompletedBus
 {
-    internal class CompletedBusGeneralVehicleOutputGroup : AbstractMrfXmlGroup
+    internal class CompletedBusGeneralVehicleOutputGroup : AbstractReportOutputGroup
     {
 		public CompletedBusGeneralVehicleOutputGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 
@@ -55,9 +55,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 		#endregion
 	}
 
-	internal class CompletedBusSequenceGroup : AbstractMrfXmlGroup, IMrfVehicleGroup
+	internal class CompletedBusSequenceOutputGroup : AbstractReportOutputGroup, IReportVehicleOutputGroup
 	{
-		public CompletedBusSequenceGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+		public CompletedBusSequenceOutputGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 
 		#region Overrides of AbstractMrfXmlGroup
 
@@ -88,9 +88,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 		#endregion
 	}
 
-	internal class CompletedBusDimensionsSequenceGroup : AbstractMrfXmlGroup, IMrfVehicleGroup
+	internal class CompletedBusDimensionsSequenceOutputGroup : AbstractReportOutputGroup, IReportVehicleOutputGroup
 	{
-		public CompletedBusDimensionsSequenceGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
+		public CompletedBusDimensionsSequenceOutputGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 
 		#region Overrides of AbstractMrfXmlGroup
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBusAuxiliaries.cs

@@ -16,7 +16,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
 		IList<XElement> GetElements(IBusAuxiliariesDeclarationData busAuxiliaries);
 
 	}
-    internal class CompletedBus_HVACSystem_Group : AbstractMrfXmlGroup, IMrfBusAuxGroup
+    internal class CompletedBus_HVACSystem_Group : AbstractReportOutputGroup, IMrfBusAuxGroup
     {
 		public CompletedBus_HVACSystem_Group(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/IMRFGroupWriter.cs

@@ -8,12 +8,12 @@ using TUGraz.VectoCommon.InputData;
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
 {
-    public interface IMrfXmlGroup
+    public interface IReportOutputGroup
 	{
 		IList<XElement> GetElements(IDeclarationInputDataProvider inputData);
     }
 
-	public interface IMrfVehicleGroup
+	public interface IReportVehicleOutputGroup
 	{
 		IList<XElement> GetElements(IVehicleDeclarationInputData vehicleData);
 	}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Lorry/ConventionalLorryVehicleGroup.cs

@@ -10,7 +10,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter
 {
-    public class ConventionalLorryVehicleXmlGroup : AbstractMrfXmlGroup
+    public class ConventionalLorryVehicleXmlGroup : AbstractReportOutputGroup
     {
 		public ConventionalLorryVehicleXmlGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }
 

VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Lorry/HEV_LorryVehicleOutputTypeGroup.cs

@@ -9,7 +9,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter.Vehicle.Lorry
 {
-    internal class HEV_LorryVehicleOutputTypeGroup : AbstractMrfXmlGroup
+    internal class HEV_LorryVehicleOutputTypeGroup : AbstractReportOutputGroup
     {
 		public HEV_LorryVehicleOutputTypeGroup(IManufacturerReportFactory mrfFactory) : base(mrfFactory) { }