From 1bc0ba37b920dfe1543cad07a0f120782b5a29ac Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 27 Feb 2020 08:27:03 +0100 Subject: [PATCH] renaming files --- .../DeclarationDataAdapterPrimaryBus.cs | 10 +- .../Models/Declaration/SteeringPumpBus.cs | 4 +- .../{SP-Axles.csv => SP-Axles_Bus.csv} | 0 .../{SP-Factors.csv => SP-Factors_Bus.csv} | 0 ...avyBus_PIF.xml => PIF-heavyBus-sample.xml} | 0 ...cto_vehicle-completed_heavyBus-sample.xml} | 0 ... => vecto_vehicle-medium_lorry-sample.xml} | 0 .../vecto_vehicle-medium_lorryFWD-sample.xml | 553 ++++++++++++++++++ ...vecto_vehicle-primary_heavyBus-sample.xml} | 0 .../XML/XMLCompleteBusReaderTest.cs | 2 +- .../XMLPrimaryVehicleReportBusReaderTest.cs | 2 +- VectoCore/VectoXML.spp | 9 +- 12 files changed, 568 insertions(+), 12 deletions(-) rename VectoCore/VectoCore/Resources/Declaration/VAUXBus/{SP-Axles.csv => SP-Axles_Bus.csv} (100%) rename VectoCore/VectoCore/Resources/Declaration/VAUXBus/{SP-Factors.csv => SP-Factors_Bus.csv} (100%) rename VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/{example_heavyBus_PIF.xml => PIF-heavyBus-sample.xml} (100%) rename VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/{vecto_vehicle-completed_heavyBus.xml => vecto_vehicle-completed_heavyBus-sample.xml} (100%) rename VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/{vecto_vehicle-medium_lorry.xml => vecto_vehicle-medium_lorry-sample.xml} (100%) create mode 100644 VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorryFWD-sample.xml rename VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/{vecto_vehicle-primary_heavyBus.xml => vecto_vehicle-primary_heavyBus-sample.xml} (100%) diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs index acf02cf279..4bb32b7396 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs @@ -205,19 +205,19 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter var resource = ""; switch (compressorSize) { case "Small": - resource = "DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP"; + resource = "DEFAULT_1-Cylinder_1-Stage_393ccm.acmp"; break; case "Medium Supply 1-stage": - resource = "DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP"; + resource = "DEFAULT_1-Cylinder_1-Stage_393ccm.acmp"; break; case "Medium Supply 2-stage": - resource = "DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP"; + resource = "DEFAULT_2-Cylinder_1-Stage_650ccm.acmp"; break; case "Large Supply 1-stage": - resource = "DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP"; + resource = "DEFAULT_2-Cylinder_2-Stage_398ccm.acmp"; break; case "Large Supply 2-stage": - resource = "DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP"; + resource = "DEFAULT_3-Cylinder_2-Stage_598ccm.acmp"; break; default: throw new ArgumentException(string.Format("unkown compressor size {0}"), compressorSize); } diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs index dee1d61aa9..35d34077a4 100644 --- a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs +++ b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs @@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Models.Declaration { { #region Overrides of LookupData - protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Axles.csv"; } } + protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Axles_Bus.csv"; } } protected override string ErrorMessage { get { return "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'"; } } protected override void ParseData(DataTable table) { @@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Models.Declaration { { #region Overrides of LookupData - protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Factors.csv"; } } + protected override string ResourceId { get { return DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus.SP-Factors_Bus.csv"; } } protected override string ErrorMessage { get { return "Auxiliary Lookup Error: No value found for Steering Pump. Mission: '{0}', HDVClass: '{1}'"; } } protected override void ParseData(DataTable table) { diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Axles.csv b/VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Axles_Bus.csv similarity index 100% rename from VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Axles.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Axles_Bus.csv diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Factors.csv b/VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Factors_Bus.csv similarity index 100% rename from VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Factors.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUXBus/SP-Factors_Bus.csv diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml similarity index 100% rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus-sample.xml similarity index 100% rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus-sample.xml diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml similarity index 100% rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry.xml rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorryFWD-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorryFWD-sample.xml new file mode 100644 index 0000000000..500c9b3a21 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorryFWD-sample.xml @@ -0,0 +1,553 @@ +<?xml version="1.0" encoding="utf-8"?> +<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd +urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.1.xsd urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationDefinitions.2.6_Buses.xsd"> + <v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="VehicleMediumLorryDeclarationType"> + <Manufacturer>Generic Vendor</Manufacturer> + <ManufacturerAddress>N.A.</ManufacturerAddress> + <Model>class 5_Class-5_5t0</Model> + <VIN>standard values</VIN> + <Date>2017-09-26T15:33:45.0798047Z</Date> + <LegislativeClass>N3</LegislativeClass> + <VehicleCategory>Van</VehicleCategory> + <AxleConfiguration>4x2F</AxleConfiguration> + <CurbMassChassis>8229</CurbMassChassis> + <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass> + <IdlingSpeed>100</IdlingSpeed> + <RetarderType>Transmission Output Retarder</RetarderType> + <RetarderRatio>1.000</RetarderRatio> + <AngledriveType>None</AngledriveType> + <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <v2.6:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="v2.1:AdvancedDriverAssistantSystemsType"> + <EngineStopStart>false</EngineStopStart> + <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop> + <EcoRollWithEngineStop>false</EcoRollWithEngineStop> + <PredictiveCruiseControl>none</PredictiveCruiseControl> + </v2.6:ADAS> + <Components xsi:type="VehicleComponentsNoAxlegearType"> + <Engine> + <v2.0:Data id="ENG-350kW_IVT_12l" xsi:type="v1.0:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>350kW_IVT_12l</Model> + <CertificationNumber>ENG-350kW_IVT_12l</CertificationNumber> + <Date>2017-09-26T15:33:45.0954248Z</Date> + <AppVersion>VectoCore</AppVersion> + <Displacement>12700</Displacement> + <IdlingSpeed>600</IdlingSpeed> + <RatedSpeed>1736</RatedSpeed> + <RatedPower>325032</RatedPower> + <MaxEngineTorque>2134</MaxEngineTorque> + <WHTCUrban>1.0400</WHTCUrban> + <WHTCRural>1.0100</WHTCRural> + <WHTCMotorway>1.0000</WHTCMotorway> + <BFColdHot>1.0000</BFColdHot> + <CFRegPer>1.0000</CFRegPer> + <CFNCV>1.0000</CFNCV> + <FuelType>Diesel CI</FuelType> + <FuelConsumptionMap> + <Entry engineSpeed="600.00" torque="-150.00" fuelConsumption="0.00"/> + <Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1459.00"/> + <Entry engineSpeed="600.00" torque="216.90" fuelConsumption="3538.75"/> + <Entry engineSpeed="600.00" torque="433.80" fuelConsumption="5936.91"/> + <Entry engineSpeed="600.00" torque="650.70" fuelConsumption="8584.95"/> + <Entry engineSpeed="600.00" torque="867.60" fuelConsumption="10708.27"/> + <Entry engineSpeed="600.00" torque="1084.50" fuelConsumption="13054.00"/> + <Entry engineSpeed="600.00" torque="1301.40" fuelConsumption="15575.45"/> + <Entry engineSpeed="600.00" torque="1518.30" fuelConsumption="18097.57"/> + <Entry engineSpeed="600.00" torque="1735.20" fuelConsumption="20619.68"/> + <Entry engineSpeed="600.00" torque="1952.10" fuelConsumption="23141.80"/> + <Entry engineSpeed="600.00" torque="2169.00" fuelConsumption="25663.92"/> + <Entry engineSpeed="748.90" torque="-153.25" fuelConsumption="0.00"/> + <Entry engineSpeed="748.90" torque="0.00" fuelConsumption="1771.69"/> + <Entry engineSpeed="748.90" torque="216.90" fuelConsumption="4287.77"/> + <Entry engineSpeed="748.90" torque="433.80" fuelConsumption="7329.06"/> + <Entry engineSpeed="748.90" torque="650.70" fuelConsumption="10252.92"/> + <Entry engineSpeed="748.90" torque="867.60" fuelConsumption="13214.55"/> + <Entry engineSpeed="748.90" torque="1084.50" fuelConsumption="16271.09"/> + <Entry engineSpeed="748.90" torque="1301.40" fuelConsumption="19504.44"/> + <Entry engineSpeed="748.90" torque="1518.30" fuelConsumption="22715.90"/> + <Entry engineSpeed="748.90" torque="1735.20" fuelConsumption="26067.02"/> + <Entry engineSpeed="748.90" torque="1952.10" fuelConsumption="29381.05"/> + <Entry engineSpeed="748.90" torque="2169.00" fuelConsumption="32699.96"/> + <Entry engineSpeed="897.80" torque="-159.33" fuelConsumption="0.00"/> + <Entry engineSpeed="897.80" torque="0.00" fuelConsumption="2361.15"/> + <Entry engineSpeed="897.80" torque="216.90" fuelConsumption="5371.49"/> + <Entry engineSpeed="897.80" torque="433.80" fuelConsumption="8747.43"/> + <Entry engineSpeed="897.80" torque="650.70" fuelConsumption="12019.87"/> + <Entry engineSpeed="897.80" torque="867.60" fuelConsumption="15642.49"/> + <Entry engineSpeed="897.80" torque="1084.50" fuelConsumption="19348.62"/> + <Entry engineSpeed="897.80" torque="1301.40" fuelConsumption="23071.10"/> + <Entry engineSpeed="897.80" torque="1518.30" fuelConsumption="26864.31"/> + <Entry engineSpeed="897.80" torque="1735.20" fuelConsumption="30815.18"/> + <Entry engineSpeed="897.80" torque="1952.10" fuelConsumption="34854.40"/> + <Entry engineSpeed="897.80" torque="2169.00" fuelConsumption="39155.09"/> + <Entry engineSpeed="1046.70" torque="-167.79" fuelConsumption="0.00"/> + <Entry engineSpeed="1046.70" torque="0.00" fuelConsumption="2968.21"/> + <Entry engineSpeed="1046.70" torque="216.90" fuelConsumption="6463.69"/> + <Entry engineSpeed="1046.70" torque="433.80" fuelConsumption="10102.67"/> + <Entry engineSpeed="1046.70" torque="650.70" fuelConsumption="13853.76"/> + <Entry engineSpeed="1046.70" torque="867.60" fuelConsumption="18068.71"/> + <Entry engineSpeed="1046.70" torque="1084.50" fuelConsumption="22383.70"/> + <Entry engineSpeed="1046.70" torque="1301.40" fuelConsumption="26543.40"/> + <Entry engineSpeed="1046.70" torque="1518.30" fuelConsumption="30847.65"/> + <Entry engineSpeed="1046.70" torque="1735.20" fuelConsumption="35304.67"/> + <Entry engineSpeed="1046.70" torque="1952.10" fuelConsumption="40046.29"/> + <Entry engineSpeed="1046.70" torque="2169.00" fuelConsumption="45162.72"/> + <Entry engineSpeed="1195.57" torque="-178.58" fuelConsumption="0.00"/> + <Entry engineSpeed="1195.57" torque="0.00" fuelConsumption="3297.21"/> + <Entry engineSpeed="1195.57" torque="216.90" fuelConsumption="7191.55"/> + <Entry engineSpeed="1195.57" torque="433.80" fuelConsumption="11289.50"/> + <Entry engineSpeed="1195.57" torque="650.70" fuelConsumption="15720.59"/> + <Entry engineSpeed="1195.57" torque="867.60" fuelConsumption="20580.22"/> + <Entry engineSpeed="1195.57" torque="1084.50" fuelConsumption="25484.81"/> + <Entry engineSpeed="1195.57" torque="1301.40" fuelConsumption="30222.77"/> + <Entry engineSpeed="1195.57" torque="1518.30" fuelConsumption="35006.22"/> + <Entry engineSpeed="1195.57" torque="1735.20" fuelConsumption="40026.60"/> + <Entry engineSpeed="1195.57" torque="1952.10" fuelConsumption="45496.89"/> + <Entry engineSpeed="1195.57" torque="2169.00" fuelConsumption="50854.10"/> + <Entry engineSpeed="1359.19" torque="-197.42" fuelConsumption="0.00"/> + <Entry engineSpeed="1359.19" torque="0.00" fuelConsumption="4102.15"/> + <Entry engineSpeed="1359.19" torque="216.90" fuelConsumption="8260.52"/> + <Entry engineSpeed="1359.19" torque="433.80" fuelConsumption="13082.44"/> + <Entry engineSpeed="1359.19" torque="650.70" fuelConsumption="18126.41"/> + <Entry engineSpeed="1359.19" torque="867.60" fuelConsumption="23245.61"/> + <Entry engineSpeed="1359.19" torque="1084.50" fuelConsumption="28611.71"/> + <Entry engineSpeed="1359.19" torque="1301.40" fuelConsumption="34186.01"/> + <Entry engineSpeed="1359.19" torque="1518.30" fuelConsumption="39773.96"/> + <Entry engineSpeed="1359.19" torque="1735.20" fuelConsumption="45940.37"/> + <Entry engineSpeed="1359.19" torque="1952.10" fuelConsumption="52485.97"/> + <Entry engineSpeed="1359.19" torque="2169.00" fuelConsumption="58360.23"/> + <Entry engineSpeed="1484.00" torque="-216.03" fuelConsumption="0.00"/> + <Entry engineSpeed="1484.00" torque="0.00" fuelConsumption="4684.84"/> + <Entry engineSpeed="1484.00" torque="216.90" fuelConsumption="9190.80"/> + <Entry engineSpeed="1484.00" torque="433.80" fuelConsumption="14455.69"/> + <Entry engineSpeed="1484.00" torque="650.70" fuelConsumption="19929.18"/> + <Entry engineSpeed="1484.00" torque="867.60" fuelConsumption="25556.30"/> + <Entry engineSpeed="1484.00" torque="1084.50" fuelConsumption="31326.33"/> + <Entry engineSpeed="1484.00" torque="1301.40" fuelConsumption="37363.82"/> + <Entry engineSpeed="1484.00" torque="1518.30" fuelConsumption="43571.91"/> + <Entry engineSpeed="1484.00" torque="1735.20" fuelConsumption="50460.82"/> + <Entry engineSpeed="1484.00" torque="1952.10" fuelConsumption="57604.52"/> + <Entry engineSpeed="1484.00" torque="2169.00" fuelConsumption="64181.14"/> + <Entry engineSpeed="1608.90" torque="-236.34" fuelConsumption="0.00"/> + <Entry engineSpeed="1608.90" torque="0.00" fuelConsumption="5261.40"/> + <Entry engineSpeed="1608.90" torque="216.90" fuelConsumption="10199.91"/> + <Entry engineSpeed="1608.90" torque="433.80" fuelConsumption="15846.19"/> + <Entry engineSpeed="1608.90" torque="650.70" fuelConsumption="21747.18"/> + <Entry engineSpeed="1608.90" torque="867.60" fuelConsumption="28037.21"/> + <Entry engineSpeed="1608.90" torque="1084.50" fuelConsumption="34232.36"/> + <Entry engineSpeed="1608.90" torque="1301.40" fuelConsumption="40669.25"/> + <Entry engineSpeed="1608.90" torque="1518.30" fuelConsumption="47498.48"/> + <Entry engineSpeed="1608.90" torque="1735.20" fuelConsumption="55015.01"/> + <Entry engineSpeed="1608.90" torque="1952.10" fuelConsumption="62654.92"/> + <Entry engineSpeed="1608.90" torque="2169.00" fuelConsumption="70071.75"/> + <Entry engineSpeed="1733.80" torque="-253.92" fuelConsumption="0.00"/> + <Entry engineSpeed="1733.80" torque="0.00" fuelConsumption="6010.80"/> + <Entry engineSpeed="1733.80" torque="216.90" fuelConsumption="11536.09"/> + <Entry engineSpeed="1733.80" torque="433.80" fuelConsumption="17479.05"/> + <Entry engineSpeed="1733.80" torque="650.70" fuelConsumption="23999.56"/> + <Entry engineSpeed="1733.80" torque="867.60" fuelConsumption="30943.62"/> + <Entry engineSpeed="1733.80" torque="1084.50" fuelConsumption="37482.51"/> + <Entry engineSpeed="1733.80" torque="1301.40" fuelConsumption="44617.51"/> + <Entry engineSpeed="1733.80" torque="1518.30" fuelConsumption="52071.25"/> + <Entry engineSpeed="1733.80" torque="1735.20" fuelConsumption="60004.29"/> + <Entry engineSpeed="1733.80" torque="1952.10" fuelConsumption="68251.45"/> + <Entry engineSpeed="1733.80" torque="2169.00" fuelConsumption="76381.09"/> + <Entry engineSpeed="1858.61" torque="-274.22" fuelConsumption="0.00"/> + <Entry engineSpeed="1858.61" torque="0.00" fuelConsumption="7204.51"/> + <Entry engineSpeed="1858.61" torque="216.90" fuelConsumption="13143.55"/> + <Entry engineSpeed="1858.61" torque="433.80" fuelConsumption="19338.96"/> + <Entry engineSpeed="1858.61" torque="650.70" fuelConsumption="26272.46"/> + <Entry engineSpeed="1858.61" torque="867.60" fuelConsumption="33838.94"/> + <Entry engineSpeed="1858.61" torque="1084.50" fuelConsumption="41281.10"/> + <Entry engineSpeed="1858.61" torque="1301.40" fuelConsumption="49065.71"/> + <Entry engineSpeed="1858.61" torque="1518.30" fuelConsumption="57066.15"/> + <Entry engineSpeed="1858.61" torque="1735.20" fuelConsumption="65324.35"/> + <Entry engineSpeed="1858.61" torque="1952.10" fuelConsumption="73876.10"/> + <Entry engineSpeed="1858.61" torque="2169.00" fuelConsumption="82384.30"/> + </FuelConsumptionMap> + <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> + </v2.0:Data> + <v2.0:Signature> + <Reference URI="#ENG-350kW_IVT_12l" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </v2.0:Signature> + </Engine> + <v2.6:Gearbox> + <v2.0:Data id="GBX-GB_12-gear" xsi:type="v2.6:GearboxDataDeclarationType"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>GB_12-gear</Model> + <CertificationNumber>GBX-GB_12-gear</CertificationNumber> + <Date>2017-09-26T15:33:45.0954248Z</Date> + <AppVersion>VectoCore</AppVersion> + <TransmissionType>AMT</TransmissionType> + <MainCertificationMethod>Standard values</MainCertificationMethod> + <DifferentialIncluded>true</DifferentialIncluded> + <AxlegearRatio>2.600</AxlegearRatio> + <v2.6:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> + <Gear number="1"> + <Ratio>14.930</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="2"> + <Ratio>11.640</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="3"> + <Ratio>9.020</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="4"> + <Ratio>7.040</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="5"> + <Ratio>5.640</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="6"> + <Ratio>4.400</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="7"> + <Ratio>3.390</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="8"> + <Ratio>2.650</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="9"> + <Ratio>2.050</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="10"> + <Ratio>1.600</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="11"> + <Ratio>1.280</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/> + </TorqueLossMap> + </Gear> + <Gear number="12"> + <Ratio>1.000</Ratio> + <TorqueLossMap> + <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00"/> + <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/> + <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00"/> + <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/> + <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/> + <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/> + <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00"/> + </TorqueLossMap> + </Gear> + </v2.6:Gears> + </v2.0:Data> + <v2.0:Signature> + <Reference URI="#GBX-GB_12-gear" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </v2.0:Signature> + </v2.6:Gearbox> + <v2.6:Retarder xsi:type="v2.0:RetarderComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> + <Data id="RET-RET-generic" xsi:type="RetarderDataDeclarationType"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>RET-generic</Model> + <CertificationNumber>standard values</CertificationNumber> + <Date>2017-09-26T15:33:45.0954248Z</Date> + <AppVersion>VectoCore</AppVersion> + <CertificationMethod>Standard values</CertificationMethod> + <RetarderLossMap> + <Entry retarderSpeed="0.00" torqueLoss="10.00"/> + <Entry retarderSpeed="100.00" torqueLoss="10.00"/> + <Entry retarderSpeed="200.00" torqueLoss="10.10"/> + <Entry retarderSpeed="300.00" torqueLoss="10.20"/> + <Entry retarderSpeed="400.00" torqueLoss="10.30"/> + <Entry retarderSpeed="500.00" torqueLoss="10.50"/> + <Entry retarderSpeed="600.00" torqueLoss="10.70"/> + <Entry retarderSpeed="700.00" torqueLoss="11.00"/> + <Entry retarderSpeed="800.00" torqueLoss="11.30"/> + <Entry retarderSpeed="900.00" torqueLoss="11.60"/> + <Entry retarderSpeed="1000.00" torqueLoss="12.00"/> + <Entry retarderSpeed="1100.00" torqueLoss="12.40"/> + <Entry retarderSpeed="1200.00" torqueLoss="12.90"/> + <Entry retarderSpeed="1300.00" torqueLoss="13.40"/> + <Entry retarderSpeed="1400.00" torqueLoss="13.90"/> + <Entry retarderSpeed="1500.00" torqueLoss="14.50"/> + <Entry retarderSpeed="1600.00" torqueLoss="15.10"/> + <Entry retarderSpeed="1700.00" torqueLoss="15.80"/> + <Entry retarderSpeed="1800.00" torqueLoss="16.50"/> + <Entry retarderSpeed="1900.00" torqueLoss="17.20"/> + <Entry retarderSpeed="2000.00" torqueLoss="18.00"/> + <Entry retarderSpeed="2100.00" torqueLoss="18.80"/> + <Entry retarderSpeed="2200.00" torqueLoss="19.70"/> + <Entry retarderSpeed="2300.00" torqueLoss="20.60"/> + <Entry retarderSpeed="2400.00" torqueLoss="21.50"/> + <Entry retarderSpeed="2500.00" torqueLoss="22.50"/> + <Entry retarderSpeed="2600.00" torqueLoss="23.50"/> + <Entry retarderSpeed="2700.00" torqueLoss="24.60"/> + <Entry retarderSpeed="2800.00" torqueLoss="25.70"/> + <Entry retarderSpeed="2900.00" torqueLoss="26.80"/> + <Entry retarderSpeed="3000.00" torqueLoss="28.00"/> + </RetarderLossMap> + </Data> + <Signature> + <Reference URI="#RET-RET-generic" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </Signature> + </v2.6:Retarder> + <v2.6:AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType"> + <Data xsi:type="AxleWheelsDataDeclarationType"> + <Axles> + <Axle axleNumber="1" xsi:type="AxleDataDeclarationType"> + <AxleType>VehicleNonDriven</AxleType> + <TwinTyres>false</TwinTyres> + <Steered>true</Steered> + <Tyre> + <Data id="TYRE-315_70R225" xsi:type="TyreDataDeclarationType"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>315/70 R22.5</Model> + <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber> + <Date>2017-09-26T15:33:45.1110278Z</Date> + <AppVersion>VectoCore</AppVersion> + <Dimension>315/70 R22.5</Dimension> + <RRCDeclared>0.0052</RRCDeclared> + <FzISO>33350</FzISO> + </Data> + <Signature> + <Reference URI="#TYRE-315_70R225" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </Signature> + </Tyre> + </Axle> + <Axle axleNumber="2" xsi:type="AxleDataDeclarationType"> + <AxleType>VehicleDriven</AxleType> + <TwinTyres>true</TwinTyres> + <Steered>false</Steered> + <Tyre> + <v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.2:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>315/70 R22.5</Model> + <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber> + <Date>2017-09-26T15:33:45.1110278Z</Date> + <AppVersion>VectoCore</AppVersion> + <Dimension>235/60 R17C</Dimension> + <RRCDeclared>0.0061</RRCDeclared> + <FzISO>33350</FzISO> + </v2.0:Data> + <Signature> + <Reference URI="#TYRE-315_70R225" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </Signature> + </Tyre> + </Axle> + </Axles> + </Data> + </v2.6:AxleWheels> + <v2.6:Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType"> + <Data xsi:type="AuxiliariesDataDeclarationType"> + <Fan> + <Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology> + </Fan> + <SteeringPump> + <Technology>Fixed displacement with elec. control</Technology> + </SteeringPump> + <ElectricSystem> + <Technology>Standard technology</Technology> + </ElectricSystem> + <PneumaticSystem> + <Technology>Medium Supply 1-stage + ESS + AMS</Technology> + </PneumaticSystem> + <HVAC> + <Technology>Default</Technology> + </HVAC> + </Data> + </v2.6:Auxiliaries> + <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType"> + <Data id="Airdrag-genericcabin" xsi:type="AirDragDataDeclarationType"> + <Manufacturer>Generic Vendor</Manufacturer> + <Model>N.A.</Model> + <CertificationNumber>generic cabin</CertificationNumber> + <Date>2017-09-26T15:33:45.1110278Z</Date> + <AppVersion>VectoCore</AppVersion> + <CdxA_0>5.57</CdxA_0> + <TransferredCdxA>5.57</TransferredCdxA> + <DeclaredCdxA>5.57</DeclaredCdxA> + </Data> + <Signature> + <Reference URI="#Airdrag-genericcabin" xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Transforms> + <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/> + <Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + </Transforms> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue/> + </Reference> + </Signature> + </v2.6:AirDrag> + </Components> + </v2.0:Vehicle> +</tns:VectoInputDeclaration> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml similarity index 100% rename from VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml rename to VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs index 11b0fc7b0e..ad5c46453a 100644 --- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs @@ -18,7 +18,7 @@ namespace TUGraz.VectoCore.Tests.XML public class XMLCompleteBusReaderTest { private const string CompleteBusExample = - "TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml"; + "TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus-sample.xml"; diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs index e5f1508b2a..5d6c074201 100644 --- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs @@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.Tests.XML { private const string vehilcePIFExample = - "TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml"; + "TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/PIF-heavyBus-sample.xml"; protected IXMLInputDataReader xmlInputReader; private IKernel _kernel; diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index 6db5910e36..60a82c993a 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -14,6 +14,12 @@ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.0\vecto_vehicle-sample_LNG.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel.xml" HomeFolder="Yes"/> </Folder> + <Folder FolderName="Schema 2.6DEV Buses ML"> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\PIF-heavyBus-sample.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-completed_heavyBus-sample.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorryFWD-sample.xml" HomeFolder="Yes"/> + <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml" HomeFolder="Yes"/> + </Folder> <Folder FolderName="Examples 1.0"> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_axlegear-sample_ref.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_engine-sample_ref.xml" HomeFolder="Yes"/> @@ -52,9 +58,6 @@ <File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.0.xml" HomeFolder="Yes"/> <File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.1.xml" HomeFolder="Yes"/> </Folder> - <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\example_heavyBus_PIF.xml" HomeFolder="Yes"/> - <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-completed_heavyBus.xml" HomeFolder="Yes"/> - <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml"/> </Folder> <Folder FolderName="XSL Files" ExtStr="xsl;xslt"> <File FilePath="E:\QUAM\Workspace\VECTO_quam\Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/> -- GitLab