Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 9d13c9ae authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

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
parents 625c9fc0 a5dcad0c
No related branches found
No related tags found
No related merge requests found
Showing
with 334 additions and 4238 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment