Merge branch... (ec0974f4) · Commits · Stefanos DOUMPOULAKIS / Vecto

Commit ec0974f4 authored 2 years ago by Markus Quaritsch

Merge branch...

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

parents 5a69be31 62e6f0f6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs 22 additions, 3 deletions

...RunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 1 addition, 1 deletion

VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs 2 additions, 2 deletions

VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs 7 additions, 2 deletions

.../Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs 7 additions, 1 deletion

...est/Integration/Declaration/HeavyLorry/LorrySimulation.cs
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/HeavyLorry/Exempted/exempted_heavy_lorry.xml 19 additions, 0 deletions

...larationMode/HeavyLorry/Exempted/exempted_heavy_lorry.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/HeavyLorry/S-HEV/Group2_HEV_S3_stefan.xml 5525 additions, 0 deletions

...DeclarationMode/HeavyLorry/S-HEV/Group2_HEV_S3_stefan.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/Conventional/Conventional_heavyLorry_AMT.xml 2 additions, 8 deletions

.../MediumLorry/Conventional/Conventional_heavyLorry_AMT.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_IHPC.xml 5 additions, 9 deletions

...mentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_IHPC.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P1_supercap.xml 5 additions, 9 deletions

...larationMode/MediumLorry/P-HEV/Group5_HEV_P1_supercap.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_5_ovc.xml 5 additions, 9 deletions

...DeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_5_ovc.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_ovc.xml 5 additions, 9 deletions

...ntDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_ovc.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_ovc_supercap_invalid.xml 5 additions, 9 deletions

.../MediumLorry/P-HEV/Group5_HEV_P2_ovc_supercap_invalid.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P2_supercap.xml 5 additions, 9 deletions

...larationMode/MediumLorry/P-HEV/Group5_HEV_P2_supercap.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P3_ovc.xml 4 additions, 8 deletions

...ntDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P3_ovc.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P4_ovc.xml 4 additions, 8 deletions

...ntDeclarationMode/MediumLorry/P-HEV/Group5_HEV_P4_ovc.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/PEV/Group5_ PEV_E3_ES_Standard.xml 4 additions, 8 deletions

...rationMode/MediumLorry/PEV/Group5_ PEV_E3_ES_Standard.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/PEV/Group5_ PEV_E4.xml 4 additions, 8 deletions

...endmentDeclarationMode/MediumLorry/PEV/Group5_ PEV_E4.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/PEV/Group5_ PEV_IEPC_E.xml 4 additions, 8 deletions

...entDeclarationMode/MediumLorry/PEV/Group5_ PEV_IEPC_E.xml
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmentDeclarationMode/MediumLorry/PEV/Group5_ PEV_IEPC_E_pto.xml 4 additions, 8 deletions

...eclarationMode/MediumLorry/PEV/Group5_ PEV_IEPC_E_pto.xml

with 5639 additions and 119 deletions

Please register or to comment