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

Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into bugfix/VECTO-156-refactoring-of-input-data-handling

# By Michael Krisper (6) and Markus Quaritsch (5)
# Via QUARITSCH Markus (5) and others
* 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim:
  add checks for reading driving cycle, additional testcases for drivingcycledata
  bugfix: summary file / modalDataWriter: fixing null-reference for stopTime if cycle contains no stops
  added eupl license header to python script for converting declaration data into new format
  added EUPL license header to all source files
  added project for adding licence headers to all cs files
  corrected progress percent jump
  new dev build 334
  testcase for speed-dependent cross-wind correction
  implementing speed-dependent crosswind correction, refactoring of crosswind correction curve
  added exceptions when file not exists
  [VECTO-134] show file links in status output in GUI

Conflicts:
	DeclarationCycleZip/Program.cs
	VECTO/GUI/F_MAINForm.vb
	VectoCore/FileIO/DeclarationFile/EngineFileDecl.cs
	VectoCore/FileIO/DeclarationFile/GearboxFileDecl.cs
	VectoCore/FileIO/DeclarationFile/JobFileDecl.cs
	VectoCore/FileIO/DeclarationFile/VehicleFileDecl.cs
	VectoCore/FileIO/EngineeringFile/EngineFileEng.cs
	VectoCore/FileIO/EngineeringFile/GearboxFileEng.cs
	VectoCore/FileIO/EngineeringFile/JobFileEng.cs
	VectoCore/FileIO/EngineeringFile/VehicleFileEng.cs
	VectoCore/FileIO/InputFileReader.cs
	VectoCore/FileIO/JsonDataHeader.cs
	VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
	VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
	VectoCore/FileIO/Reader/ISimulationDataReader.cs
	VectoCore/FileIO/Reader/Impl/AbstractSimulationDataReader.cs
	VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs
	VectoCore/FileIO/Reader/Impl/EngineOnlySimulationDataReader.cs
	VectoCore/FileIO/Reader/Impl/EngineeringModeSimulationDataReader.cs
	VectoCore/FileIO/VectoFiles.cs
	VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
	VectoCore/Models/Simulation/Impl/JobContainer.cs
	VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
	VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
	VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
	VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
	VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
	VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
	VectoCore/Models/SimulationComponent/Data/VehicleData.cs
	VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
	VectoCore/OutputData/IModalDataContainer.cs
	VectoCore/OutputData/ModalDataContainer.cs
	VectoCore/OutputData/PDF/DeclarationReport.cs
	VectoCore/OutputData/SummaryDataContainer.cs
	VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
	VectoCoreTest/Integration/Truck40tPowerTrain.cs
	VectoCoreTest/Models/Simulation/VechicleContainerTests.cs
	VectoCoreTest/Models/SimulationComponent/DriverTest.cs
	VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
	VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs
parents 53cf4e6d 7e842581
No related branches found
No related tags found
Loading
Showing
with 2961 additions and 2462 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