diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
index 80afccb34449fbf4e000fea763f1bd53d5ef3f75..2d8998ab075b8962126fe94a8060b845e07ef10a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
@@ -117,10 +117,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public new const string XSD_TYPE = "AUX_Component_Conventional_Lorry_Type";
public const string XSD_HEV_P_TYPE = "AUX_Component_HEV-P_Lorry_Type";
public const string XSD_HEV_S_TYPE = "AUX_Component_HEV-S_Lorry_Type";
+ public const string XSD_PEV_E2_TYPE = "AUX_Component_PEV_Lorry_Type";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public static readonly string QUALIFIED_XSD_HEV_P_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_HEV_P_TYPE);
public static readonly string QUALIFIED_XSD_HEV_S_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_HEV_S_TYPE);
+ public static readonly string QUALIFIED_XSD_PEV_E2_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_PEV_E2_TYPE);
public XMLAuxiliaryDeclarationDataProviderV210_Lorry(XmlNode auxNode, IXMLDeclarationVehicleData vehicle) : base(
auxNode, vehicle)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index 57cadac037c6abbcf1cf58ad8afc906b77d516c4..d012c51cfe2a1dded017a693adbc9b2d2846611e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -508,6 +508,20 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public XMLDeclarationHeavyLorryPEVE2ComponentDataV210(IXMLDeclarationVehicleData vehicle,
XmlNode componentNode, string sourceFile) : base(vehicle, componentNode, sourceFile) { }
+
+
+ #region Overrides of XMLDeclarationComponentsDataProviderV10
+
+ public override IAngledriveInputData AngledriveInputData =>
+ ElementExists(XMLNames.Component_Angledrive) ? base.AngledriveInputData : null;
+
+ public override IRetarderInputData RetarderInputData =>
+ ElementExists(XMLNames.Component_Retarder) ? base.RetarderInputData : null;
+
+ public override IAirdragDeclarationInputData AirdragInputData =>
+ ElementExists(XMLNames.Component_AirDrag) ? base.AirdragInputData : null;
+
+ #endregion
}
// ---------------------------------------------------------------------------------------
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
index 9e7f27e7a798a4698261421955293575d1ce792c..597612dbd80c5708fed7c8de4f620d111fcffd17 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
@@ -228,6 +228,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLAuxiliaryDeclarationInputData>().To<XMLAuxiliaryDeclarationDataProviderV210_Lorry>()
.Named(XMLAuxiliaryDeclarationDataProviderV210_Lorry.QUALIFIED_XSD_HEV_S_TYPE);
+ Bind<IXMLAuxiliaryDeclarationInputData>().To<XMLAuxiliaryDeclarationDataProviderV210_Lorry>()
+ .Named(XMLAuxiliaryDeclarationDataProviderV210_Lorry.QUALIFIED_XSD_PEV_E2_TYPE);
+
Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
.To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_TYPE);
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1b40e9f2befb4d76d30601a1f2698c39ff8156c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChasisConfiguration>Rigid Lorry</ChasisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
+ <v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
+ <v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <!-- optional -->
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_PEV-E2_LorryType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios><!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck Gearbox</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>AMT</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Gears xsi:type="GearsDeclarationType">
+ <Gear number="1">
+ <Ratio>14.930</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ <Gear number="2">
+ <Ratio>11.640</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2000</MaxSpeed>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
+ <Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
+ <Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
+ <Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
+ <Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
+ </TorqueLossMap>
+ </Gear>
+ </Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""></di:DigestMethod>
+ <di:DigestValue></di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <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">
+ <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">
+ <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>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_PEV_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1ea9068a4477e292f26f228f3a566a7e43fd68b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
+ <Manufacturer>TU Graz</Manufacturer>
+ <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+ <Model>HEV Heavy Lorry Px</Model>
+ <VIN>1234</VIN>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChasisConfiguration>Rigid Lorry</ChasisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>6000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <RetarderType>None</RetarderType>
+ <AngledriveType>None</AngledriveType>
+ <PTO xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:PTOType">
+ <v2.0:PTOShaftsGearWheels>none</v2.0:PTOShaftsGearWheels>
+ <v2.0:PTOOtherElements>none</v2.0:PTOOtherElements>
+ </PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>false</SleeperCab>
+ <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
+ <ArchitectureID>E2</ArchitectureID>
+ <OvcHev>false</OvcHev>
+ <ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="Components_PEV-E2_LorryType">
+ <ElectricMachine>
+ <PowertrainPosition>2</PowertrainPosition>
+ <Count>1</Count>
+ <ElectricMachineSystem>
+ <v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <ElectricMachineType>ASM</ElectricMachineType>
+ <CertificationMethod>Measured</CertificationMethod>
+ <R85RatedPower>1</R85RatedPower>
+ <RotationalInertia>0.10</RotationalInertia>
+ <ContinuousTorque>200.00</ContinuousTorque>
+ <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+ <OverloadTorque>400.00</OverloadTorque>
+ <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+ <OverloadDuration>30.00</OverloadDuration>
+ <TestVoltageOverload>483</TestVoltageOverload>
+ <DcDcConverterIncluded>true</DcDcConverterIncluded>
+ <IHPCType>None</IHPCType>
+ <VoltageLevel>
+ <Voltage>400</Voltage>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <VoltageLevel>
+ <Voltage>600</Voltage>
+ <MaxTorqueCurve>
+ <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+ <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+ </MaxTorqueCurve>
+ <PowerMap>
+ <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+ <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+ <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+ </PowerMap>
+ </VoltageLevel>
+ <DragCurve>
+ <Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+ <Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+ </DragCurve>
+ <Conditioning circuitId="0">
+ <Entry coolantTempInlet="30" coolingPower="5000"/>
+ </Conditioning>
+ </v2.10.1:Data>
+ <v2.10.1:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.10.1:Signature>
+ </ElectricMachineSystem>
+ <P2.5GearRatios>
+ <!-- only for P2.5 HEV -->
+ <Ratio gear="1">1.000</Ratio>
+ <Ratio gear="2">2.000</Ratio>
+ </P2.5GearRatios>
+ </ElectricMachine>
+ <ElectricEnergyStorage>
+ <Battery>
+ <StringID>0</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ <SOCmin>20</SOCmin>
+ <SOCmax>80</SOCmax>
+ </Battery>
+ <Battery>
+ <StringID>1</StringID>
+ <REESS>
+ <v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <Manufacturer>a</Manufacturer>
+ <Model>a</Model>
+ <CertificationNumber>token</CertificationNumber>
+ <Date>2017-01-01T00:00:00Z</Date>
+ <AppVersion>aaaaa</AppVersion>
+ <CertificationMethod>Measured</CertificationMethod>
+ <BatteryType>HPBS</BatteryType>
+ <RatedCapacity>72.00</RatedCapacity>
+ <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+ <JunctionboxIncluded>true</JunctionboxIncluded>
+ <TestingTemperature>20</TestingTemperature>
+ <OCV>
+ <Entry SoC="0" OCV="620.00"/>
+ <Entry SoC="100" OCV="640.00"/>
+ </OCV>
+ <InternalResistance>
+ <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/>
+ <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
+ </InternalResistance>
+ <CurrentLimits>
+ <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
+ <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
+ </CurrentLimits>
+ </v2.10.2:Data>
+ <Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </Signature>
+ </REESS>
+ </Battery>
+ </ElectricEnergyStorage>
+ <Gearbox>
+ <v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+ <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>APT-N</TransmissionType>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <v2.10.1: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>
+ </v2.10.1:Gears>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#gbx-vi2Oak2N">
+ <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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Gearbox>
+ <TorqueConverter><!-- optional -->
+ <v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Characteristics>
+ <Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
+ <Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
+ <Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
+ </Characteristics>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm=""/>
+ <di:DigestValue/>
+ </di:Reference>
+ </v2.0:Signature>
+ </TorqueConverter>
+ <Axlegear>
+ <v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic 40t Long Haul Truck AxleGear</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>2.590</Ratio>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <TorqueLossMap>
+ <Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
+ <Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
+ </TorqueLossMap>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#AXL-EC3ohnoh">
+ <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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </Axlegear>
+ <AxleWheels>
+ <v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <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">
+ <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">
+ <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>
+ </Axles>
+ </v2.0:Data>
+ </AxleWheels>
+ <Auxiliaries>
+ <Data xsi:type="AUX_PEV_LorryDataType">
+ <SteeringPump>
+ <Technology axleNumber="1">Electric driven pump</Technology>
+ </SteeringPump>
+ <ElectricSystem>
+ <Technology>Standard technology - LED headlights, all</Technology>
+ </ElectricSystem>
+ <PneumaticSystem>
+ <Technology>Medium Supply 2-stage + elec. driven</Technology>
+ </PneumaticSystem>
+ <HVAC>
+ <Technology>Default</Technology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 13a4622e88a6387fe38accde94e883209e08ef9a..db3a9032b7563a7faa80b670deec868dbc992299 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -6076,6 +6076,12 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\HEV_primaryBus_AMT_Px_n_opt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\PEV_heavyLorry_AMT_E2_n_opt.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries\PEV_heavyLorry_APT-N_E2_n_opt.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.1\Tractor_4x2_vehicle-class-5_5_t_0.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 8b8481fe1c89d002faf4e645e84108b404398677..d8592b6a6c07e63beb977d29d21ae6c01ebf2cc6 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -1357,11 +1357,13 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.MaxPropulsionTorque);
}
- [TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2.xml")]
- [TestCase(@"HeavyLorry\PEV_heavyLorry_APT-N_E2.xml")]
- public void TestPEVE2HeavyLorry(string jobfile)
+ [TestCase(@"HeavyLorry\PEV_heavyLorry_AMT_E2.xml", BASE_DIR)]
+ [TestCase(@"PEV_heavyLorry_AMT_E2_n_opt.xml", Optional_TESTS_DIR)]
+ [TestCase(@"HeavyLorry\PEV_heavyLorry_APT-N_E2.xml", BASE_DIR)]
+ [TestCase(@"PEV_heavyLorry_APT-N_E2_n_opt.xml", Optional_TESTS_DIR)]
+ public void TestPEVE2HeavyLorry(string jobfile, string testDir)
{
- var filename = Path.Combine(BASE_DIR, jobfile);
+ var filename = Path.Combine(testDir, jobfile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
Assert.NotNull(dataProvider.JobInputData);
var vehicle = dataProvider.JobInputData.Vehicle;
@@ -1373,18 +1375,32 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.IEPC);
Assert.IsNotNull(vehicle.Components.GearboxInputData);
TestTorqueConverter(vehicle);
- Assert.IsNotNull(vehicle.Components.AngledriveInputData);
- Assert.IsNotNull(vehicle.Components.RetarderInputData);
+
+ if (testDir == Optional_TESTS_DIR)
+ {
+ Assert.IsNull(vehicle.Components.AngledriveInputData);
+ Assert.IsNull(vehicle.Components.RetarderInputData);
+ Assert.IsNull(vehicle.Components.AirdragInputData);
+ Assert.IsNull(vehicle.TorqueLimits);
+ Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
+ }
+ else
+ {
+ Assert.IsNotNull(vehicle.Components.AngledriveInputData);
+ Assert.IsNotNull(vehicle.Components.RetarderInputData);
+ Assert.IsNotNull(vehicle.Components.AirdragInputData);
+ Assert.IsNotNull(vehicle.TorqueLimits);
+ Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
+ }
+
Assert.IsNotNull(vehicle.Components.AxleGearInputData);
Assert.IsNotNull(vehicle.Components.AxleWheels);
Assert.IsNotNull(vehicle.Components.AuxiliaryInputData);
+ Assert.IsNotNull(vehicle.Components.AuxiliaryInputData.Auxiliaries);
Assert.IsNull(vehicle.Components.BusAuxiliaries);
- Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.Components.ElectricStorage);
Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
Assert.IsNull(vehicle.CargoVolume);
- Assert.IsNotNull(vehicle.TorqueLimits);
- Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
Assert.IsNull(vehicle.MaxPropulsionTorque);
}