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 166dcc9c authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'Private/Complexity' into feature/VECTO-526-refactor-complex-methods

Conflicts:
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
	VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs
parents 1cb9cf32 aeb70c1a
No related branches found
No related tags found
No related merge requests found
Showing
with 467 additions and 476 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