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

Skip to content
Snippets Groups Projects
Commit 9a0efde4 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Pull request #59: Merge/multistage 

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:merge/multistage to develop

* commit '819d8a5a': (217 commits)
  fix testcases
  fix :electric motor power map: wrong header fields expected
  set crosswind correction mode for completed specific bus in case default vaules are used
  updating release notes
  bugfix testcase PEV E2 Limited ContPwr
  updating versino number
  completed bus: use generic tc data if not present in VIF
  The certification number of angledrive, axelgear, transmission and torqueConverter are now optional
  adjusted example xml files for multistagetool
  updating version number
  get rid of mocksumwriter - not available when deploying, updating build targets, removing no longer needed / available projects
  renaming executable, adding build number
  renaming executable to match multistage tests
  adding VIF files for completed bus (combine primary and completed input to single file), adding component file and more input files
  removing no longer needed files in generic vehicles
  adding testcase to read, re-calculate and compare hashes in VIF
  minor adjustment of the airdarg writing behavior at multistage xml
  adapted airdragtestcase
  Adapted Airdrag modified behaviour and added Test cases
  Adapted Airdrag Test cases
  ...
parents 2802c8a2 819d8a5a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3954 additions and 1798 deletions
.gitignore
+ 7
− 0
View file @ 9a0efde4
...@@ -212,3 +212,10 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/ ...@@ -212,3 +212,10 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
.vs/ .vs/
**/dev/*.vmod **/dev/*.vmod
**/dev/*.vsum **/dev/*.vsum
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/testVif.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/final.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test+.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/tests.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/finalGroup41.VIF_Report_4.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/output
Build/Packaging.targets
+ 4
− 9
View file @ 9a0efde4
...@@ -86,19 +86,13 @@ ...@@ -86,19 +86,13 @@
<VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/> <VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\VECTO3.exe*"/> <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\VECTOMultistage.exe*"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\System.Windows.Interactivity.dll"/> <VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\*.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
<!-- <Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.Expression.Interactions.dll"/> -->
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\MahApps.*.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ICSharpCode.AvalonEdit.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ControlzEx.dll"/>
</ItemGroup> </ItemGroup>
<Message Text="@(VectoCommandLine)"/> <Message Text="@(VectoCommandLine)"/>
<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/> <Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/>
<Copy SourceFiles="@(Vecto3GUI)" DestinationFolder="$(OutputPath)"/> <Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(OutputPath)"/>
<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(OutputPath)"/> <Copy SourceFiles="@(HashingTool)" DestinationFolder="$(OutputPath)"/>
<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" /> <Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" /> <Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" />
...@@ -125,6 +119,7 @@ ...@@ -125,6 +119,7 @@
<ZipFiles Include="$(OutputPath)*.dll" /> <ZipFiles Include="$(OutputPath)*.dll" />
<ZipFiles Include="$(OutputPath)*.ini" /> <ZipFiles Include="$(OutputPath)*.ini" />
<ZipFiles Include="$(OutputPath)VECTO.exe*" /> <ZipFiles Include="$(OutputPath)VECTO.exe*" />
<ZipFiles Include="$(OutputPath)VECTOMultistage.exe*" />
<ZipFiles Include="$(OutputPath)vectocmd.exe*"/> <ZipFiles Include="$(OutputPath)vectocmd.exe*"/>
<ZipFiles Include="$(OutputPath)VECTO3.exe*" /> <ZipFiles Include="$(OutputPath)VECTO3.exe*" />
<ZipFiles Include="$(OutputPath)HashingTool.exe*"/> <ZipFiles Include="$(OutputPath)HashingTool.exe*"/>
......
Documentation/User Manual Source/Release Notes Vecto3.x.pptx
+ 0
− 0
View file @ 9a0efde4
No preview for this file type
Generic Vehicles/Declaration Mode/CompletedBus 31b2/CompletedBus_31b.vecto deleted 100644 → 0
+ 0
− 12
View file @ 2802c8a2
{
"Header": {
"CreatedBy": "Markus Quaritsch, IVT, Graz University of Technology",
"Date": "2020-02-07T15:06:30.9725917Z",
"AppVersion": "2.2",
"FileVersion": 7
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_31b.xml",
"PrimaryVehicleResults": "primary_heavyBus group_P31_32_Smart_ES.PIF.xml"
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/CompletedBus 31b2/airdrag.xml 0 → 100644
+ 25
− 0
View file @ 9a0efde4
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
<tns:AirDrag>
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-03-24T15:00:00Z</Date>
<AppVersion>Vecto AirDrag x.y</AppVersion>
<CdxA_0>4.90</CdxA_0>
<TransferredCdxA>4.90</TransferredCdxA>
<DeclaredCdxA>4.90</DeclaredCdxA>
</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>
</tns:AirDrag>
</tns:VectoInputDeclaration>
Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml 0 → 100644
+ 38
− 0
View file @ 9a0efde4
<?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.8" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
<v2.0:Vehicle id="TODO_ADDIDENTIFIER" xsi:type="InterimStageInputType">
<Manufacturer>TUG</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<VIN>VIN-1234</VIN>
<Date>2021-06-06T22:00:00Z</Date>
<HeightIntegratedBody>3000</HeightIntegratedBody>
<VehicleLength>12000</VehicleLength>
<VehicleWidth>2550</VehicleWidth>
<EntranceHeight>250</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<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>4.90</v2.0:CdxA_0>
<v2.0:TransferredCdxA>4.90</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>4.90</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>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml 0 → 100644
+ 31
− 0
View file @ 9a0efde4
<?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.8" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
<v2.0:Vehicle id="TODO_ADDIDENTIFIER" xsi:type="InterimStageInputType">
<Manufacturer>IVT</Manufacturer>
<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
<VIN>VIN-1234</VIN>
<Date>2021-06-06T22:00:00Z</Date>
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Positionlights>false</Positionlights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
<HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
<HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
+ 29
− 28
View file @ 9a0efde4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd"> <tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"> <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer> <Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress> <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN> <VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date> <Date>2020-01-09T11:00:00Z</Date>
<LegislativeClass>M3</LegislativeClass> <Model>Sample Bus Model</Model>
<ClassBus>II</ClassBus> <LegislativeCategory>M3</LegislativeCategory>
<VehicleCode>CE</VehicleCode> <CorrectedActualMass>10680</CorrectedActualMass>
<CurbMassChassis>10680</CurbMassChassis>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass> <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<RegisteredPassengers> <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
<LowerDeck>86</LowerDeck> <NgTankSystem>Compressed</NgTankSystem>
<UpperDeck>0</UpperDeck> <ClassBus>II</ClassBus>
</RegisteredPassengers> <NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CE</BodyworkCode>
<LowEntry>true</LowEntry> <LowEntry>true</LowEntry>
<HeightIntegratedBody>3.000</HeightIntegratedBody> <HeightIntegratedBody>3000</HeightIntegratedBody>
<VehicleLength>10.633</VehicleLength> <VehicleLength>10633</VehicleLength>
<VehicleWidth>2.550</VehicleWidth> <VehicleWidth>2550</VehicleWidth>
<EntranceHeight>0.270</EntranceHeight> <EntranceHeight>270</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology> <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
<Components xsi:type="CompletedVehicleComponentsDeclarationType"> <Components xsi:type="CompletedVehicleComponentsDeclarationType">
<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> <AirDrag>
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType"> <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer> <Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model> <Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber> <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
<TransferredCdxA>4.90</TransferredCdxA> <TransferredCdxA>4.90</TransferredCdxA>
<DeclaredCdxA>4.90</DeclaredCdxA> <DeclaredCdxA>4.90</DeclaredCdxA>
</Data> </Data>
<Signature> <v2.0:Signature>
<di:Reference URI="#CabinX23h"> <di:Reference URI="#CabinX23h">
<di:Transforms> <di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
...@@ -42,29 +45,27 @@ ...@@ -42,29 +45,27 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue> <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference> </di:Reference>
</Signature> </v2.0:Signature>
</v2.6:AirDrag> </AirDrag>
<Auxiliaries> <Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType"> <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem> <ElectricSystem>
<AlternatorTechnology>default</AlternatorTechnology>
<LEDLights> <LEDLights>
<Interiorlights>true</Interiorlights>
<Dayrunninglights>true</Dayrunninglights> <Dayrunninglights>true</Dayrunninglights>
<Headlights>true</Headlights>
<Positionlights>true</Positionlights> <Positionlights>true</Positionlights>
<Brakelights>true</Brakelights> <Brakelights>true</Brakelights>
<Interiorlights>true</Interiorlights> <Headlights>true</Headlights>
</LEDLights> </LEDLights>
</ElectricSystem> </ElectricSystem>
<HVAC> <HVAC>
<SystemConfiguration>6</SystemConfiguration> <SystemConfiguration>6</SystemConfiguration>
<CompressorType> <HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
<DriverAC>none</DriverAC> <HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
<PassengerAC>2-stage</PassengerAC> <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
</CompressorType> <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower> <AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing> <DoubleGlazing>true</DoubleGlazing>
<HeatPump>false</HeatPump>
<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater> <AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts> <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
</HVAC> </HVAC>
......
Generic Vehicles/Declaration Mode/CompletedBus 34f/CompletedBus_34f.vecto deleted 100644 → 0
+ 0
− 12
View file @ 2802c8a2
{
"Header": {
"CreatedBy": "Markus Quaritsch, IVT, Graz University of Technology",
"Date": "2020-02-07T15:06:30.9725917Z",
"AppVersion": "2.2",
"FileVersion": 7
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_34f.xml",
"PrimaryVehicleResults": "primary_heavyBus group_P33_34_SmartPS.PIF.xml"
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
+ 26
− 25
View file @ 9a0efde4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd"> <tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"> <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer> <Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress> <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN> <VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date> <Date>2020-01-09T11:00:00Z</Date>
<LegislativeClass>M3</LegislativeClass> <Model>Sample Bus Model</Model>
<ClassBus>II+III</ClassBus> <LegislativeCategory>M3</LegislativeCategory>
<VehicleCode>CB</VehicleCode> <CorrectedActualMass>19400</CorrectedActualMass>
<CurbMassChassis>19400</CurbMassChassis>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass> <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<RegisteredPassengers> <AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<LowerDeck>16</LowerDeck> <NgTankSystem>Compressed</NgTankSystem>
<UpperDeck>56</UpperDeck> <ClassBus>II+III</ClassBus>
</RegisteredPassengers> <NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>56</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>true</LowEntry> <LowEntry>true</LowEntry>
<HeightIntegratedBody>4.000</HeightIntegratedBody> <HeightIntegratedBody>4000</HeightIntegratedBody>
<VehicleLength>13.890</VehicleLength> <VehicleLength>13890</VehicleLength>
<VehicleWidth>2.550</VehicleWidth> <VehicleWidth>2550</VehicleWidth>
<EntranceHeight>0.300</EntranceHeight> <EntranceHeight>300</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology> <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
<Components xsi:type="CompletedVehicleComponentsDeclarationType"> <Components xsi:type="CompletedVehicleComponentsDeclarationType">
<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"> <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType"> <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Manufacturer</Manufacturer> <Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model> <Model>Generic Model</Model>
...@@ -43,28 +46,26 @@ ...@@ -43,28 +46,26 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue> <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference> </di:Reference>
</Signature> </Signature>
</v2.6:AirDrag> </v2.8:AirDrag>
<Auxiliaries> <Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType"> <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem> <ElectricSystem>
<AlternatorTechnology>default</AlternatorTechnology>
<LEDLights> <LEDLights>
<Interiorlights>true</Interiorlights>
<Dayrunninglights>true</Dayrunninglights> <Dayrunninglights>true</Dayrunninglights>
<Headlights>true</Headlights>
<Positionlights>true</Positionlights> <Positionlights>true</Positionlights>
<Brakelights>true</Brakelights> <Brakelights>true</Brakelights>
<Interiorlights>true</Interiorlights> <Headlights>true</Headlights>
</LEDLights> </LEDLights>
</ElectricSystem> </ElectricSystem>
<HVAC> <HVAC>
<SystemConfiguration>6</SystemConfiguration> <SystemConfiguration>6</SystemConfiguration>
<CompressorType> <HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
<DriverAC>none</DriverAC> <HeatPumpModeDriverCompartment>N.A.</HeatPumpModeDriverCompartment>
<PassengerAC>2-stage</PassengerAC> <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
</CompressorType> <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
<AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower> <AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing> <DoubleGlazing>true</DoubleGlazing>
<HeatPump>false</HeatPump>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater> <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts> <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
</HVAC> </HVAC>
......
Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto deleted 100644 → 0
+ 0
− 12
View file @ 2802c8a2
{
"Header": {
"CreatedBy": "Markus Quaritsch, IVT, Graz University of Technology",
"Date": "2020-02-07T15:06:30.9725917Z",
"AppVersion": "2.2",
"FileVersion": 7
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_39a.xml",
"PrimaryVehicleResults": "primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml"
}
}
\ No newline at end of file
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