Commit 025c39c9 authored 8 years ago by Markus QUARITSCH

Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into develop

parents f18f37c1 8c2ae933

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 251 additions, 251 deletions

...ore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs 3 additions, 0 deletions

...ls/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs 18 additions, 13 deletions

.../VectoCore/Models/SimulationComponent/Data/VehicleData.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs 1 addition, 1 deletion

...toCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 10 additions, 4 deletions

...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs 126 additions, 31 deletions

...VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs 0 additions, 70 deletions

...els/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs 75 additions, 0 deletions

...Models/SimulationComponent/Impl/DrivingCycleEnumerator.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs 28 additions, 30 deletions

...els/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs 4 additions, 8 deletions

...ore/Models/SimulationComponent/Impl/PTOCycleController.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs 44 additions, 9 deletions

.../VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs 24 additions, 26 deletions

...Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs 5 additions, 5 deletions

...Core/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
VectoCore/VectoCore/VectoCore.csproj 1 addition, 0 deletions

VectoCore/VectoCore/VectoCore.csproj
VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs 1 addition, 1 deletion

...e/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs 10 additions, 0 deletions

.../VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs 1 addition, 1 deletion

VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod 1 addition, 2 deletions

...s/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod
VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod 1 addition, 2 deletions

...s/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod
VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod 1 addition, 2 deletions

...s/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod

with 605 additions and 456 deletions

Please register or to comment