Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-84-vectosimulation-for-clutch-engine-only Conflicts: VectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs VectoCore/Models/Simulation/Impl/VehicleContainer.cs VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs VectoCore/Utils/Formulas.cs VectoCore/Utils/SI.cs VectoCoreTest/Models/SimulationComponent/MockPorts.cs
No related branches found
No related tags found
Showing
- VECTO.sln.DotSettings 2 additions, 1 deletionVECTO.sln.DotSettings
- VectoCore/Models/Connector/Ports/ITnPort.cs 1 addition, 1 deletionVectoCore/Models/Connector/Ports/ITnPort.cs
- VectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs 1 addition, 1 deletionVectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs
- VectoCore/Models/Simulation/Impl/VehicleContainer.cs 1 addition, 1 deletionVectoCore/Models/Simulation/Impl/VehicleContainer.cs
- VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs 13 additions, 11 deletions...e/Models/SimulationComponent/Data/CombustionEngineData.cs
- VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs 417 additions, 399 deletions...oCore/Models/SimulationComponent/Data/DrivingCycleData.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs 163 additions, 164 deletions...els/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs 39 additions, 34 deletions...e/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 23 additions, 23 deletions...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/Models/SimulationComponent/Impl/EngineOnlyAuxiliary.cs 2 additions, 2 deletions...re/Models/SimulationComponent/Impl/EngineOnlyAuxiliary.cs
- VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs 1 addition, 1 deletion...Core/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs
- VectoCore/Models/SimulationComponent/Impl/Gearbox.cs 1 addition, 1 deletionVectoCore/Models/SimulationComponent/Impl/Gearbox.cs
- VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs 1 addition, 1 deletion.../Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
- VectoCore/Utils/DoubleExtensionMethods.cs 15 additions, 16 deletionsVectoCore/Utils/DoubleExtensionMethods.cs
- VectoCore/Utils/Formulas.cs 6 additions, 10 deletionsVectoCore/Utils/Formulas.cs
- VectoCore/Utils/IntExtensionMethods.cs 24 additions, 5 deletionsVectoCore/Utils/IntExtensionMethods.cs
- VectoCore/Utils/SI.cs 340 additions, 85 deletionsVectoCore/Utils/SI.cs
- VectoCore/Utils/VectoMath.cs 25 additions, 0 deletionsVectoCore/Utils/VectoMath.cs
- VectoCoreTest/Models/Simulation/DrivingCycleTests.cs 64 additions, 64 deletionsVectoCoreTest/Models/Simulation/DrivingCycleTests.cs
- VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs 1 addition, 1 deletion...reTest/Models/SimulationComponent/CombustionEngineTest.cs
Loading
Please register or sign in to comment