Merge branch 'feature/VECTO-105-SimulationDataFactory' of...
Merge branch 'feature/VECTO-105-SimulationDataFactory' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-105-SimulationDataFactory Conflicts: VectoCore/Models/Declaration/Declaration.cs VectoCore/Models/Declaration/DeclarationData.cs VectoCore/Models/Declaration/DeclarationRims.cs VectoCore/Models/Declaration/LookupData.cs VectoCore/Models/Declaration/Rims.cs VectoCore/Models/Declaration/Segment.cs VectoCore/Models/Declaration/Segments.cs VectoCore/Models/Declaration/Wheels.cs VectoCore/Models/Simulation/Data/VectoJobData.cs VectoCore/Models/Simulation/Impl/SimulatorFactory.cs VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs VectoCore/Models/SimulationComponent/Data/GearboxData.cs VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs VectoCore/Models/SimulationComponent/Factories/EngineeringModeFactory.cs VectoCore/Models/SimulationComponent/IAuxiliary.cs VectoCore/Models/SimulationComponent/IGearbox.cs VectoCore/Models/SimulationComponent/IVehicle.cs VectoCore/VectoCore.csproj VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs VectoCoreTest/Models/Declaration/DeclarationDataTest.cs VectoCoreTest/Models/Simulation/SimulationTests.cs VectoCoreTest/Models/SimulationComponent/ClutchTest.cs VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs VectoCoreTest/Models/SimulationComponent/VehicleTest.cs VectoCoreTest/Models/SimulationComponent/WheelsTest.cs VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
No related branches found
No related tags found
Showing
- Declaration/MissionCycles/LOT2_rural Engine Only.vdri 0 additions, 3953 deletionsDeclaration/MissionCycles/LOT2_rural Engine Only.vdri
- Declaration/SegmentTable.csv 26 additions, 26 deletionsDeclaration/SegmentTable.csv
- Declaration/VCDV/CoachBus.vcdv 0 additions, 27 deletionsDeclaration/VCDV/CoachBus.vcdv
- Declaration/VCDV/RigidSolo.vcdv 0 additions, 27 deletionsDeclaration/VCDV/RigidSolo.vcdv
- Declaration/VCDV/RigidTrailer.vcdv 0 additions, 27 deletionsDeclaration/VCDV/RigidTrailer.vcdv
- Declaration/VCDV/TractorSemitrailer.vcdv 0 additions, 27 deletionsDeclaration/VCDV/TractorSemitrailer.vcdv
- Declaration/VCDV/paramerters.csv 6 additions, 0 deletionsDeclaration/VCDV/paramerters.csv
- Declaration/WHTC-Weighting-Factors.csv 4 additions, 0 deletionsDeclaration/WHTC-Weighting-Factors.csv
- Declaration/Wheels.csv 41 additions, 41 deletionsDeclaration/Wheels.csv
- VECTO.sln 0 additions, 3 deletionsVECTO.sln
- VECTO.sln.DotSettings 56 additions, 4 deletionsVECTO.sln.DotSettings
- VectoCore/Models/Connector/Ports/IFvPort.cs 24 additions, 24 deletionsVectoCore/Models/Connector/Ports/IFvPort.cs
- VectoCore/Models/Connector/Ports/ITnPort.cs 24 additions, 24 deletionsVectoCore/Models/Connector/Ports/ITnPort.cs
- VectoCore/Models/Connector/Ports/Impl/Response.cs 23 additions, 23 deletionsVectoCore/Models/Connector/Ports/Impl/Response.cs
- VectoCore/Models/Declaration/Axle.cs 1 addition, 1 deletionVectoCore/Models/Declaration/Axle.cs
- VectoCore/Models/Declaration/DeclarationData.cs 46 additions, 23 deletionsVectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/Models/Declaration/ElectricSystem.cs 5 additions, 7 deletionsVectoCore/Models/Declaration/ElectricSystem.cs
- VectoCore/Models/Declaration/Fan.cs 41 additions, 0 deletionsVectoCore/Models/Declaration/Fan.cs
- VectoCore/Models/Declaration/HVAC.cs 36 additions, 0 deletionsVectoCore/Models/Declaration/HVAC.cs
- VectoCore/Models/Declaration/Mission.cs 1 addition, 1 deletionVectoCore/Models/Declaration/Mission.cs
Loading
Please register or sign in to comment