Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emluzraph/vecto-sim into feature/VECTO-84-vectosimulation-for-clutch-engine-only Conflicts: VectoCore/Models/Connector/Ports/ITnOutPort.cs VectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs VectoCore/Models/Simulation/Impl/SimulatorFactory.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/Models/SimulationComponent/Impl/EngineOnlyAuxiliary.cs VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs VectoCore/Models/SimulationComponent/Impl/Gearbox.cs VectoCore/Utils/SI.cs VectoCore/VectoCore.csproj VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs VectoCoreTest/Models/SimulationComponent/MockPorts.cs
No related branches found
No related tags found
Showing
- VectoCore/Models/Connector/Connector.cs 0 additions, 20 deletionsVectoCore/Models/Connector/Connector.cs
- VectoCore/Models/Connector/Ports/IDriverDemandInPort.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/IDriverDemandInPort.cs
- VectoCore/Models/Connector/Ports/IDriverDemandInProvider.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/IDriverDemandInProvider.cs
- VectoCore/Models/Connector/Ports/IDriverDemandOutPort.cs 0 additions, 10 deletionsVectoCore/Models/Connector/Ports/IDriverDemandOutPort.cs
- VectoCore/Models/Connector/Ports/IDriverDemandOutProvider.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/IDriverDemandOutProvider.cs
- VectoCore/Models/Connector/Ports/IDriverDemandPort.cs 31 additions, 0 deletionsVectoCore/Models/Connector/Ports/IDriverDemandPort.cs
- VectoCore/Models/Connector/Ports/IDriverDemandProvider.cs 26 additions, 0 deletionsVectoCore/Models/Connector/Ports/IDriverDemandProvider.cs
- VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs 18 additions, 0 deletionsVectoCore/Models/Connector/Ports/IDrivingCyclePort.cs
- VectoCore/Models/Connector/Ports/IDrivingCycleProvider.cs 14 additions, 0 deletionsVectoCore/Models/Connector/Ports/IDrivingCycleProvider.cs
- VectoCore/Models/Connector/Ports/IFvPort.cs 31 additions, 0 deletionsVectoCore/Models/Connector/Ports/IFvPort.cs
- VectoCore/Models/Connector/Ports/IInPort.cs 0 additions, 4 deletionsVectoCore/Models/Connector/Ports/IInPort.cs
- VectoCore/Models/Connector/Ports/IInShaft.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/IInShaft.cs
- VectoCore/Models/Connector/Ports/IOutPort.cs 0 additions, 4 deletionsVectoCore/Models/Connector/Ports/IOutPort.cs
- VectoCore/Models/Connector/Ports/IOutShaft.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/IOutShaft.cs
- VectoCore/Models/Connector/Ports/IResponse.cs 4 additions, 1 deletionVectoCore/Models/Connector/Ports/IResponse.cs
- VectoCore/Models/Connector/Ports/IRoadPortProvider.cs 26 additions, 0 deletionsVectoCore/Models/Connector/Ports/IRoadPortProvider.cs
- VectoCore/Models/Connector/Ports/IShaft.cs 26 additions, 0 deletionsVectoCore/Models/Connector/Ports/IShaft.cs
- VectoCore/Models/Connector/Ports/ITnInPort.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/ITnInPort.cs
- VectoCore/Models/Connector/Ports/ITnPort.cs 29 additions, 2 deletionsVectoCore/Models/Connector/Ports/ITnPort.cs
- VectoCore/Models/Connector/Ports/Impl/InPort.cs 0 additions, 7 deletionsVectoCore/Models/Connector/Ports/Impl/InPort.cs
Loading
Please register or sign in to comment