* develop:
  Engine-only full cycle (3950s) basically works. Open issue: initial engine state at beginning of simulation
  * extending engine model
  * additional engine-only cycle * make engine-tests work
  * renaming conversion method (VectoMath) * changing interface of IModalDataWriter back to its previous form * extending engine model
  * extending engine model, fill more result fields; * add time information to commitSimulationStep in ModalDataWriter
  adding new column to the modal output data: simulation interval [s]
  store engine power in currentState
  move engine speed into engine's state class

Conflicts:
	VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Utils/VectoMath.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

Merge pull request #37 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-54-implement-software-tests-for-engine to develop

* commit 'b0b95267':
  Engine-only full cycle (3950s) basically works. Open issue: initial engine state at beginning of simulation
  store engine power in currentState
  move engine speed into engine's state class

Open issue: initial engine state at beginning of simulation

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VECTO-54-implement-software-tests-for-engine

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

Merge pull request #36 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-57-implement-engine-model to develop

* commit '6ef4c7af':
  * extending engine model

Merge pull request #35 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-57-implement-engine-model to develop

* commit '555945dc':
  * additional engine-only cycle * make engine-tests work
  * renaming conversion method (VectoMath) * changing interface of IModalDataWriter back to its previous form * extending engine model
  * extending engine model, fill more result fields; * add time information to commitSimulationStep in ModalDataWriter
  adding new column to the modal output data: simulation interval [s]

* make engine-tests work

Merge pull request #34 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-82-write-test-for-delauney to develop

* commit 'b6753b9b':
  FuelConsumptionMap Tests
  added tolerance to double comparison in Tests
  Tests for DelauneyMap
  added test file for delauney map
  Delauney: added comments to the triangulate algorithm
  Delauney Map triangulate minor changes
  better readability of triangulation method

* changing interface of IModalDataWriter back to its previous form
* extending engine model

Merge pull request #32 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-81-model-driving-cycles to develop

* commit '13a0ce0b':
  added reading of auxiliary power consumption in driving cycle, corrected test for engine only driving cycle
  DrivingCycle Test for files when time field is missing

Merge pull request #31 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-78-csv-files-header to develop

* commit '7a356ebf':
  DrivingCycle: time field gets filled up in 1Hz steps if time field is missing in timebased driving cycle
  FullLoadCurve: implemented check for header columns, with fallback to indexed columns if name are not valid

added reading of auxiliary power consumption in driving cycle, corrected test for engine only driving cycle

DrivingCycle: time field gets filled up in 1Hz steps if time field is missing in timebased driving cycle

FullLoadCurve: implemented check for header columns, with fallback to indexed columns if name are not valid

* add time information to commitSimulationStep in ModalDataWriter

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VECTO-57-implement-engine-model

Merge pull request #30 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-76-calculation-of-power-loss-of-the to develop

* commit 'cc54aaf0':
  adding addtional test-cases for engine-only simulation. results match with modified Vecto 2.0 engine-only computation
  renaming extensionMethod
  modified unit test assertion to use expected value

adding addtional test-cases for engine-only simulation. results match with modified Vecto 2.0 engine-only computation

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into bugfix/VECTO-76-calculation-of-power-loss-of-the

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

Merge pull request #29 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-81-model-driving-cycles to develop

* commit 'a9e4c8ef':
  combined EngineOnlyDrivingCycleData with DrivingCycleData
  added a todo comment (Combine DrivingCycleData with EngineOnlyDrivingCycleData)
  Implemented DistanceBased Driving Cycle and Time Based Driving Cycle with the required Interfaces and Data Classes
  Splitted EngineOnlyDrivingCycleData and Cycle. Added EngineOnlyGearbox to Tests because it is needed to pass.
  implemented driving cycle as VectoSimulationComponent

* develop:
  update repository

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs

* commit '95f090e9':
  update repository