diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
index 2a9e3a1303811cda6c28ca726e20beab783c2051..bdd1d5d53f2074950b65b153cd4c849fd12aa4b8 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
@@ -361,6 +361,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle
public ArchitectureID ArchitectureID { get; }
public bool OvcHev { get; }
public Watt MaxChargingPower { get; }
+ public VectoSimulationJobType VehicleType { get; }
public virtual ConsumerTechnology DoorDriveTechnology
{
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 3e29459e434faa8445d084e12e8bedbde8ae6d10..7c1a8ae468f67b92996d85fa3ca796654c054970 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -825,6 +825,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public ArchitectureID ArchitectureID { get; }
public bool OvcHev { get; }
public Watt MaxChargingPower { get; }
+ public VectoSimulationJobType VehicleType { get; }
#endregion
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 787d2753bf242dcf3598882d2cad508ecf612ad3..25531274f2168cd087db47f2f1ab439d7146e1d7 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -149,7 +149,6 @@
<Compile Include="Utils\VectoMath.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="InputData\BusInputData.cd" />
<None Include="packages.config" />
<None Include="Properties\Version.tt">
<Generator>TextTemplatingFileGenerator</Generator>
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index d0d40102e4f584fbedb36e150155b5d3f86cda97..66e61a87fc409ddf49730943a20479c48ca8532b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual string JobName => Vehicle.Identifier;
- public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
+ public virtual VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index e7b8aa6659395b914488f5b6e14d4e9f0788f32b..f10ff850b6119bf8106bae028de6d0cde87e5a75 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -41,6 +41,7 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader;
using TUGraz.VectoCore.InputData.Impl;
@@ -659,9 +660,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ConventionalVehicle; }
}
- #endregion
- }
-
// ---------------------------------------------------------------------------------------
@@ -714,7 +712,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ElectricMotorTorqueLimits
=> ElementExists(XMLNames.ElectricMotorTorqueLimits) ? ReadElectricMotorTorqueLimits() : null;
-
+
+ #region Overrides of XMLDeclarationVehicleDataProviderV20
+
+ public override VectoSimulationJobType VehicleType
+ {
+ get => throw new NotImplementedException();
+ }
+
+ #endregion
+
private Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ReadElectricMotorTorqueLimits()
{
var torqueLimitNodes = GetNodes(XMLNames.ElectricMotorTorqueLimits);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
index 22c2952d5112733b45e0da7b96b5760a58e7e678..581433320d65bb091431a3f0e6a3d4280480535e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs
@@ -30,6 +30,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.TPMLM).SI<Kilogram>();
+ #region Overrides of AbstractXMLVehicleDataProviderV24
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ConventionalVehicle; }
+
+ #endregion
+
#region Overrides of XMLDeclarationVehicleDataProviderV10
public override TankSystem? TankSystem =>
@@ -67,7 +73,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
: (TankSystem?)null;
#endregion
-
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ParallelHybridVehicle; }
#region Overrides of XMLDeclarationVehicleDataProviderV10
@@ -106,6 +112,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override TableData BoostingLimitations => null;
#endregion
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.SerialHybridVehicle; }
}
// ---------------------------------------------------------------------------------------
@@ -137,6 +145,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override CubicMeter CargoVolume => null;
#endregion
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.BatteryElectricVehicle; }
}
// ---------------------------------------------------------------------------------------
@@ -157,12 +167,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
-
-
- #endregion
+ #endregion
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.BatteryElectricVehicle; }
}
// ---------------------------------------------------------------------------------------
@@ -201,6 +211,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override TableData BoostingLimitations => null;
#endregion
+
+ public override VectoSimulationJobType VehicleType { get => VectoSimulationJobType.SerialHybridVehicle; }
}
// ---------------------------------------------------------------------------------------
diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
index 8e8d16f2af25001bb7918c82b831ec5291dcb633..b8d0ac0e531ce082fff9f6f2a16d7a046217d3a9 100644
--- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
@@ -72,7 +72,7 @@ namespace TUGraz.VectoCore
LoadModule<GroupWriterNinjectModule>();
LoadModule<ComponentWriterNinjectModule>();
- LoadModule<SimulationFactoryNinjectModule>();
+ LoadModule<SimulatorFactoryNinjectModule>();
LoadModule<MRFNinjectModule>();
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
index 0bd8b87151415bdf5f602e3f60dfbeb497784231..cb2e76c99a4125f5b08c2d4aa303bfeead054fa8 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
@@ -78,7 +78,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
internal class HEV_S3_LorryManufacturerReport : LorryManufacturerReportBase
{
- public HEV_S3_LorryManufacturerReport(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory) { }
+ public HEV_S3_LorryManufacturerReport(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory)
+ {
+
+ }
#region Overrides of AbstractManufacturerReport
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
index 0b34a869f2b7984d75742e3df83ac6e031e42706..5c04d5924efb474595802887e6c6dab16b84fbf2 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/CompletedBus/CompletedBus.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
result.Add(manufacturers);
foreach (var manufacturingStageInputData in multiStageInputData.JobInputData.ManufacturingStages) {
manufacturers.Add(new XElement(_mrf + "Step",
- new XAttribute("Count", manufacturingStageInputData.StageCount),
+ new XAttribute("Count", manufacturingStageInputData.StepCount),
new XElement(_mrf + XMLNames.Component_Manufacturer, manufacturingStageInputData.Vehicle.Manufacturer),
new XElement(_mrf + XMLNames.Component_ManufacturerAddress, manufacturingStageInputData.Vehicle.ManufacturerAddress)));
}
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public IList<XElement> GetElements(IVehicleDeclarationInputData vehicleData)
{
var result = new List<XElement>() {
- new XElement(_mrf + XMLNames.Bus_HeighIntegratedBody, vehicleData.Height.ConvertToMilliMeter().ToXMLFormat(0)),
+ new XElement(_mrf + XMLNames.Bus_HeightIntegratedBody, vehicleData.Height.ConvertToMilliMeter().ToXMLFormat(0)),
new XElement(_mrf + XMLNames.Bus_VehicleLength, vehicleData.Length.ConvertToMilliMeter().ToXMLFormat(0)),
new XElement(_mrf + XMLNames.Bus_VehicleWidth, vehicleData.Width.ConvertToMilliMeter().ToXMLFormat(0))
};
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
index 5e39024b3b818415fd71cafb1c770971b1fa5dbf..2995252474eb2e5c0ebd4631b2b71a8c4fe0377e 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFElectricMachinesType.cs
@@ -35,10 +35,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_CertificationNumber, electricMachine.ElectricMachine.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, electricMachine.ElectricMachine.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.ElectricMachine_ElectricMachineType, electricMachine.ElectricMachine.ElectricMachineType),
- new XElement(_mrf + XMLNames.Component_CertificationMethod, electricMachine.ElectricMachine.CertificationMethod),
- new XElement(_mrf + "RatedPower", electricMachine.ElectricMachine.R85RatedPower.ToXMLFormat(0)),
- new XElement(_mrf + "MaxContinuousPower", (electricMachine.ElectricMachine.ContinuousTorque * electricMachine.ElectricMachine.ContinuousTorqueSpeed).ToXMLFormat(0))
- );
+ new XElement(_mrf + XMLNames.Component_CertificationMethod, electricMachine.ElectricMachine.CertificationMethod));
+ //new XElement(_mrf + "RatedPower", electricMachine.ElectricMachine.R85RatedPower.ToXMLFormat(0)),
+ //new XElement(_mrf + "MaxContinuousPower", (electricMachine.ElectricMachine.ContinuousTorque * electricMachine.ElectricMachine.ContinuousTorqueSpeed).ToXMLFormat(0));
electricMachineElement.Add(electricMachineSystem);
if (electricMachine.ADC != null) {
var adc = electricMachine.ADC;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs
index 46bf54174364a2c3f8df68fb7f0f571864da1471..4e1674408e817ea814f75b31deff6581a0728f9b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCSpecificationsType.cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat()),
- new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
+ //new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
new XElement(_mrf + "NrOfGears", iepcData.Gears.Count),
new XElement(_mrf + "LowestTotalTransmissionRatio", (iepcData.Gears.OrderByDescending(g => g.GearNumber).First().Ratio
* inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio).ToXMLFormat()),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs
index 46bf54174364a2c3f8df68fb7f0f571864da1471..4e1674408e817ea814f75b31deff6581a0728f9b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIepcSpecificationsType.cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat()),
- new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
+ //new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
new XElement(_mrf + "NrOfGears", iepcData.Gears.Count),
new XElement(_mrf + "LowestTotalTransmissionRatio", (iepcData.Gears.OrderByDescending(g => g.GearNumber).First().Ratio
* inputData.JobInputData.Vehicle.Components.AxleGearInputData.Ratio).ToXMLFormat()),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/todo.md b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/todo.md
new file mode 100644
index 0000000000000000000000000000000000000000..a091e9e2ef77fd63c7c9a170c1b6bb458fe19df7
--- /dev/null
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/todo.md
@@ -0,0 +1,87 @@
+///------------------- CIF -------------------
+[ ] Component Order
+
+
+
+
+
+
+
+
+[ ] unit as attribute, define type of unit in OutputDefinitions, add attribute to element
+
+
+ GetValueAsUnit
+
+
+
+
+
+
+///--------------------- MRF -------------------
+
+
+[ ] ??? BoostingLimitations not implemented ?
+
+[ ] TODO: Electricmachine xsd update
+
+[ ] TODO: IEPC MaxContinuousPower ? attribute voltage (attribute) MaxContinuousPower = COntinousTorque * TestSpeedContinuous Torqe (auch bei electric machine) per voltage level
+ [ ] Not implemented yet ? not up to date
+
+
+[ ] REESS Battery Total Usable Capacity in simulation (aus run daten) (eigene Methode) Helper Methode
+
+[ ] Completed Bus Primary Manufacturer as step 1 manufacturer ? yes!
+
+[ ] Off vehicle charging max power
+
+
+[X] VehicleTypeApprovalNumber completed bus mandatory ? leave optional
+
+
+[ ] BusAux Electric System Max AlternatorPower, select alternator where RatedCurrent * RatedVoltage max. (aus run daten, helper methode !!) (now alternator where RatedCurrent * RatedVoltage is max.)
+
+[ ] unit as attribute, define type of unit in OutputDefinitions, add attribute to element
+
+
+
+[x] TODO: Update REESS specifications in XSD schema according to output. (SuperCap!)
+[x] BusAux Electric System ElectricStorage, (currently: sum of electric storages) convert to wh oder kWh einheit einheit als attribut in xml
+
+///--------------------------- DONE -----------------------
+
+[x] Look into axlewheels ()
+
+[X] Reess battery and supercap update in xml schema
+
+
+
+[X] BusAux SmartCompression system not in inputdata for HEV (update xsd scheme)
+
+
+[V] TODO: ?? REESS specifications per battery system - sortiert nach string id aufsteigend
+[x] TODO: HEV_IEPC_S_LorryManufacturerReport
+[X] REESS Battery Nominal voltage //Calculated based on table ANNEXES_LS Page 290
+[X] Split electric system in Conventional/HEV and PEV, (PEV has no alternator)
+
+[x] Vehicle Type Approval number (MRF(x)/CIF)
+
+
+
+
+
+
+ComponentOrder
+
+Engine
+Transmission
+Retarder
+TorqueConverter
+Angledrive
+ElectricMachines
+IEPC
+REESS
+AirDrag
+AxleGear
+AxleWheels
+Auxiliaries
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
index 35d1a1850b8990913920f8f5c323784ea7f49e60..80be3a4c52f8041d500e23c2976a315f1f32f805 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
@@ -1535,7 +1535,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1545,7 +1545,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1555,7 +1555,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1565,7 +1565,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1575,7 +1575,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1589,7 +1589,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1599,7 +1599,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1609,7 +1609,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1619,7 +1619,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1629,7 +1629,7 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
+ <xs:minExclusive value="0.0000"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
index e599fb7d9ef3ac5889b114672faa6bd86efa1998..7d6590cec787bbb1a7ba7193dbee9ee54bb8ee8d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
@@ -1818,10 +1818,22 @@
<xs:documentation>P331 - [W]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Technology" type="v2.10.2:ExemptedTechnologyType">
+ <xs:element name="Technology">
<xs:annotation>
<xs:documentation>P332 - enum</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="HEV Article 9 exempted"/>
+ <xs:enumeration value="PEV Article 9 exempted"/>
+ <xs:enumeration value="HV Article 9 exempted"/>
+ <xs:enumeration value="Fuel cell vehicle"/>
+ <xs:enumeration value="H2 ICE"/>
+ <xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
+ <xs:enumeration value="In-motion charging Article 9 exempted"/>
+ <xs:enumeration value="Other technology Article 9 exempted"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
</xs:sequence>
</xs:extension>
@@ -3057,10 +3069,16 @@
</xs:group>
<xs:group name="BusAuxHVACHeatPumpSequenceGroup">
<xs:sequence>
- <xs:element name="SystemConfiguration" type="v2.10.2:SystemConfigurationType">
+ <xs:element name="SystemConfiguration">
<xs:annotation>
<xs:documentation>P317 - [-]</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:int">
+ <xs:minInclusive value="0"/>
+ <xs:maxInclusive value="10"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
<xs:element name="HeatPumpTypeDriverCompartment">
<xs:complexType>
@@ -3122,10 +3140,16 @@
<xs:documentation>P312 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="AirsuspensionControl" type="v2.10.2:AirsuspensionControlType">
+ <xs:element name="AirsuspensionControl">
<xs:annotation>
<xs:documentation>P315 - enum</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electronically"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
<xs:element name="PneumaticSCRReagentDosing" type="xs:boolean">
<xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
index c188664dfa4357c55acbe17fca519cee59540371..8f5982665b2f2e56d8478b8333bbd40bcf81381e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
@@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9"
+ xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions"
+ xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions"
+ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+ targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- Imports_______________________________________________ -->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" schemaLocation="VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaLocation="VectoDeclarationDefinitions.2.10.2_JobInputData.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<!-- End imports___________________________________________ -->
@@ -275,7 +284,7 @@
<xs:documentation>1.1.3. Vehicle identification number (VIN)</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+ <xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
</xs:element>
<xs:element name="VehicleCategory" type="mrf:LegislativeCategoryType"/>
<xs:element name="AxleConfiguration" type="v1.0:VehicleAxleConfigurationDeclarationType">
@@ -397,7 +406,7 @@
</xs:group>
<xs:group name="HEVVehicleSequenceGroup">
<xs:sequence>
- <xs:element name="HEVArchitecture" type="v2.10.2:ArchitectureID_HEV_Type"/>
+ <xs:element name="HEVArchitecture" type="v2.4:ArchitectureID_HEV_Type"/>
<xs:group ref="mrf:OffVehicleChargingGroup"/>
<xs:element name="ADAS" type="mrf:HEVADASType"/>
<xs:element name="BoostingLimitations" type="mrf:BoostingLimitationsType" minOccurs="0"/>
@@ -405,7 +414,7 @@
</xs:group>
<xs:group name="PEVVehicleSequenceGroup">
<xs:sequence>
- <xs:element name="PEVArchitecture" type="v2.10.2:ArchitectureID_PEV_Type"/>
+ <xs:element name="PEVArchitecture" type="v2.4:ArchitectureID_PEV_Type"/>
<xs:group ref="mrf:OffVehicleChargingGroup"/>
<xs:element name="ADAS" type="mrf:PEVADASType"/>
<xs:element name="BoostingLimitations" type="mrf:BoostingLimitationsType" minOccurs="0"/>
@@ -426,18 +435,18 @@
<xs:element name="CorrectedActualMass" type="v1.0:VehicleCurbMassChassisType"/>
<xs:element name="ZeroEmissionHDV" type="xs:boolean"/>
<xs:element name="HybridElectricHDV" type="xs:boolean"/>
- <xs:element name="ClassBus" type="v2.10.2:RegisteredClassType"/>
+ <xs:element name="ClassBus" type="v2.4:RegisteredClassType"/>
<xs:element name="NumberPassengersUpperDeck" type="xs:int"/>
<xs:element name="NumberPassengersLowerDeck" type="xs:int"/>
- <xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType"/>
+ <xs:element name="BodyworkCode" type="v2.4:VehicleCodeType"/>
<xs:element name="LowEntry" type="xs:boolean"/>
</xs:sequence>
</xs:group>
<xs:group name="CompletedBusVehicleDimensionSequenceGroup">
<xs:sequence>
- <xs:element name="HeightIntegratedBody" type="v2.10.2:VehicleDimensionType"/>
- <xs:element name="VehicleLength" type="v2.10.2:VehicleDimensionType"/>
- <xs:element name="VehicleWidth" type="v2.10.2:VehicleDimensionType"/>
+ <xs:element name="HeightIntegratedBody" type="v2.4:VehicleDimensionType"/>
+ <xs:element name="VehicleLength" type="v2.4:VehicleDimensionType"/>
+ <xs:element name="VehicleWidth" type="v2.4:VehicleDimensionType"/>
</xs:sequence>
</xs:group>
<xs:complexType name="Conventional-LorryVehicleOutputType">
@@ -606,7 +615,7 @@
<xs:complexType name="Exempted-LorryVehicleOutputType">
<xs:sequence>
<xs:group ref="mrf:LorryGeneralVehicleOutputGroup"/>
- <xs:element name="VehicleTechnologyExempted" type="v2.10.2:ExemptedTechnologyType"/>
+ <xs:element name="VehicleTechnologyExempted"/>
<xs:element name="SumNetPower" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -894,9 +903,9 @@
<xs:extension base="mrf:AbstractREESSType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="Capacitance" type="v2.10.1:CapacitanceType"/>
- <xs:element name="MinVoltage" type="v2.10.1:CapacitorVoltageType"/>
- <xs:element name="MaxVoltage" type="v2.10.1:CapacitorVoltageType"/>
+ <xs:element name="Capacitance" type="v2.3:CapacitanceType"/>
+ <xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType"/>
+ <xs:element name="MaxVoltage" type="v2.3:CapacitorVoltageType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -917,37 +926,37 @@
<xs:element name="NominalVoltage" type="xs:int"/>
<xs:element name="TotalStorageCapacity" type="xs:int"/>
<xs:element name="TotalUsableCapacityInSimulation" type="xs:int"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="CertificationMethod"/>
</xs:sequence>
</xs:group>
<!--Auxiliaries-->
<xs:complexType name="ConventionalLorryAuxOutputType">
<xs:sequence>
- <xs:element name="CoolingFanTechnology" type="v2.10.2:AuxFanTechnologyLorryType"/>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyLorryType"/>
+ <xs:element name="CoolingFanTechnology" type="v2.4:AuxFanTechnologyLorryType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyLorryType"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_1"/>
<xs:element name="ElectricSystem" type="mrf:LorryElectricSystemType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="HEVLorryAuxOutputType">
<xs:sequence>
- <xs:element name="CoolingFanTechnology" type="v2.10.2:AuxFanTechnologyLorryType"/>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyLorryType"/>
+ <xs:element name="CoolingFanTechnology" type="v2.4:AuxFanTechnologyLorryType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyLorryType"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_1"/>
<xs:element name="ElectricSystem" type="mrf:LorryElectricSystemType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PEVLorryAuxOutputType">
<xs:sequence>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyLorryType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyLorryType"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_1"/>
<xs:element name="ElectricSystem" type="mrf:LorryElectricSystemType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Conventional_HEV_Px_PrimaryBusAuxOutputType">
<xs:sequence>
- <xs:element name="CoolingFanTechnology" type="v2.10.2:AuxFanTechnologyPrimaryBusType"/>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyPrimaryBusType"/>
+ <xs:element name="CoolingFanTechnology" type="v2.4:AuxFanTechnologyPrimaryBusType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyPrimaryBusType"/>
<xs:element name="ElectricSystem" type="mrf:PrimaryBusElectricSystemType_Conventional_HEV"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_PrimaryBus_Conventional_HEV_P"/>
<xs:element name="HVACSystem" type="mrf:HVACSystemType"/>
@@ -955,8 +964,8 @@
</xs:complexType>
<xs:complexType name="HEVPrimaryBusAuxOutputType">
<xs:sequence>
- <xs:element name="CoolingFanTechnology" type="v2.10.2:AuxFanTechnologyPrimaryBusType"/>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyPrimaryBusType"/>
+ <xs:element name="CoolingFanTechnology" type="v2.4:AuxFanTechnologyPrimaryBusType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyPrimaryBusType"/>
<xs:element name="ElectricSystem" type="mrf:PrimaryBusElectricSystemType_Conventional_HEV"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_PrimaryBus_HEV_S"/>
<xs:element name="HVACSystem">
@@ -968,7 +977,7 @@
</xs:complexType>
<xs:complexType name="PEVPrimaryBusAuxOutputType">
<xs:sequence>
- <xs:element name="SteeringPumpTechnology" type="v2.10.2:AuxSPTechnologyPrimaryBusType"/>
+ <xs:element name="SteeringPumpTechnology" type="v2.4:AuxSPTechnologyPrimaryBusType"/>
<xs:element name="ElectricSystem" type="mrf:PrimaryBusElectricSystemType_PEV"/>
<xs:element name="PneumaticSystem" type="mrf:PneumaticSystemType_PrimaryBus_PEV_IEPC"/>
</xs:sequence>
@@ -1060,13 +1069,13 @@
<xs:group name="ElectricMachineGroup">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="ElectricMachineType"/>
+ <xs:element name="CertificationMethod"/>
</xs:sequence>
</xs:group>
<xs:group name="ElectricMachinePowerGroup">
<xs:sequence>
- <xs:element name="RatedPower" type="v2.10.1:R85RatedPowerType"/>
+ <xs:element name="RatedPower" />
<xs:element name="MaxContinuousPower" type="mrf:RatedPowerType"/>
</xs:sequence>
</xs:group>
@@ -1077,7 +1086,7 @@
<xs:element name="NrOfGears" type="xs:int"/>
<xs:element name="LowestTotalTransmissionRatio" type="v1.0:Double3"/>
<xs:element name="DifferentialIncluded" type="xs:boolean"/>
- <xs:element name="CertificationMethod" type="v2.10.1:IEPCCertificationMethodType"/>
+ <xs:element name="CertificationMethod"/>
</xs:sequence>
</xs:group>
<xs:group name="EngineTorqueLimitationsGroup">
@@ -1125,7 +1134,7 @@
<xs:complexType name="AirdragType">
<xs:sequence>
<xs:element name="Model" type="v1.0:ModelType"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="CertificationMethod" />
<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0"/>
<xs:element name="CdxA" type="v1.0:AirdragCdxAType"/>
<xs:element name="DigestValue" type="xs:token"/>
@@ -1151,13 +1160,13 @@
<xs:complexType name="TorqueConverterType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="CertificationMethod"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RetarderType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="CertificationMethod"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TransmissionType">
@@ -1283,7 +1292,7 @@
<xs:sequence>
<xs:group ref="mrf:CompletedBusGeneralVehicleOutputGroup"/>
<xs:group ref="mrf:CompletedBusVehicleDimensionSequenceGroup"/>
- <xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType"/>
+ <xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType"/>
<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType"/>
</xs:sequence>
@@ -1292,7 +1301,7 @@
<xs:sequence>
<xs:group ref="mrf:CompletedBusGeneralVehicleOutputGroup"/>
<xs:group ref="mrf:CompletedBusVehicleDimensionSequenceGroup"/>
- <xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType"/>
+ <xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType"/>
<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType"/>
</xs:sequence>
</xs:group>
@@ -1300,7 +1309,7 @@
<xs:sequence>
<xs:group ref="mrf:CompletedBusGeneralVehicleOutputGroup"/>
<xs:group ref="mrf:CompletedBusVehicleDimensionSequenceGroup"/>
- <xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType"/>
+ <xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType"/>
</xs:sequence>
</xs:group>
<xs:complexType name="TyreType">
@@ -1310,7 +1319,7 @@
</xs:complexType>
<xs:complexType name="PrimaryBusElectricSystemType_Conventional_HEV">
<xs:sequence>
- <xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnologyType"/>
+ <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnologyType"/>
<xs:element name="MaxAlternatorPower" type="mrf:PowerType" minOccurs="0"/>
<xs:element name="ElectricStorageCapacity" type="mrf:StorageCapacityType" minOccurs="0"/>
</xs:sequence>
@@ -1359,7 +1368,7 @@
</xs:complexType>
<xs:complexType name="PneumaticSystemType_1">
<xs:sequence>
- <xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType"/>
+ <xs:element name="Technology" type="v2.4:AuxPSTechnologyLorryType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CompletedBusElectricSystemType">
@@ -1386,12 +1395,12 @@
<xs:restriction base="xs:int"/>
</xs:simpleType>
<xs:simpleType name="LegislativeCategoryType">
- <xs:union memberTypes="v2.10.2:LegislativeCategoryHeavyLorryDeclarationType v2.10.2:LegislativeCategoryMediumLorryDeclarationType v2.10.2:LegislativeCategoryPrimaryBusDeclarationType"/>
+ <xs:union memberTypes="v2.4:LegislativeCategoryHeavyLorryDeclarationType v2.4:LegislativeCategoryMediumLorryDeclarationType v2.4:LegislativeCategoryPrimaryBusDeclarationType"/>
</xs:simpleType>
<xs:complexType name="ADCType">
<xs:sequence>
<xs:group ref="mrf:ComponentCommonOutputGroup"/>
- <xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
+ <xs:element name="CertificationMethod"/>
<xs:element name="Ratio" type="v1.0:AngledriveRatioType"/>
</xs:sequence>
</xs:complexType>
@@ -1400,7 +1409,7 @@
<xs:sequence>
<!--xs:element name="CoupledAxleNumber" type="xs:int"/-->
<xs:element name="CountAtPosition" type="xs:int"/>
- <xs:element name="Position" type="v2.10.2:PowertrainPositionType"/>
+ <xs:element name="Position" type="v2.4:PowertrainPositionType"/>
</xs:sequence>
<xs:element name="ElectricMachineSystem" type="mrf:ElectricMachineSystemType"/>
<xs:element name="ADC" type="mrf:ADCType" minOccurs="0"/>
@@ -1409,7 +1418,7 @@
</xs:complexType>
<xs:group name="BusAuxHVACHeatPumpSequenceGroup">
<xs:sequence>
- <xs:element name="SystemConfiguration" type="v2.10.2:SystemConfigurationType">
+ <xs:element name="SystemConfiguration">
<xs:annotation>
<xs:documentation>P317 - [-]</xs:documentation>
</xs:annotation>
@@ -1417,12 +1426,12 @@
<xs:element name="HeatPumpTypeDriverCompartment">
<xs:complexType>
<xs:sequence>
- <xs:element name="Cooling" type="v2.10.2:HeatPumpTypeDriverCompartmentType">
+ <xs:element name="Cooling" type="v2.4:HeatPumpTypeDriverCompartmentType">
<xs:annotation>
<xs:documentation>P318 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Heating" type="v2.10.2:HeatPumpTypeDriverCompartmentType">
+ <xs:element name="Heating" type="v2.4:HeatPumpTypeDriverCompartmentType">
<xs:annotation>
<xs:documentation>P319 - enum</xs:documentation>
</xs:annotation>
@@ -1433,12 +1442,12 @@
<xs:element name="HeatPumpTypePassengerCompartment">
<xs:complexType>
<xs:sequence>
- <xs:element name="Cooling" type="v2.10.2:HeatPumpTypePassengerCompartmentType">
+ <xs:element name="Cooling" type="v2.4:HeatPumpTypePassengerCompartmentType">
<xs:annotation>
<xs:documentation>P320 - enum</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Heating" type="v2.10.2:HeatPumpTypePassengerCompartmentType">
+ <xs:element name="Heating" type="v2.4:HeatPumpTypePassengerCompartmentType">
<xs:annotation>
<xs:documentation>P321 - enum</xs:documentation>
</xs:annotation>
@@ -1448,4 +1457,19 @@
</xs:element>
</xs:sequence>
</xs:group>
+ <xs:simpleType name="ExemptedTechnologyType">
+ <xs:annotation>
+ <xs:documentation>P332 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="HEV Article 9 exempted"/>
+ <xs:enumeration value="PEV Article 9 exempted"/>
+ <xs:enumeration value="HV Article 9 exempted"/>
+ <xs:enumeration value="Fuel cell vehicle"/>
+ <xs:enumeration value="H2 ICE"/>
+ <xs:enumeration value="Dual fuel vehicle Article 9 exempted"/>
+ <xs:enumeration value="In-motion charging Article 9 exempted"/>
+ <xs:enumeration value="Other technology Article 9 exempted"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
diff --git a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
index 8d7345564e761c2aa5671d531ad1b1ea9a9ce6b0..11a72766b68e6733a30df4037a1176a0630ca4f4 100644
--- a/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
@@ -279,6 +279,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public ArchitectureID ArchitectureID { get; }
public bool OvcHev { get; }
public Watt MaxChargingPower { get; }
+ public VectoSimulationJobType VehicleType { get; }
public IVehicleComponentsDeclaration Components { get; set; }
public XmlNode XMLSource { get; }
}
diff --git a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
index eb7517af7b3134ef34666401d5fdfd367ea10844..f6dd3182bc10ef95fd181248791d3bf351de1c5a 100644
--- a/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
+++ b/VectoCore/VectoCoreTest/XML/Reports/ManufacturerReportWriterTest.cs
@@ -39,42 +39,42 @@ namespace TUGraz.VectoCore.Tests.XML.Reports
protected ICustomerInformationFileFactory _cifFactory;
protected const string ConventionalHeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\Conventional_heavyLorry_AMT.xml";
protected const string HEV_Px_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV_heavyLorry_AMT_Px_IHPC.xml";
protected const string HEV_S2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_AMT_S2.xml";
protected const string HEV_S3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S3.xml";
protected const string HEV_S4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_S4.xml";
protected const string HEV_IEPC_S_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\HEV-S_heavyLorry_IEPC-S.xml";
protected const string PEV_E2_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_AMT_E2.xml";
protected const string PEV_E3_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E3.xml";
protected const string PEV_E4_HeavyLorry =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\HeavyLorry\PEV_heavyLorry_E4.xml";
protected const string Conventional_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml";
protected const string HEV_Px_IHPC_PrimaryBus =
@"";
protected const string HEV_S2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
protected const string HEV_S3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml";
protected const string HEV_S4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml";
protected const string HEV_IEPC_S_PrimaryBus =
@"";
protected const string PEV_E2_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_AMT_E2.xml";
protected const string PEV_E3_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_E3.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E3.xml";
protected const string PEV_E4_PrimaryBus =
- @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\PEV_primaryBus_E4.xml";
+ @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\PrimaryBus\PEV_primaryBus_E4.xml";
protected const string PEV_IEPC_PrimaryBus =
@"";
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
deleted file mode 100644
index 2abcc0a6799026518aea6383501a518c7a206a5a..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
- <PrimaryVehicle>
- <Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
- <Model>Generic Model Primary</Model>
- <VIN>VEH-1234567890_SmartPS</VIN>
- <Date>2017-02-15T11:00:00Z</Date>
- <LegislativeCategory>M3</LegislativeCategory>
- <ChassisConfiguration>Bus</ChassisConfiguration>
- <AxleConfiguration>6x2</AxleConfiguration>
- <Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
- <IdlingSpeed>600</IdlingSpeed>
- <RetarderType>Transmission Output Retarder</RetarderType>
- <RetarderRatio>1.000</RetarderRatio>
- <AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
- <adas:EngineStopStart>false</adas:EngineStopStart>
- <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
- <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
- <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
- </ADAS>
- <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
- <tcl:Entry gear="6" maxTorque="1800"/>
- <tcl:Entry gear="1" maxTorque="2500"/>
- <tcl:Entry gear="12" maxTorque="1900"/>
- </TorqueLimits>
- <Components xsi:type="VehicleComponentsPIFType">
- <Engine>
- <Data xsi:type="EngineDataPIFType">
- <Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
- <Model>Bus 6x2 Engine</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-02-15T11:00:00Z</Date>
- <AppVersion>VectoEngine x.y</AppVersion>
- <Displacement>12730</Displacement>
- <RatedSpeed>1800</RatedSpeed>
- <RatedPower>325032</RatedPower>
- <MaxEngineTorque>2134</MaxEngineTorque>
- <WHRType>
- <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
- <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
- <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
- </WHRType>
- <Mode>
- <IdlingSpeed>600</IdlingSpeed>
- <FullLoadAndDragCurve>
- <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
- <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
- <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
- <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
- <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
- <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
- <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
- <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
- <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
- <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
- </FullLoadAndDragCurve>
- <Fuels>
- <FuelType>Diesel CI</FuelType>
- </Fuels>
- </Mode>
- </Data>
- </Engine>
- <Transmission>
- <Data xsi:type="TransmissionDataPIFType">
- <Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
- <Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
- <MainCertificationMethod>Standard values</MainCertificationMethod>
- <Date>2017-01-11T11:00:00Z</Date>
- <AppVersion>3.0.1</AppVersion>
- <TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
- <Gear number="1">
- <Ratio>14.930</Ratio>
- <MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="2">
- <Ratio>11.640</Ratio>
- <MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="3">
- <Ratio>9.020</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="4">
- <Ratio>7.040</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="5">
- <Ratio>5.640</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="6">
- <Ratio>4.400</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="7">
- <Ratio>3.390</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="8">
- <Ratio>2.650</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="9">
- <Ratio>2.050</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="10">
- <Ratio>1.600</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="11">
- <Ratio>1.280</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="12">
- <Ratio>1.000</Ratio>
- </Gear>
- </Gears>
- </Data>
- </Transmission>
- <Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
- <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
- <Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
- <CertificationMethod>Standard values</CertificationMethod>
- <Date>2017-01-11T11:00:00Z</Date>
- <AppVersion>3.0.1</AppVersion>
- <LineType>Single portal axle</LineType>
- <Ratio>2.590</Ratio>
- </Data>
- </Axlegear>
- <AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
- <!-- <AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
--->
- <Axles>
- <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <AxleType>VehicleNonDriven</AxleType>
- <TwinTyres>false</TwinTyres>
- <Steered>true</Steered>
- <Tyre>
- <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
- <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
- <Model>Generic Wheel</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-01-11T14:00:00Z</Date>
- <AppVersion>Tyre Generation App 1.0</AppVersion>
- <Dimension>315/70 R22.5</Dimension>
- <RRCDeclared>0.0055</RRCDeclared>
- <FzISO>31300</FzISO>
- </Data>
- <Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
- </di:Reference>
- </Signature>
- </Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <AxleType>VehicleDriven</AxleType>
- <TwinTyres>true</TwinTyres>
- <Steered>false</Steered>
- <Tyre>
- <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
- <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
- <Model>Generic Wheel</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-01-11T14:00:00Z</Date>
- <AppVersion>Tyre Generation App 1.0</AppVersion>
- <Dimension>315/70 R22.5</Dimension>
- <RRCDeclared>0.0063</RRCDeclared>
- <FzISO>31300</FzISO>
- </Data>
- <Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
- </di:Reference>
- </Signature>
- </Tyre>
- </vif0.1:Axle>
- <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <AxleType>VehicleNonDriven</AxleType>
- <TwinTyres>false</TwinTyres>
- <Steered>false</Steered>
- <Tyre>
- <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
- <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
- <Model>Generic Wheel</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-01-11T14:00:00Z</Date>
- <AppVersion>Tyre Generation App 1.0</AppVersion>
- <Dimension>315/70 R22.5</Dimension>
- <RRCDeclared>0.0055</RRCDeclared>
- <FzISO>31300</FzISO>
- </Data>
- <Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
- </di:Reference>
- </Signature>
- </Tyre>
- </vif0.1:Axle>
- </Axles>
- </Data>
- </AxleWheels>
- <Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
- <Fan>
- <Technology>Hydraulic driven - Constant displacement pump</Technology>
- </Fan>
- <SteeringPump>
- <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
- </SteeringPump>
- <ElectricSystem>
- <AlternatorTechnology>conventional</AlternatorTechnology>
- <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- </ElectricSystem>
- <PneumaticSystem>
- <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
- <CompressorDrive>mechanically</CompressorDrive>
- <Clutch>none</Clutch>
- <CompressorRatio>1.000</CompressorRatio>
- <SmartCompressionSystem>true</SmartCompressionSystem>
- <SmartRegenerationSystem>false</SmartRegenerationSystem>
- <AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
- </PneumaticSystem>
- <HVAC>
- <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
- <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
- </HVAC>
- </Data>
- </Auxiliaries>
- </Components>
- </Vehicle>
- <InputDataSignature>
- <di:Reference URI="#VEH-PrimaryBus_SmartPS">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
- </di:Reference>
- </InputDataSignature>
- <ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
- </di:Reference>
- </ManufacturerRecordSignature>
- <Results>
- <Status>success</Status>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1555.73</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1862.57</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1227.15</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1483.80</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1051.58</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1290.13</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1665.49</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">2049.48</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1312.66</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1630.09</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1120.08</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1411.95</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
- <Payload unit="kg">1026.55</Payload>
- <PassengerCount>14.46</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">866.77</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
- <Payload unit="kg">4106.21</Payload>
- <PassengerCount>57.83</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">976.63</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
- <Payload unit="kg">1277.49</Payload>
- <PassengerCount>17.99</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">639.08</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
- <Payload unit="kg">3193.72</Payload>
- <PassengerCount>44.98</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">674.57</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
- <Payload unit="kg">1448.40</Payload>
- <PassengerCount>20.40</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">985.77</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
- <Payload unit="kg">5793.60</Payload>
- <PassengerCount>81.60</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1141.12</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
- <Payload unit="kg">1853.95</Payload>
- <PassengerCount>26.11</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">720.51</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
- <Payload unit="kg">4634.88</Payload>
- <PassengerCount>65.28</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">774.60</CO2>
- </Result>
- </Results>
- <ApplicationInformation>
- <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-27T08:16:48.0278823Z</Date>
- </ApplicationInformation>
- </Data>
- <Signature>
- <di:Reference URI="#PIF-584956b9e3ab43acaf97">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
- </di:Reference>
- </Signature>
- </PrimaryVehicle>
- <ManufacturingStep stepCount="2">
- <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
- <HashPreviousStep>
- <di:Reference>
- <di:DigestMethod Algorithm=""/>
- <di:DigestValue/>
- </di:Reference>
- </HashPreviousStep>
- <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
- <Manufacturer>Some Manufacturer</Manufacturer>
- <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
- <VIN>VEH-1234567890</VIN>
- <Date>2020-01-09T11:00:00Z</Date>
- <Model>Sample Bus Model</Model>
- <LegislativeCategory>M3</LegislativeCategory>
- <CorrectedActualMass>8300</CorrectedActualMass>
- <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
- <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
- <ClassBus>I+II</ClassBus>
- <NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
- <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
- <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
- <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
- <BodyworkCode>CE</BodyworkCode>
- <LowEntry>true</LowEntry>
- <HeightIntegratedBody>3000</HeightIntegratedBody>
- <VehicleLength>11830</VehicleLength>
- <VehicleWidth>2550</VehicleWidth>
- <EntranceHeight>120</EntranceHeight>
- <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
- <VehicleDeclarationType>final</VehicleDeclarationType>
- <VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
- <Components xsi:type="Components_Conventional_CompletedBusType">
- <v2.4:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
- <Manufacturer>Generic Manufacturer</Manufacturer>
- <Model>Generic Model</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-03-24T15:00:00Z</Date>
- <AppVersion>Vecto AirDrag x.y</AppVersion>
- <CdxA_0>6.31</CdxA_0>
- <TransferredCdxA>6.32</TransferredCdxA>
- <DeclaredCdxA>6.34</DeclaredCdxA>
- </Data>
- <Signature>
- <di:Reference URI="#CabinX23h">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
- <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
- </di:Reference>
- </Signature>
- </v2.4:AirDrag>
- <Auxiliaries>
- <Data xsi:type="AUX_Conventional_CompletedBusType">
- <ElectricSystem>
- <LEDLights>
- <Interiorlights>false</Interiorlights>
- <Dayrunninglights>false</Dayrunninglights>
- <Positionlights>false</Positionlights>
- <Brakelights>false</Brakelights>
- <Headlights>false</Headlights>
- </LEDLights>
- </ElectricSystem>
- <HVAC>
- <SystemConfiguration>7</SystemConfiguration>
- <HeatPumpTypeDriverCompartment>
- <Cooling>none</Cooling>
- <Heating>non R-744 2-stage</Heating>
- </HeatPumpTypeDriverCompartment>
- <HeatPumpTypePassengerCompartment>
- <Cooling>non R-744 4-stage</Cooling>
- <Heating>none</Heating>
- </HeatPumpTypePassengerCompartment>
- <AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
- <DoubleGlazing>true</DoubleGlazing>
- <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
- <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
- </HVAC>
- </Data>
- </Auxiliaries>
- </Components>
- </vif0.1:Vehicle>
- <ApplicationInformation>
- <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-27T08:16:48.0278823Z</Date>
- </ApplicationInformation>
- </Data>
- <Signature>
- <di:Reference>
- <di:DigestMethod Algorithm=""/>
- <di:DigestValue/>
- </di:Reference>
- </Signature>
- </ManufacturingStep>
-</VectoOutputMultistep>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
deleted file mode 100644
index 7b67c6a129caa3df120c394dc5ac61f15802c808..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ /dev/null
@@ -1,604 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <PrimaryVehicle>
- <Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
- <Model>Generic Model Primary</Model>
- <VIN>VEH-1234567890_SmartPS</VIN>
- <Date>2017-02-15T11:00:00Z</Date>
- <LegislativeCategory>M3</LegislativeCategory>
- <ChassisConfiguration>Bus</ChassisConfiguration>
- <AxleConfiguration>6x2</AxleConfiguration>
- <Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
- <IdlingSpeed>600</IdlingSpeed>
- <RetarderType>Transmission Output Retarder</RetarderType>
- <RetarderRatio>1.000</RetarderRatio>
- <AngledriveType>None</AngledriveType>
- <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <vif0.1:ADAS xsi:type="ADAS_Conventional_Type" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
- <EngineStopStart>false</EngineStopStart>
- <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
- <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
- <PredictiveCruiseControl>none</PredictiveCruiseControl>
- </vif0.1:ADAS>
- <vif0.1:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Entry gear="6" maxTorque="1800" />
- <Entry gear="1" maxTorque="2500" />
- <Entry gear="12" maxTorque="1900" />
- </vif0.1:TorqueLimits>
- <Components xsi:type="VehicleComponentsPIFType">
- <Engine>
- <Data xsi:type="EngineDataPIFType">
- <Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
- <Model>Bus 6x2 Engine</Model>
- <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
- <Date>2017-02-15T11:00:00Z</Date>
- <AppVersion>VectoEngine x.y</AppVersion>
- <Displacement>12730</Displacement>
- <RatedSpeed>1800</RatedSpeed>
- <RatedPower>325032</RatedPower>
- <MaxEngineTorque>2134</MaxEngineTorque>
- <WHRType>
- <v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
- <v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
- <v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
- </WHRType>
- <Mode>
- <IdlingSpeed>600</IdlingSpeed>
- <FullLoadAndDragCurve>
- <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
- <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
- <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
- <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
- <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
- <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
- <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
- <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
- <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
- <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
- </FullLoadAndDragCurve>
- <Fuels>
- <FuelType>Diesel CI</FuelType>
- </Fuels>
- </Mode>
- </Data>
- </Engine>
- <Transmission>
- <Data xsi:type="TransmissionDataPIFType">
- <Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
- <Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
- <MainCertificationMethod>Standard values</MainCertificationMethod>
- <Date>2017-01-11T11:00:00Z</Date>
- <AppVersion>3.0.1</AppVersion>
- <TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
- <Gear number="1">
- <Ratio>14.930</Ratio>
- <MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="2">
- <Ratio>11.640</Ratio>
- <MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="3">
- <Ratio>9.020</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="4">
- <Ratio>7.040</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="5">
- <Ratio>5.640</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="6">
- <Ratio>4.400</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="7">
- <Ratio>3.390</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="8">
- <Ratio>2.650</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="9">
- <Ratio>2.050</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="10">
- <Ratio>1.600</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="11">
- <Ratio>1.280</Ratio>
- <MaxSpeed>2000</MaxSpeed>
- </Gear>
- <Gear number="12">
- <Ratio>1.000</Ratio>
- </Gear>
- </Gears>
- </Data>
- </Transmission>
- <Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
- <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
- <Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
- <CertificationMethod>Standard values</CertificationMethod>
- <Date>2017-01-11T11:00:00Z</Date>
- <AppVersion>3.0.1</AppVersion>
- <LineType>Single portal axle</LineType>
- <Ratio>2.590</Ratio>
- </Data>
- </Axlegear>
- <AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
- <Axles>
- <Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
- <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
- <v2.0:TwinTyres>false</v2.0:TwinTyres>
- <v2.0:Steered>true</v2.0:Steered>
- <v2.0:Tyre>
- <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
- <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
- <v2.0:Model>Generic Wheel</v2.0:Model>
- <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
- <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
- <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
- <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
- <v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
- <v2.0:FzISO>31300</v2.0:FzISO>
- </v2.0:Data>
- <v2.0:Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
- </di:Reference>
- </v2.0:Signature>
- </v2.0:Tyre>
- </Axle>
- <Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
- <v2.0:AxleType>VehicleDriven</v2.0:AxleType>
- <v2.0:TwinTyres>true</v2.0:TwinTyres>
- <v2.0:Steered>false</v2.0:Steered>
- <v2.0:Tyre>
- <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
- <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
- <v2.0:Model>Generic Wheel</v2.0:Model>
- <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
- <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
- <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
- <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
- <v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
- <v2.0:FzISO>31300</v2.0:FzISO>
- </v2.0:Data>
- <v2.0:Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
- </di:Reference>
- </v2.0:Signature>
- </v2.0:Tyre>
- </Axle>
- <Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
- <v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
- <v2.0:TwinTyres>false</v2.0:TwinTyres>
- <v2.0:Steered>false</v2.0:Steered>
- <v2.0:Tyre>
- <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
- <v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
- <v2.0:Model>Generic Wheel</v2.0:Model>
- <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
- <v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
- <v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
- <v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
- <v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
- <v2.0:FzISO>31300</v2.0:FzISO>
- </v2.0:Data>
- <v2.0:Signature>
- <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
- </di:Reference>
- </v2.0:Signature>
- </v2.0:Tyre>
- </Axle>
- </Axles>
- </Data>
- </AxleWheels>
- <Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
- <Fan>
- <Technology>Hydraulic driven - Constant displacement pump</Technology>
- </Fan>
- <SteeringPump>
- <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
- </SteeringPump>
- <ElectricSystem>
- <AlternatorTechnology>conventional</AlternatorTechnology>
- </ElectricSystem>
- <PneumaticSystem>
- <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
- <CompressorDrive>electrically</CompressorDrive>
- <Clutch>none</Clutch>
- <CompressorRatio>1.000</CompressorRatio>
- <SmartCompressionSystem>true</SmartCompressionSystem>
- <SmartRegenerationSystem>false</SmartRegenerationSystem>
- <AirsuspensionControl>electronically</AirsuspensionControl>
- <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
- </PneumaticSystem>
- <HVAC>
- <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
- <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
- </HVAC>
- </Data>
- </Auxiliaries>
- </Components>
- </Vehicle>
- <InputDataSignature>
- <di:Reference URI="#VEH-PrimaryBus_SmartPS">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>JKmEGO5ChZ+EWf9fu/yxJQldo/kvXaJnmhgcz2YQTpU=</di:DigestValue>
- </di:Reference>
- </InputDataSignature>
- <ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-b24e106754644462913e">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>tCwhy15j1jcO+sj2PNaNEQEcczz0hoj6BhzdsLxMHlo=</di:DigestValue>
- </di:Reference>
- </ManufacturerRecordSignature>
- <Results>
- <Status>success</Status>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.18710</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1553.06</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">25.36235</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1859.11</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.73089</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1226.41</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.22898</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1482.83</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
- <Payload unit="kg">1352.52</Payload>
- <PassengerCount>19.89</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.37825</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1053.96</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
- <Payload unit="kg">6762.60</Payload>
- <PassengerCount>99.45</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.62230</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1291.75</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
- <Payload unit="kg">1294.51</Payload>
- <PassengerCount>18.23</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.83195</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">867.31</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
- <Payload unit="kg">4236.57</Payload>
- <PassengerCount>59.67</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.25049</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">971.29</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.69048</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1663.26</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Heavy Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">27.91380</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">2046.14</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.89886</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1312.02</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Urban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.22866</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1629.41</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
- <Payload unit="kg">1578.29</Payload>
- <PassengerCount>23.21</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.31725</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1122.79</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P33DD</VehicleGroup>
- <Mission>Suburban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
- <Payload unit="kg">7891.43</Payload>
- <PassengerCount>116.05</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.28148</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1413.37</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
- <Payload unit="kg">1254.68</Payload>
- <PassengerCount>17.67</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.94624</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">875.68</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
- <Payload unit="kg">4106.21</Payload>
- <PassengerCount>57.83</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.32545</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">976.78</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
- <Payload unit="kg">1277.49</Payload>
- <PassengerCount>17.99</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">8.71857</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">639.09</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34SD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
- <Payload unit="kg">3193.72</Payload>
- <PassengerCount>44.98</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.20204</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">674.53</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
- <Payload unit="kg">1738.08</Payload>
- <PassengerCount>24.48</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.58782</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">996.02</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Interurban</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
- <Payload unit="kg">5793.60</Payload>
- <PassengerCount>81.60</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.57745</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">1141.86</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
- <Payload unit="kg">1853.95</Payload>
- <PassengerCount>26.11</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.82883</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">720.47</CO2>
- </Result>
- <Result status="success">
- <VehicleGroup>P34DD</VehicleGroup>
- <Mission>Coach</Mission>
- <SimulationParameters>
- <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
- <Payload unit="kg">4634.88</Payload>
- <PassengerCount>65.28</PassengerCount>
- <FuelMode>single fuel mode</FuelMode>
- </SimulationParameters>
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.56696</EnergyConsumption>
- </Fuel>
- <CO2 unit="g/km">774.58</CO2>
- </Result>
- </Results>
- <ApplicationInformation>
- <SimulationToolVersion>0.7.7.2547-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2022-01-27T14:55:40.5963202Z</Date>
- </ApplicationInformation>
- </Data>
- <Signature>
- <di:Reference URI="#VEH-dda89003b1894b738e01">
- <di:Transforms>
- <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
- <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
- </di:Transforms>
- <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>TqJtY535jeu6qydOprHVzvXTRScAKSj4mkDwzpx1y6A=</di:DigestValue>
- </di:Reference>
- </Signature>
- </PrimaryVehicle>
-</VectoOutputMultistep>
\ No newline at end of file