Commit e972da7a authored 3 years ago by Michael KRISPER

Merge branch 'develop' into feature/VECTO-1493-use-enginestartstop-in-pcc-events-for-hybrid-p1

parents 08b76118 f02bf29f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/User Manual/5-input-and-output-files/VSUM.md 1 addition, 0 deletions

Documentation/User Manual/5-input-and-output-files/VSUM.md
VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 8 additions, 3 deletions

...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs 1 addition, 1 deletion

...re/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs 6 additions, 0 deletions

.../Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs 15 additions, 3 deletions

.../Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs 3 additions, 3 deletions

...oCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs 2 additions, 0 deletions

...els/SimulationComponent/Impl/StopStartCombustionEngine.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs 7 additions, 1 deletion

...toCore/Models/SimulationComponent/Impl/TorqueConverter.cs
VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs 20 additions, 9 deletions

...e/Models/SimulationComponent/Strategies/HybridStrategy.cs
VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs 3 additions, 3 deletions

...e/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs 93 additions, 91 deletions

VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum 4 additions, 4 deletions

...oreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum 4 additions, 4 deletions

...Test/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod 1 addition, 1 deletion

...suredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum 4 additions, 4 deletions

...est/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum 4 additions, 4 deletions

...estData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod 1 addition, 1 deletion

...sults/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum 4 additions, 4 deletions

...stData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod 1 addition, 1 deletion

...lts/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum 4 additions, 4 deletions

.../TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum

with 186 additions and 141 deletions

Please register or to comment