Merge branch... (7dc1197e) · Commits · Stefanos DOUMPOULAKIS / Vecto

Commit 7dc1197e 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

# Conflicts:
#	VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh

parents 183c0a8c f8ab9029

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCore/OutputData/IModalDataContainer.cs 10 additions, 0 deletions

VectoCore/VectoCore/OutputData/IModalDataContainer.cs
VectoCore/VectoCore/OutputData/SumDataFields.cs 18 additions, 8 deletions

VectoCore/VectoCore/OutputData/SumDataFields.cs
VectoCore/VectoCore/OutputData/SummaryDataContainer.cs 89 additions, 48 deletions

VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/LorrySimulation.cs 268 additions, 51 deletions

...est/Integration/Declaration/HeavyLorry/LorrySimulation.cs
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh 1 addition, 1 deletion

.../GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC__Gbx1Axl.vecto 0 additions, 0 deletions

...N/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC__Gbx1Axl.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh 1 addition, 1 deletion

...GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC__Gbx1Whl1.vecto 0 additions, 0 deletions

.../PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC__Gbx1Whl1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh 1 addition, 1 deletion

...GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC__Gbx1Whl2.vecto 0 additions, 0 deletions

.../PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC__Gbx1Whl2.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh 1 addition, 1 deletion

...JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto 0 additions, 0 deletions

...Mode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh 1 addition, 1 deletion

.../GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC__Gbx3Axl.vecto 0 additions, 0 deletions

...N/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC__Gbx3Axl.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh 1 addition, 1 deletion

...GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC__Gbx3Whl1.vecto 0 additions, 0 deletions

.../PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC__Gbx3Whl1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh 1 addition, 1 deletion

...GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC__Gbx3Whl2.vecto 0 additions, 0 deletions

.../PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC__Gbx3Whl2.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh 1 addition, 1 deletion

...JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh 1 addition, 1 deletion

...PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh

with 394 additions and 116 deletions

Please register or to comment