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 5cc40630 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'quaritsch/feature/VECTO-70-wheels-engine-only-driving-cycle' into feature/VECTO-102-auxiliaries-identification

Conflicts:
	VectoCore/FileIO/EngineeringFile/JobFileEng.cs
	VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
	VectoCore/Models/Declaration/AxleConfiguration.cs
	VectoCore/Models/Simulation/Data/ModalDataWriter.cs
	VectoCore/Models/Simulation/Data/ModalResult.cs
	VectoCore/Models/Simulation/Data/VectoRunData.cs
	VectoCore/Models/SimulationComponent/Data/AuxiliaryCycleDataAdapter.cs
	VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
	VectoCore/Models/SimulationComponent/Data/IAuxiliaryCycleData.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Models/SimulationComponent/Impl/DirectAuxiliary.cs
	VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
	VectoCore/Models/SimulationComponent/Impl/MappingAuxiliary.cs
	VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
	VectoCore/Utils/DoubleExtensionMethods.cs
	VectoCore/Utils/IntExtensionMethods.cs
	VectoCore/Utils/SI.cs
	VectoCore/Utils/VectoMath.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
	VectoCoreTest/VectoCoreTest.csproj
parents 2cb6be1d a7bc2b2e
No related branches found
No related tags found
No related merge requests found
Showing
with 694 additions and 88 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