From 9d13dc62d524312c1589195e06a432a4630e509e Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 10 Mar 2021 18:24:04 +0100 Subject: [PATCH] correct type: ouput -> output --- .../VectoCommon/Resources/XMLNames.Designer.cs | 6 +++--- VectoCommon/VectoCommon/Resources/XMLNames.resx | 4 ++-- .../XMLDeclarationInputDataProvider.cs | 2 +- .../XMLDeclarationJobInputDataProvider.cs | 17 +++++++++++++---- .../IXMLDeclarationInputDataReader.cs | 4 +++- ...arationInputDataMultistageV01InjectModule.cs | 2 -- .../Reader/Impl/XMLDeclarationInputReader.cs | 6 +++--- .../Resources/XSD/VectoOutputMultistage.0.1.xsd | 4 ++-- VectoCore/VectoCore/Utils/XMLHelper.cs | 2 +- .../vecto_vehicle-components_1.0.xml | 2 +- .../vecto_multistage_primary_vehicle_only.xml | 2 +- ...cto_multistage_primary_vehicle_stage_2_3.xml | 6 +++--- ..._multistage_primary_vehicle_stage_2_full.xml | 4 ++-- ...istage_primary_vehicle_stage_2_mandatory.xml | 4 ++-- 14 files changed, 37 insertions(+), 28 deletions(-) diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs index ac375e108f..93dc8e5401 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs +++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs @@ -3301,11 +3301,11 @@ namespace TUGraz.VectoCommon.Resources { } /// <summary> - /// Looks up a localized string similar to VectoOuputMultistage. + /// Looks up a localized string similar to VectoOutputMultistage. /// </summary> - public static string VectoOuputMultistage { + public static string VectoOutputMultistage { get { - return ResourceManager.GetString("VectoOuputMultistage", resourceCulture); + return ResourceManager.GetString("VectoOutputMultistage", resourceCulture); } } diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx index d957901567..5eabf0880b 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.resx +++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx @@ -1419,7 +1419,7 @@ <data name="Bus_WaterElectricHeater" xml:space="preserve"> <value>WaterElectricHeater</value> </data> - <data name="VectoOuputMultistage" xml:space="preserve"> - <value>VectoOuputMultistage</value> + <data name="VectoOutputMultistage" xml:space="preserve"> + <value>VectoOutputMultistage</value> </data> </root> \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs index 535f623838..7e10b565da 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs @@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration { public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VectoOuputMultistageType"; + public const string XSD_TYPE = "VectoOutputMultistageType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs index 255c5eea9b..2588274f61 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs @@ -149,16 +149,25 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider public const string XSD_TYPE = "VectoOutputMultistageType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); + private IPrimaryVehicleInformationInputDataProvider _primaryVehicle; + private IList<IManufacturingStageInputData> _manufacturingStages; - public XMLDeclarationMultistageJobInputDataV01(XmlNode node, IXMLMultistageBusInputDataProvider inputProvider, - string fileName) : base(node, fileName) + public XMLDeclarationMultistageJobInputDataV01(XmlNode node, IXMLMultistageBusInputDataProvider inputProvider, string fileName) : base(node, fileName) { InputData = inputProvider; } - public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle { get; } - public IList<IManufacturingStageInputData> ManufacturingStages { get; } + public IPrimaryVehicleInformationInputDataProvider PrimaryVehicle + { + get { return _primaryVehicle ?? (_primaryVehicle = Reader.PrimaryVehicle); } + } + + public IList<IManufacturingStageInputData> ManufacturingStages + { + get { return _manufacturingStages ?? (_manufacturingStages = Reader.ManufacturingStages); } + } + public IXMLMultistageJobReader Reader { get; set; } public IXMLMultistageBusInputDataProvider InputData { get; } protected override XNamespace SchemaNamespace { get; } diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs index 282b57b5d3..756cda139e 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs @@ -25,6 +25,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration public interface IXMLMultistageJobReader { + IPrimaryVehicleInformationInputDataProvider PrimaryVehicle { get; } - } + IList<IManufacturingStageInputData> ManufacturingStages { get; } + } } diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs index 0c3b0a5ed3..11746ab487 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs @@ -15,8 +15,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules Bind<IXMLDeclarationMultistageJobInputData>().To<XMLDeclarationMultistageJobInputDataV01>() .Named(XMLDeclarationMultistageJobInputDataV01.QUALIFIED_XSD_TYPE); - Bind<IXMLDeclarationMultistageJobInputData>().To<XMLDeclarationMultistageJobInputDataV01>(); - Bind<IXMLDeclarationMultistageVehicleBusInputDataReader>().To<XMLDeclarationInputReaderMultistageV01>() .Named(XMLDeclarationInputReaderMultistageV01.QUALIFIED_XSD_TYPE); diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs index ecfdb7875c..fdc3ebfec3 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs @@ -72,7 +72,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VectoOuputMultistageType"; + public const string XSD_TYPE = "VectoOutputMultistageType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); @@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl public IDeclarationMultistageJobInputData JobData { - get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOuputMultistage, JobCreator)); } + get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOutputMultistage, JobCreator)); } } protected virtual IDeclarationMultistageJobInputData JobCreator(string version, XmlNode node, string arg3) @@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl { public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; - public const string XSD_TYPE = "VectoOuputMultistageType"; + public const string XSD_TYPE = "VectoOutputMultistageType"; public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd index daa302884b..ee3100c87e 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd @@ -9,7 +9,7 @@ <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.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/> <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" schemaLocation="VectoDeclarationDefinitions.2.8_Stage.xsd"/> - <xs:element name="VectoOuputMultistage" type="vif:VectoOuputMultistageType"> + <xs:element name="VectoOutputMultistage" type="vif:VectoOutputMultistageType"> <xs:annotation> <xs:documentation>Comment describing your root element</xs:documentation> </xs:annotation> @@ -566,7 +566,7 @@ <xs:enumeration value="Coach"/> </xs:restriction> </xs:simpleType> - <xs:complexType name="VectoOuputMultistageType"> + <xs:complexType name="VectoOutputMultistageType"> <xs:sequence> <xs:element name="PrimaryVehicle" type="vif:PrimaryVehicleType"/> <xs:element name="ManufacturingStage" type="vif:ManufacturingStageType" minOccurs="0" maxOccurs="unbounded"/> diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs index fc5f90dccb..e39bfdde80 100644 --- a/VectoCore/VectoCore/Utils/XMLHelper.cs +++ b/VectoCore/VectoCore/Utils/XMLHelper.cs @@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.Utils case "VectoInputEngineering": return XmlDocumentType.EngineeringJobData; case "VectoComponentEngineering": return XmlDocumentType.EngineeringComponentData; case "VectoOutputPrimaryVehicle": return XmlDocumentType.PrimaryVehicleBusOutputData; - case "VectoOuputMultistage": return XmlDocumentType.MultistageOutputData; + case "VectoOutputMultistage": return XmlDocumentType.MultistageOutputData; } return null; diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml index 25bc6e8f3c..297781894a 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-components_1.0.xml @@ -7,7 +7,7 @@ xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" - xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_ADAS\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" + xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" > <Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType"> <Manufacturer>Generic Truck Manufacturer</Manufacturer> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml index 683ca8a22a..85fd29497c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?> <VectoOuputMultistage 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:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> <Vehicle xsi:type="VehiclePIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> <VIN>VEH-1234567890_nonSmart-ESS</VIN> <Date>2017-02-15T11:00:00Z</Date> <VehicleCategory>Bus</VehicleCategory> <AxleConfiguration>8x2</AxleConfiguration> <Articulated>true</Articulated> <TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass> <IdlingSpeed>600</IdlingSpeed> <RetarderType>Transmission Output Retarder</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType"> <v2.3:EngineStopStart>true</v2.3:EngineStopStart> <v2.3:EcoRollWithoutEngineStop>true</v2.3:EcoRollWithoutEngineStop> <v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop> <v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl> <v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch> </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</Manufacturer> <Model>Bus 6x2</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>true</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</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</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</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> <vif:AxleWheels xsi:type="v2.0:AxleWheelsComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> <Data xsi:type="AxleWheelsDataDeclarationType"> <Axles> <Axle axleNumber="1" xsi:type="AxleDataDeclarationType"> <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> </Axle> <Axle axleNumber="2" xsi:type="AxleDataDeclarationType"> <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> </Axle> <Axle axleNumber="3" xsi:type="AxleDataDeclarationType"> <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> </Axle> </Axles> </Data> </vif:AxleWheels> <Auxiliaries> <vif:Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> <SteeringPump> <Technology axleNumber="1">Variable displacement elec. controlled</Technology> </SteeringPump> <ElectricSystem> <AlternatorTechnology>default</AlternatorTechnology> <SmartElectrics>true</SmartElectrics> <MaxAlternatorPower>15000</MaxAlternatorPower> <ElectricStorageCapacity>50</ElectricStorageCapacity> </ElectricSystem> <PneumaticSystem> <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply> <Clutch>none</Clutch> <CompressorRatio>1.000</CompressorRatio> <SmartCompressionSystem>true</SmartCompressionSystem> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> <AdBlueDosing>true</AdBlueDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger> </HVAC> </vif: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>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue> </di:Reference> </InputDataSignature> <ManufacturerRecordSignature> <di:Reference URI="#RESULT-5f30c7fe665a47938f6b"> <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>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</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>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.82313</EnergyConsumption> </Fuel> <CO2 unit="g/km">866.66</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.24283</EnergyConsumption> </Fuel> <CO2 unit="g/km">970.73</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">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.93701</EnergyConsumption> </Fuel> <CO2 unit="g/km">875.01</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">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.58335</EnergyConsumption> </Fuel> <CO2 unit="g/km">995.69</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>String</SimulationToolVersion> <Date>2017-01-01T00:00:00Z</Date> </ApplicationInformation> </Data> <Signature> <di:Reference URI="#PIF-d10aff76c5d149948046"> <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>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue> </di:Reference> </Signature> </PrimaryVehicle> </VectoOuputMultistage> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> <VectoOutputMultistage 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:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> <Vehicle xsi:type="VehiclePIFType"> <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle> <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle> <Model>Generic Model</Model> <VIN>VEH-1234567890_nonSmart-ESS</VIN> <Date>2017-02-15T11:00:00Z</Date> <VehicleCategory>Bus</VehicleCategory> <AxleConfiguration>8x2</AxleConfiguration> <Articulated>true</Articulated> <TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass> <IdlingSpeed>600</IdlingSpeed> <RetarderType>Transmission Output Retarder</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType"> <v2.3:EngineStopStart>true</v2.3:EngineStopStart> <v2.3:EcoRollWithoutEngineStop>true</v2.3:EcoRollWithoutEngineStop> <v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop> <v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl> <v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch> </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</Manufacturer> <Model>Bus 6x2</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>true</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</Manufacturer> <Model>Generic 40t Long Haul Truck Gearbox</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</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> <vif:AxleWheels xsi:type="v2.0:AxleWheelsComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> <Data xsi:type="AxleWheelsDataDeclarationType"> <Axles> <Axle axleNumber="1" xsi:type="AxleDataDeclarationType"> <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> </Axle> <Axle axleNumber="2" xsi:type="AxleDataDeclarationType"> <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> </Axle> <Axle axleNumber="3" xsi:type="AxleDataDeclarationType"> <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> </Axle> </Axles> </Data> </vif:AxleWheels> <Auxiliaries> <vif:Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"> <Fan> <Technology>Hydraulic driven - Constant displacement pump</Technology> </Fan> <SteeringPump> <Technology axleNumber="1">Variable displacement elec. controlled</Technology> </SteeringPump> <ElectricSystem> <AlternatorTechnology>default</AlternatorTechnology> <SmartElectrics>true</SmartElectrics> <MaxAlternatorPower>15000</MaxAlternatorPower> <ElectricStorageCapacity>50</ElectricStorageCapacity> </ElectricSystem> <PneumaticSystem> <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply> <Clutch>none</Clutch> <CompressorRatio>1.000</CompressorRatio> <SmartCompressionSystem>true</SmartCompressionSystem> <SmartRegenerationSystem>false</SmartRegenerationSystem> <AirsuspensionControl>electronically</AirsuspensionControl> <AdBlueDosing>true</AdBlueDosing> </PneumaticSystem> <HVAC> <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat> <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger> </HVAC> </vif: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>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue> </di:Reference> </InputDataSignature> <ManufacturerRecordSignature> <di:Reference URI="#RESULT-5f30c7fe665a47938f6b"> <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>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</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>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.82313</EnergyConsumption> </Fuel> <CO2 unit="g/km">866.66</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.24283</EnergyConsumption> </Fuel> <CO2 unit="g/km">970.73</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">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.93701</EnergyConsumption> </Fuel> <CO2 unit="g/km">875.01</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">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.58335</EnergyConsumption> </Fuel> <CO2 unit="g/km">995.69</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>String</SimulationToolVersion> <Date>2017-01-01T00:00:00Z</Date> </ApplicationInformation> </Data> <Signature> <di:Reference URI="#PIF-d10aff76c5d149948046"> <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>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue> </di:Reference> </Signature> </PrimaryVehicle> </VectoOutputMultistage> \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml index 5ecd22c30a..4ea014d30a 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<VectoOuputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" +<VectoOutputMultistage 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" @@ -8,7 +8,7 @@ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" -xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd"> +xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd"> <PrimaryVehicle> <Data id="text" xsi:type="PrimaryVehicleDataType"> <Vehicle xsi:type="VehiclePIFType"> @@ -718,4 +718,4 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </di:Reference> </Signature> </ManufacturingStage> -</VectoOuputMultistage> +</VectoOutputMultistage> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml index d3e68a1ca4..449565cb38 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<VectoOuputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" +<VectoOutputMultistage 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" @@ -720,4 +720,4 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </di:Reference> </Signature> </ManufacturingStage> -</VectoOuputMultistage> +</VectoOutputMultistage> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml index fb7d20358f..f709805573 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<VectoOuputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" +<VectoOutputMultistage 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" @@ -646,4 +646,4 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </di:Reference> </Signature> </ManufacturingStage> -</VectoOuputMultistage> +</VectoOutputMultistage> -- GitLab