Conflicts:
	VECTO/GUI/F_MAINForm.vb
	VectoConsole/Program.cs
	VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
	VectoCore/FileIO/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
	VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
	VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
	VectoCore/Models/Simulation/Impl/VehicleContainer.cs
	VectoCore/OutputData/ModalDataContainer.cs
	VectoCoreTest/Integration/DeclarationReportTest.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Integration/FullCycleDeclarationTest.cs
	VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
	VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
	VectoCoreTest/Models/Simulation/AuxTests.cs
	VectoCoreTest/Models/Simulation/SimulationTests.cs
	VectoCoreTest/Models/SimulationComponent/DriverTest.cs
	VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs
	VectoCoreTest/Utils/GraphWriter.cs

Merge pull request #101 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-161-problem-with-joblist-program-crashes to develop

* commit 'd1732e59':
  adapt lambda expression for writing sum data to sort cycles according to creation sequence instead of finishing sequence

adapt lambda expression for writing sum data to sort cycles according to creation sequence instead of finishing sequence

Merge pull request #100 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-161-problem-with-joblist-program-crashes to develop

* commit 'a8c40b67':
  fix: no longer use combination of jobname, cycle, and loading to identify a run -> changed to unique number

fix: no longer use combination of jobname, cycle, and loading to identify a run -> changed to unique number

Merge pull request #99 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-156-refactoring-of-input-data-handling to develop

* commit '02aa5ddb': (21 commits)
  adding some json tests
  update comments
  added comments to inputData Interface: mapping to parameter in VECTO Input Parameters.xlsx
  minor cleanup, make tests work again (changed error messages)
  make properties in json-classes virtual to allow override
  removed aerodynamicDragArea from vehicledata, only use lookup-table for airdrag
  removing unused uses
  adding documentation for input data parameters
  wrap accessing json keys with exceptions, reading files
  more testcases work
  cleaning up old (and unused) files
  change inputdata signature: engine idel speed -> PerSecond, AuxiliaryType -> string missing axlegeardata make testcases run (introduce filewriter, use correect paths)
  account for typo in json keys
  testcases compile as well,
  major refactoring steps done, separation of output data and output writer; VectoCore compiles again, some errors in VectoTest...
  more work on refactoring
  adding methods to create maps (fuel consumption, loss maps, ...) from data table, further refactoring of input data, adapting data object adapter
  move Json keys to resource file
  introducing InputDataProvider and additional interfaces, Json parser refactored
  moving FileIO to new namespace, interface for inputData
  ...

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

This reverts commit 41ed08d9.

AuxiliaryType -> string
missing axlegeardata
make testcases run (introduce filewriter, use correect paths)

now let's make the tests green again...

major refactoring steps done, separation of output data and output writer; VectoCore compiles again, some errors in VectoTest...

Merge pull request #96 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-159-add-license-header-in-every-source to develop

* commit '82d8141c':
  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

Merge remote-tracking branch 'krisper/feature/VECTO-159-add-license-header-in-every-source' into develop

adding methods to create maps (fuel consumption, loss maps, ...) from data table, further refactoring of input data, adapting data object adapter