Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into develop # Conflicts: # VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
No related branches found
No related tags found
Showing
- VECTO/GUI/GearboxForm.Designer.vb 0 additions, 34 deletionsVECTO/GUI/GearboxForm.Designer.vb
- VECTO/GUI/GearboxForm.vb 1 addition, 3 deletionsVECTO/GUI/GearboxForm.vb
- VECTO/Input Files/Gearbox.vb 1 addition, 8 deletionsVECTO/Input Files/Gearbox.vb
- VECTO/OutputData/JSONFileWriter.vb 0 additions, 1 deletionVECTO/OutputData/JSONFileWriter.vb
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 0 additions, 2 deletionsVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs 22 additions, 43 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 0 additions, 1 deletion...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
- VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 1 addition, 1 deletionVectoCore/VectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs 0 additions, 5 deletions.../VectoCore/Models/SimulationComponent/Data/GearboxData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs 1 addition, 3 deletions...toCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 3 additions, 0 deletions...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs 0 additions, 1 deletionVectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
- VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs 13 additions, 26 deletions...Test/Models/SimulationComponent/GearboxShiftLossesTest.cs
- VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_TractionInterruption.vdri 3 additions, 3 deletions...dSpeed/MeasuredSpeed_Gear_Rural_TractionInterruption.vdri
Loading
Please register or sign in to comment