diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs
index 7fe744b9b3e1c9474f7772245fb8ed3e9a6fb1ee..98d1371de90b38596b69ee5ea368be6736f1c99b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/IVIFReportFactory.cs
@@ -66,19 +66,19 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#endregion
- #region Groups
+ #region Parameter Groups
IReportOutputGroup GetConventionalVehicleGroup();
IReportOutputGroup GetPrimaryBusGeneralParameterGroup();
IReportOutputGroup GetPrimaryBusChassisParameterGroup();
IReportOutputGroup GetPrimaryBusRetarderParameterGroup();
- IReportOutputGroup GetPrimaryBusXeVParameterGroup();
+ IReportOutputGroup GetPrimaryBusXevParameterGroup();
- IReportOutputGroup GetHevIepcSVehicleGroup();
- IReportOutputGroup GetHevSxVehicleGroup();
- IReportOutputGroup GetIepcVehicleGroup();
- IReportOutputGroup GetPEVVehicleGroup();
- IReportOutputGroup GetHevPxVehicleGroup();
+ IReportOutputGroup GetHevIepcSVehicleParameterGroup();
+ IReportOutputGroup GetHevSxVehicleParameterGroup();
+ IReportOutputGroup GetIepcVehicleParameterGroup();
+ IReportOutputGroup GetPevVehicleParmeterGroup();
+ IReportOutputGroup GetHevPxVehicleParameterGroup();
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs
index e037f2abd725b3b475febdf330ea49331c7b3a6b..670b768d22442f6618c80de6544956de96da4dc5 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#region Vehicle Group
- Bind<IReportOutputGroup>().To<ConventionalVIFVehicleGroup>().When(AccessedViaVIFFactory)
+ Bind<IReportOutputGroup>().To<ConventionalVIFVehicleParameterGroup>().When(AccessedViaVIFFactory)
.NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetConventionalVehicleGroup());
Bind<IReportOutputGroup>().To<PrimaryBusGeneralParameterGroup>().When(AccessedViaVIFFactory)
@@ -83,22 +83,22 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
.NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusRetarderParameterGroup());
Bind<IReportOutputGroup>().To<PrimaryBusXeVParameterGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusXeVParameterGroup());
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPrimaryBusXevParameterGroup());
- Bind<IReportOutputGroup>().To<HevIepcSVehicleGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSVehicleGroup());
+ Bind<IReportOutputGroup>().To<HevIepcSVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSVehicleParameterGroup());
- Bind<IReportOutputGroup>().To<HevSxVehicleGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevSxVehicleGroup());
+ Bind<IReportOutputGroup>().To<HevSxVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevSxVehicleParameterGroup());
- Bind<IReportOutputGroup>().To<IepcVehicleGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIepcVehicleGroup());
+ Bind<IReportOutputGroup>().To<IepcVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetIepcVehicleParameterGroup());
- Bind<IReportOutputGroup>().To<PEVVehicleGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPEVVehicleGroup());
+ Bind<IReportOutputGroup>().To<PevVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetPevVehicleParmeterGroup());
- Bind<IReportOutputGroup>().To<HevPxVehicleGroup>().When(AccessedViaVIFFactory)
- .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxVehicleGroup());
+ Bind<IReportOutputGroup>().To<HevPxVehicleParameterGroup>().When(AccessedViaVIFFactory)
+ .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxVehicleParameterGroup());
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleParameterGroup.cs
similarity index 89%
rename from VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleGroup.cs
rename to VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleParameterGroup.cs
index bb0a6d13648788aaed44f957506fc3d9cea8e24b..a49bdc545b1e774a841adf85e7c6d963de56d80f 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleGroup.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VehicleParameterGroup.cs
@@ -101,9 +101,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
}
- public class ConventionalVIFVehicleGroup : AbstractVIFGroupWriter
+ public class ConventionalVIFVehicleParameterGroup : AbstractVIFGroupWriter
{
- public ConventionalVIFVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public ConventionalVIFVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -139,9 +139,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
}
- public class HevIepcSVehicleGroup : AbstractVIFGroupWriter
+ public class HevIepcSVehicleParameterGroup : AbstractVIFGroupWriter
{
- public HevIepcSVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public HevIepcSVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -157,7 +157,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
- result.AddRange(_vifReportFactory.GetPrimaryBusXeVParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
result.Add(_vifReportFactory.GetAdasType().GetElement(inputData));
var electricMotorTorque = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
if(electricMotorTorque != null)
@@ -169,9 +169,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#endregion
}
- public class HevSxVehicleGroup : AbstractVIFGroupWriter
+ public class HevSxVehicleParameterGroup : AbstractVIFGroupWriter
{
- public HevSxVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public HevSxVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
- result.AddRange(_vifReportFactory.GetPrimaryBusXeVParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
result.Add(_vifReportFactory.GetAdasType().GetElement(inputData));
var electricMotorTorque = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
if (electricMotorTorque != null)
@@ -199,9 +199,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#endregion
}
- public class IepcVehicleGroup : AbstractVIFGroupWriter
+ public class IepcVehicleParameterGroup : AbstractVIFGroupWriter
{
- public IepcVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public IepcVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -216,7 +216,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
- result.AddRange(_vifReportFactory.GetPrimaryBusXeVParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
result.Add(_vifReportFactory.GetAdasType().GetElement(inputData));
return result;
@@ -225,9 +225,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#endregion
}
- public class PEVVehicleGroup : AbstractVIFGroupWriter
+ public class PevVehicleParameterGroup : AbstractVIFGroupWriter
{
- public PEVVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public PevVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -242,7 +242,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
- result.AddRange(_vifReportFactory.GetPrimaryBusXeVParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
result.Add(_vifReportFactory.GetAdasType().GetElement(inputData));
var motorTorqueLimits = _vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData);
if(motorTorqueLimits != null)
@@ -254,9 +254,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
#endregion
}
- public class HevPxVehicleGroup : AbstractVIFGroupWriter
+ public class HevPxVehicleParameterGroup : AbstractVIFGroupWriter
{
- public HevPxVehicleGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
+ public HevPxVehicleParameterGroup(IVIFReportFactory vifReportFactory) : base(vifReportFactory) { }
#region Overrides of AbstractVIFGroupWriter
@@ -273,7 +273,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
result.Add(new XElement(_vif + XMLNames.Vehicle_AngledriveType, vehicle.Components.AngledriveInputData.Type.ToXMLFormat()));
result.Add(new XElement(_vif + XMLNames.Vehicle_ZeroEmissionVehicle, vehicle.ZeroEmissionVehicle));
result.Add(new XElement(_vif + XMLNames.Vehicle_ArchitectureID, vehicle.ArchitectureID.GetLabel()));
- result.AddRange(_vifReportFactory.GetPrimaryBusXeVParameterGroup().GetElements(inputData));
+ result.AddRange(_vifReportFactory.GetPrimaryBusXevParameterGroup().GetElements(inputData));
result.Add(_vifReportFactory.GetAdasType().GetElement(inputData));
result.Add(_vifReportFactory.GetTorqueLimitsType().GetElement(inputData));
result.Add(_vifReportFactory.GetElectricMotorTorqueLimitsType().GetElement(inputData));