Merge remote-tracking branch 'origin/develop' into feature/VECTO-177-pwheel-mode-for-sico
Conflicts: VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs VectoCoreTest/VectoCoreTest.csproj
No related branches found
No related tags found
Showing
- VectoCore/InputData/FileIO/JSON/JSONEngineData.cs 35 additions, 5 deletionsVectoCore/InputData/FileIO/JSON/JSONEngineData.cs
- VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs 36 additions, 3 deletionsVectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
- VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs 40 additions, 0 deletionsVectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
- VectoCore/InputData/Impl/InputData.cs 23 additions, 0 deletionsVectoCore/InputData/Impl/InputData.cs
- VectoCore/InputData/InputData.cs 26 additions, 26 deletionsVectoCore/InputData/InputData.cs
- VectoCore/InputData/IntegrityStatus.cs 11 additions, 0 deletionsVectoCore/InputData/IntegrityStatus.cs
- VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs 42 additions, 6 deletions.../Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
- VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs 6 additions, 2 deletions...putData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
- VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs 1 addition, 0 deletions...putData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
- VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs 21 additions, 23 deletions...putData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
- VectoCore/Models/Declaration/Axle.cs 5 additions, 1 deletionVectoCore/Models/Declaration/Axle.cs
- VectoCore/Models/Declaration/AxleConfiguration.cs 7 additions, 0 deletionsVectoCore/Models/Declaration/AxleConfiguration.cs
- VectoCore/Models/Simulation/Data/VectoRunData.cs 2 additions, 1 deletionVectoCore/Models/Simulation/Data/VectoRunData.cs
- VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs 1 addition, 1 deletionVectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
- VectoCore/Models/Simulation/Impl/SimulatorFactory.cs 6 additions, 4 deletionsVectoCore/Models/Simulation/Impl/SimulatorFactory.cs
- VectoCore/Models/SimulationComponent/Data/AxleGearData.cs 4 additions, 1 deletionVectoCore/Models/SimulationComponent/Data/AxleGearData.cs
- VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs 2 additions, 4 deletions...e/Models/SimulationComponent/Data/CombustionEngineData.cs
- VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs 49 additions, 44 deletions...ls/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs 21 additions, 15 deletionsVectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs 15 additions, 0 deletions...odels/SimulationComponent/Data/SimulationComponentData.cs
Loading
Please register or sign in to comment