Merge branch 'develop' into merge/multistage_and_xml
# Conflicts: # VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs # VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs # VectoCore/VectoCoreTest/VectoCoreTest.csproj
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/SteeringPump.cs 2 additions, 0 deletionsVectoCore/VectoCore/Models/Declaration/SteeringPump.cs
- VectoCore/VectoCore/Models/Simulation/Impl/PCCSegmentPreprocessor.cs 2 additions, 1 deletion...ectoCore/Models/Simulation/Impl/PCCSegmentPreprocessor.cs
- VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs 28 additions, 4 deletions...e/Models/SimulationComponent/Strategies/HybridStrategy.cs
- VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs 3 additions, 13 deletions...toCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
- VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs 1 addition, 0 deletions...re/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
- VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs 1 addition, 1 deletion...e/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
- VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs 3 additions, 1 deletion...Core/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
- VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs 28 additions, 0 deletions...CoreTest/Models/Simulation/SimulationPreprocessingTest.cs
- VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs 3 additions, 7 deletionsVectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
- VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/GenericBattery_10kWh_658V.vbat 2 additions, 1 deletion...ehicle_Group5_P2_BatSystem/GenericBattery_10kWh_658V.vbat
- VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/GenericBattery_5kWh_320V.vbat 2 additions, 1 deletion...Vehicle_Group5_P2_BatSystem/GenericBattery_5kWh_320V.vbat
- VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/Interurban_Short.vdri 147 additions, 0 deletions.../GenericVehicle_Group5_P2_BatSystem/Interurban_Short.vdri
- VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2_BatSystem/P2 Group 5_2.vecto 2 additions, 1 deletion...ids/GenericVehicle_Group5_P2_BatSystem/P2 Group 5_2.vecto
- VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto 2 additions, 1 deletion...ta/Integration/ADAS/Group5PCCEng/Class5_Tractor_ENG.vecto
- VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group5PCCEng/Coach_short_HW.vdri 6108 additions, 0 deletions...estData/Integration/ADAS/Group5PCCEng/Coach_short_HW.vdri
- VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml 2 additions, 0 deletions...emptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
- VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/GearboxPowerSplit.vgbx 3 additions, 3 deletions...gration/EngineeringMode/CityBus_AT/GearboxPowerSplit.vgbx
- VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/CityBus_AT/GearboxSerial.vgbx 3 additions, 3 deletions...Integration/EngineeringMode/CityBus_AT/GearboxSerial.vgbx
- VectoCore/VectoCoreTest/VectoCoreTest.csproj 3 additions, 0 deletionsVectoCore/VectoCoreTest/VectoCoreTest.csproj
Loading
Please register or sign in to comment