Merge branch 'feature/VECTO-53-read-and-write-datafiles' of...
Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-54-implement-software-tests-for-engine Conflicts: VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
No related branches found
No related tags found
Showing
- VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs 141 additions, 56 deletions...e/Models/SimulationComponent/Data/CombustionEngineData.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs 19 additions, 9 deletions...els/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs 13 additions, 4 deletions...e/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs 14 additions, 6 deletions...Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs
- VectoCore/Models/SimulationComponent/Data/ModalResult.cs 79 additions, 49 deletionsVectoCore/Models/SimulationComponent/Data/ModalResult.cs
- VectoCore/Models/SimulationComponent/IModalDataWriter.cs 1 addition, 1 deletionVectoCore/Models/SimulationComponent/IModalDataWriter.cs
- VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 3 additions, 3 deletions...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/VectoCore.csproj 1 addition, 3 deletionsVectoCore/VectoCore.csproj
- VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs 9 additions, 11 deletions...reTest/Models/SimulationComponent/CombustionEngineTest.cs
- VectoCoreTest/Utils/TestModalDataWriter.cs 1 addition, 1 deletionVectoCoreTest/Utils/TestModalDataWriter.cs
- VectoCoreTest/app.config 31 additions, 1 deletionVectoCoreTest/app.config
Loading
Please register or sign in to comment