Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 0e63f28c authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

correcting errors in schema for IEPC / HEV-S, completed buses

parent 76b6dba5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 433 additions and 128 deletions
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_S3.xml
+ 2
− 2
View file @ 0e63f28c
......@@ -31,7 +31,7 @@
<TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>3</Position>
<VoltageLevel>
......@@ -50,7 +50,7 @@
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>GEN</Position>
<VoltageLevel>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_AMT_S2.xml
+ 3
− 3
View file @ 0e63f28c
......@@ -20,8 +20,8 @@
<ArchitectureID>S2</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xsi:type="ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
......@@ -45,7 +45,7 @@
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>GEN</Position>
<VoltageLevel>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_IEPC-S.xml
+ 3
− 3
View file @ 0e63f28c
......@@ -19,9 +19,9 @@
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>S-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S3.xml
+ 5
− 5
View file @ 0e63f28c
......@@ -19,14 +19,14 @@
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>S3</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
<ADAS xsi:type="v2.10.2:ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>3</Position>
<VoltageLevel>
......@@ -45,7 +45,7 @@
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>GEN</Position>
<VoltageLevel>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_mediumLorry_S4.xml
+ 6
− 6
View file @ 0e63f28c
......@@ -19,14 +19,14 @@
<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
<ArchitectureID>S4</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>4</Position>
<VoltageLevel>
......@@ -45,7 +45,7 @@
</VoltageLevel>
</ElectricMachine>
</ElectricMotorTorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>GEN</Position>
<VoltageLevel>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_primaryBus_IEPC-S.xml
+ 5
− 7
View file @ 0e63f28c
......@@ -18,16 +18,14 @@
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ArchitectureID>S-IEPC</ArchitectureID>
<OvcHev>false</OvcHev>
<ADAS xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="v2.10.2:ADAS_HEV_Type">
<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
</ADAS>
<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
<!-- optional -->
<TorqueLimits xsi:type="v2.0:TorqueLimitsType"><!-- optional -->
<v2.0:Entry gear="9" maxTorque="2000"/>
</TorqueLimits>
<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
<!-- optional -->
<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"><!-- optional -->
<ElectricMachine>
<Position>GEN</Position>
<VoltageLevel>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/xEV_completedBus_1.xml → VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_completedBus_1.xml
+ 2
− 5
View file @ 0e63f28c
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV: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-1234567890" xsi:type="Vehicle_xEV_CompletedBusDeclarationType">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
......@@ -24,12 +24,9 @@
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_xEV_CompletedBusType">
<AirDrag>
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/IEPC_completedBus_1.xml 0 → 100644
+ 86
− 0
View file @ 0e63f28c
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV: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-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2021-06-30T22:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_IEPC_Type">
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_xEV_CompletedBusType">
<AirDrag>
<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="AUX_xEV_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Positionlights>true</Positionlights>
<Brakelights>true</Brakelights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/PEV_completedBus_1.xml 0 → 100644
+ 86
− 0
View file @ 0e63f28c
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV: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-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2021-06-30T22:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
<Components xsi:type="Components_xEV_CompletedBusType">
<AirDrag>
<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="AUX_xEV_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Positionlights>true</Positionlights>
<Brakelights>true</Brakelights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 3-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about