Merge remote-tracking branch 'origin/develop' into feature/VECTO-389-at-gear-shift-rules
# Conflicts: # VECTO/Input Files/Gearbox.vb # VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs # VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
No related branches found
No related tags found
Showing
- VECTO/Input Files/Gearbox.vb 19 additions, 19 deletionsVECTO/Input Files/Gearbox.vb
- VECTO/Input Files/VectoJob.vb 13 additions, 10 deletionsVECTO/Input Files/VectoJob.vb
- VectoCommon/VectoCommon/InputData/TableData.cs 2 additions, 2 deletionsVectoCommon/VectoCommon/InputData/TableData.cs
- VectoConsole/Program.cs 2 additions, 2 deletionsVectoConsole/Program.cs
- VectoConsole/Properties/Version.cs 2 additions, 2 deletionsVectoConsole/Properties/Version.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 7 additions, 9 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs 4 additions, 4 deletions...putData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
- VectoCore/VectoCore/InputData/Reader/Impl/DrivingCycleProxy.cs 30 additions, 0 deletions...Core/VectoCore/InputData/Reader/Impl/DrivingCycleProxy.cs
- VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs 3 additions, 1 deletion...re/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs
- VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs 26 additions, 14 deletions...putData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
- VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 1 addition, 1 deletionVectoCore/VectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/VectoCore/Models/Declaration/LookupData.cs 1 addition, 1 deletionVectoCore/VectoCore/Models/Declaration/LookupData.cs
- VectoCore/VectoCore/Models/Declaration/Segments.cs 7 additions, 3 deletionsVectoCore/VectoCore/Models/Declaration/Segments.cs
- VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs 6 additions, 4 deletionsVectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
- VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs 1 addition, 1 deletionVectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
- VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 2 additions, 2 deletions...ore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs 4 additions, 3 deletions...Core/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
- VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs 3 additions, 0 deletions...Core/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs 11 additions, 1 deletion...oCore/Models/SimulationComponent/Data/DrivingCycleData.cs
- VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs 2 additions, 0 deletions...VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs
Loading
Please register or sign in to comment