diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
index f165a47db18a5c040e265a9dee9811abb754a3cb..8c5f09d34aa203da572246b960c326e21cf6270a 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
@@ -9,36 +9,36 @@
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-NA" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <v2.0:Vehicle id="VEH-NA" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>TU Graz, IVT</Manufacturer>
<ManufacturerAddress>N/A</ManufacturerAddress>
<Model>N/A</Model>
<VIN>N/A</VIN>
<Date>2019-12-03T08:33:49.5321872Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8229</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <v2.1:PTO xsi:type="v2.0:PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
- </v2.1:PTO>
+ </PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>true</SleeperCab>
- <v2.1:ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.1:ADAS>
- <v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Engine xsi:type="EngineComponentDeclarationType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>325kW 12.7l Engine</Model>
@@ -421,7 +421,7 @@
</Fuel>
</Mode>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-325kW12.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -430,7 +430,7 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox >
<v2.0:Data id="GBX-tractor_12gear_example" xsi:type="v1.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3288,7 +3288,7 @@
</Gear>
</Gears>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-tractor_12gear_example" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -3297,7 +3297,7 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
<v2.0:Data id="RET-NA" xsi:type="v1.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3324,7 +3324,7 @@
<Entry retarderSpeed="5000.00" torqueLoss="60.00" />
</RetarderLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -3333,7 +3333,7 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXLGEAR-2.640" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -4181,7 +4181,7 @@
<Entry inputSpeed="2112.00" inputTorque="11642.10" torqueLoss="278.40" />
</TorqueLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -4190,10 +4190,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ <v2.0:Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -4250,15 +4250,15 @@
</Tyre>
</Axle>
</Axles>
- </Data>
+ </v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -4272,7 +4272,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType">
+ <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>N/A</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -4282,7 +4282,7 @@
<TransferredCdxA>5.30</TransferredCdxA>
<DeclaredCdxA>5.30</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -4291,8 +4291,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
- </v2.1:Components>
+ </Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
index de2270f158e628e71bc9782d8450e6fd0987e020..0a63693acac450ac4d0c553aa981892e05dc3bd6 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-NA_DF-DA_WHR" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <v2.0:Vehicle id="VEH-NA_DF-DA_WHR" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>TU Graz, IVT</Manufacturer>
<ManufacturerAddress>N/A</ManufacturerAddress>
<Model>N/A</Model>
<VIN>N/A</VIN>
<Date>2019-12-03T08:33:49.5321872Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8229</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <v2.1:PTO xsi:type="v2.0:PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
- </v2.1:PTO>
+ </PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>true</SleeperCab>
- <v2.1:ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.1:ADAS>
- <v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Engine xsi:type="EngineComponentDeclarationType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>325kW 12.7l Engine</Model>
@@ -957,7 +957,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Fuel>
</Mode>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-325kW12.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -966,7 +966,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
<v2.0:Data id="GBX-tractor_12gear_example" xsi:type="v1.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3824,7 +3824,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Gear>
</Gears>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-tractor_12gear_example" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3833,7 +3833,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
<v2.0:Data id="RET-NA" xsi:type="v1.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3860,7 +3860,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry retarderSpeed="5000.00" torqueLoss="60.00"/>
</RetarderLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3869,7 +3869,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXLGEAR-2.640" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -4717,7 +4717,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry inputSpeed="2112.00" inputTorque="11642.10" torqueLoss="278.40"/>
</TorqueLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4726,10 +4726,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -4789,12 +4789,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -4808,7 +4808,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType">
+ <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>N/A</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -4818,7 +4818,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<TransferredCdxA>5.30</TransferredCdxA>
<DeclaredCdxA>5.30</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4827,8 +4827,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
- </v2.1:Components>
+ </Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
index f56ab2dbbe877e8abd631d628a84655624f1830d..0a4dd2e6a82131c4fbef90938080d83656e1d74e 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
@@ -1,36 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-NA_DF" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <v2.0:Vehicle id="VEH-NA_DF" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>TU Graz, IVT</Manufacturer>
<ManufacturerAddress>N/A</ManufacturerAddress>
<Model>N/A</Model>
<VIN>N/A</VIN>
<Date>2019-12-03T08:33:49.5321872Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8229</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <v2.1:PTO xsi:type="v2.0:PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
- </v2.1:PTO>
+ </PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>true</SleeperCab>
- <v2.1:ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.1:ADAS>
- <v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Engine xsi:type="EngineComponentDeclarationType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>325kW 12.7l Engine</Model>
@@ -573,7 +575,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Fuel>
</Mode>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-325kW12.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -582,7 +584,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
<v2.0:Data id="GBX-tractor_12gear_example" xsi:type="v1.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3440,7 +3442,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Gear>
</Gears>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-tractor_12gear_example" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3449,7 +3451,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
<v2.0:Data id="RET-NA" xsi:type="v1.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3476,7 +3478,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry retarderSpeed="5000.00" torqueLoss="60.00"/>
</RetarderLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3485,7 +3487,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXLGEAR-2.640" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -4333,7 +4335,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry inputSpeed="2112.00" inputTorque="11642.10" torqueLoss="278.40"/>
</TorqueLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4342,10 +4344,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -4405,12 +4407,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -4424,7 +4426,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType">
+ <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>N/A</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -4434,7 +4436,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<TransferredCdxA>5.30</TransferredCdxA>
<DeclaredCdxA>5.30</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4443,8 +4445,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
- </v2.1:Components>
+ </Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
index aea3118700623f8ede366f260082cf1ccb979dfb..4ead33d2c5cea73b7f7f30ce8c3a2a6b50a2ebc6 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 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.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-NA_WHR" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <v2.0:Vehicle id="VEH-NA_WHR" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>TU Graz, IVT</Manufacturer>
<ManufacturerAddress>N/A</ManufacturerAddress>
<Model>N/A</Model>
<VIN>N/A</VIN>
<Date>2019-12-03T08:33:49.5321872Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8229</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <v2.1:PTO xsi:type="v2.0:PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
- </v2.1:PTO>
+ </PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>true</SleeperCab>
- <v2.1:ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.1:ADAS>
- <v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
- <Engine xsi:type="EngineComponentDeclarationType">
+ </ADAS>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>325kW 12.7l Engine</Model>
@@ -422,7 +422,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Fuel>
</Mode>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-325kW12.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -431,7 +431,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
<v2.0:Data id="GBX-tractor_12gear_example" xsi:type="v1.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3289,7 +3289,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Gear>
</Gears>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-tractor_12gear_example" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3298,7 +3298,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
<v2.0:Data id="RET-NA" xsi:type="v1.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -3325,7 +3325,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry retarderSpeed="5000.00" torqueLoss="60.00"/>
</RetarderLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -3334,7 +3334,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
<v2.0:Data id="AXLGEAR-2.640" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
@@ -4182,7 +4182,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<Entry inputSpeed="2112.00" inputTorque="11642.10" torqueLoss="278.40"/>
</TorqueLossMap>
</v2.0:Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4191,10 +4191,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -4254,12 +4254,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliariesDataDeclarationType">
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement with elec. control</Technology>
+ <Technology axleNumber="1">Fixed displacement with elec. control</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -4273,7 +4273,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType">
+ <Data id="Airdrag-NA" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>TU Graz, IVT</Manufacturer>
<Model>N/A</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -4283,7 +4283,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<TransferredCdxA>5.30</TransferredCdxA>
<DeclaredCdxA>5.30</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-NA" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
@@ -4292,8 +4292,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue/>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
- </v2.1:Components>
+ </Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
diff --git a/Generic Vehicles/Declaration Mode/xEV XML Jobs/Lorries/Group5_ PEV_E4.xml b/Generic Vehicles/Declaration Mode/xEV XML Jobs/Lorries/Group5_ PEV_E4.xml
index 2c3580dce625b0914c0ac647b571d5f28cdec8ec..d1dc091da82da33441798b8c9df2456d6a0db58a 100644
--- a/Generic Vehicles/Declaration Mode/xEV XML Jobs/Lorries/Group5_ PEV_E4.xml
+++ b/Generic Vehicles/Declaration Mode/xEV XML Jobs/Lorries/Group5_ PEV_E4.xml
@@ -1005,7 +1005,7 @@
<Voltage>1000</Voltage>
<ContinuousTorque>700.00</ContinuousTorque>
<TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
- <OverloadTorque>7500.00</OverloadTorque>
+ <OverloadTorque>750.00</OverloadTorque>
<TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
<OverloadDuration>120.00</OverloadDuration>
<MaxTorqueCurve>
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
index 54469702f89c708aade00d5f2f47beb82b3cf7e2..68bea32f02354a17aa4a8a7a59c1b92d96428e6b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs
@@ -100,8 +100,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Auxiliaries
var iceInfo = dataBus.EngineInfo;
var emPower = elInfo.ElectricMotorSpeed * elInfo.ElectricMotorTorque;
var icePower = iceInfo.EngineSpeed * iceInfo.EngineTorque;
-
- xFactor = emPower.Abs() / (emPower.Abs() + icePower.Abs());
+ if (!(emPower + icePower).IsEqual(0)) {
+ xFactor = emPower.Abs() / (emPower.Abs() + icePower.Abs());
+ }
}
return _electricPowerDemand * xFactor;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs
index f4119fb9f8af240b49f8a68a9cae57885be09ed6..04dbeacad1e44a858569afc867f66ec779880989 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAxleWheelsType.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using System.Linq;
using System.Xml;
using System.Xml.Linq;
using TUGraz.VectoCommon.Exceptions;
@@ -60,7 +61,24 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
throw new VectoException("Tyre input data must be in XML format");
}
- return XElement.Load(xmlTyre.GetXmlNode.CreateNavigator().ReadSubtree());
+ var retVal = XElement.Load(xmlTyre.GetXmlNode.CreateNavigator().ReadSubtree());
+ var ptr = (retVal.FirstNode as XElement).FirstAttribute;
+ while (ptr != null) {
+ if (!ptr.IsNamespaceDeclaration && ptr.Name.LocalName == "type" && ptr.Name.Namespace == _xsi && ptr.Value.Contains(':')) {
+ var parts = ptr.Value.Split(':');
+ ptr.Value = parts.Last();
+ var defaultNsAttr = ptr.Parent.Attributes()
+ .FirstOrDefault(x => x.IsNamespaceDeclaration && x.Name.LocalName == "xmlns");
+ if (defaultNsAttr != null) {
+ defaultNsAttr.Value = xmlTyre.GetXmlNode.GetNamespaceOfPrefix(parts.First());
+ } else {
+ ptr.Parent.Add(new XAttribute("xmlns", xmlTyre.GetXmlNode.GetNamespaceOfPrefix(parts.First())));
+ }
+ }
+ ptr = ptr.NextAttribute;
+ }
+
+ return retVal;
//var currentTyre =
// new XElement(_v20 + XMLNames.ComponentDataWrapper,
// new XAttribute(_xsi + XMLNames.XSIType, "TyreDataDeclarationType"),