Merge branch 'develop' into...
Merge branch 'develop' into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev # Conflicts: # VectoCore/VectoCore/Models/GenericModelData/GenericRatedPointHelper.cs # VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2.5/ElectricMotor/Inputdaten P2 Group 5/Electric components/GenericMap_30kW_50Nm.vemo
No related branches found
No related tags found
Showing
- VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs 1 addition, 1 deletionVectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
- VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 0 additions, 1 deletionVectoCore/VectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/VectoCore/Models/GenericModelData/GenericBusBatteryData.cs 4 additions, 4 deletions...ectoCore/Models/GenericModelData/GenericBusBatteryData.cs
- VectoCore/VectoCore/Models/Simulation/DataBus/IDriverInfo.cs 2 additions, 0 deletionsVectoCore/VectoCore/Models/Simulation/DataBus/IDriverInfo.cs
- VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs 2 additions, 0 deletionsVectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs
- VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 8 additions, 0 deletions...ore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs 2 additions, 6 deletionsVectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
- VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs 8 additions, 2 deletions...Core/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
- VectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs 5 additions, 0 deletionsVectoCore/VectoCore/Models/Simulation/Impl/WHRCharger.cs
- VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs 2 additions, 0 deletions...e/VectoCore/Models/SimulationComponent/IDriverStrategy.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs 1 addition, 0 deletions...oCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 6 additions, 1 deletion...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs 1 addition, 1 deletion.../Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs 2 additions, 2 deletions...els/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs 1 addition, 0 deletions...oCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs 17 additions, 4 deletions...oCore/Models/SimulationComponent/Impl/HybridController.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs 1 addition, 0 deletions...els/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs 1 addition, 0 deletions.../VectoCore/Models/SimulationComponent/Impl/PWheelCycle.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategyOptimized.cs 2 additions, 0 deletions...mponent/Impl/Shiftstrategies/AMTShiftStrategyOptimized.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/SimplePowertrainContainer.cs 1 addition, 0 deletions...els/SimulationComponent/Impl/SimplePowertrainContainer.cs
Loading
Please register or sign in to comment