Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into feature/VehicleContainer

Conflicts:
	VectoCore/VectoCore.csproj
	VectoCoreTest/Models/UnitTest1.cs

* commit '672f6780':
  refactoring namespaces

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

* commit 'dde498e7':
  more work on engine model, implementing first testcases
  implemented engine model, accessing full load curve (incl. interpolation). Testcases: green
  Bugfix: CSV Parser: use dot (.) as decimal separator
  implementing engine model: new engine state class, full load curve lookup methods
  reading testdata from CSV file
  start working on engine model

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

Conflicts:
	VectoCore/Exceptions/VectoExceptions.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Utils/DataRowExtensionMethods.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
	VectoCoreTest/VectoCoreTest.csproj

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

* commit 'eaba2a19':
  adding new class for math operations
  adding result files, reading mod-data file
  sync repository
  update Testdata
  introduce new exception
  reading testdata from CSV file

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

Conflicts:
	VectoCore/Exceptions/VectoExceptions.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCoreTest/VectoCoreTest.csproj

Merge pull request #20 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:feature/VECTO-53-read-and-write-datafiles to develop

* commit 'ffda13e9': (32 commits)
  added captions in csv-writer and modalresults
  corrected Localization Errors in CSV read/write, minor changes in DelauneyMap
  finished rewrite of delauney triangulation
  delauney triangulation
  added floating point tolerances for equality checks, refactored many simple loops to linq expressions
  further triangulation
  rewrite delauney triangulation for fuel consumption map.
  added some exceptions, more robust csv read, renamed ModalResultFields FCAUXc, FCWHTCc
  refactored strings, rewrote CombustionEngineData
  added string constants for EngineOnlyDrivingCycle Fields
  renamed ModalResult-enum to ModalResultFields, removed VS-designer attribute from ModalResults
  added example result files for tests
  renamed property names (full named, no appreviations)
  Automating Testruns
  corrected wrong column error in FuelConsumptionMap (engine torque --> torque)
  read FuelConsumption File, renamed Read-Functions to ReadFromFile
  Reading FullLoadCurves
  added test files for engine tests
  corrected build errors. project and tests are buildable and executable again.
  refactoring design
  ...

Testcases: green

Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-57-implement-engine-model

added floating point tolerances for equality checks, refactored many simple loops to linq expressions

Merge branch 'feature/VECTO-54-implement-software-tests-for-engine' into feature/VECTO-57-implement-engine-model

Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-57-implement-engine-model

Conflicts:
	VectoCoreTest/VectoCoreTest.csproj
	VectoCoreTest/app.config

Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-53-read-and-write-datafiles

Conflicts:
	VectoCore/VectoCore.csproj

Conflicts:
	VectoCoreTest/VectoCoreTest.csproj
	VectoCoreTest/app.config

Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-57-implement-engine-model

Conflicts:
	VectoCoreTest/VectoCoreTest.csproj
	VectoCoreTest/app.config

Merge branch 'feature/VECTO-53-read-and-write-datafiles' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-54-implement-software-tests-for-engine

Conflicts:
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs

Conflicts:
	VectoCoreTest/VectoCoreTest.csproj
	VectoCoreTest/app.config