Conflicts:
	VECTO/GUI/F_MAINForm.vb
	VectoConsole/Program.cs
	VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
	VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs
	VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
	VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs

Merge pull request #173 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-260-aaux-lookup-cycle to develop

* commit 'b3d54015':
  disabled drawing graph of delaunay map
  added all cycles to generic coach
  make sure, commits are called in a particular order (for important components)
  [Driver] set operating point property in response
  adding new test-files
  gearbox: when halted: engage gear
  added new test with a different gearbox (12t truck)
  use actionRoll in abort criterion; use vehicleStopped property
  renamed method parameter to be more accurate
  only compensate torque in brakes when stopping if clutch is engaged (otherwise no operating point might be found)
  omit vehicleContainer and VectoRunData in error message on validation

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-260-aaux-lookup-cycle

# By Michael Krisper
# Via Michael Krisper (4) and QUARITSCH Markus (3)
* 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim:
  removed TRACE var for Release, added function for printing the search iteration data
  IterationStatistics
  renamed Enabled --> Enable, and DisableLogging --> Init for test suite
  extended debug output only with TRACE defined
  added IterationStatistics for performance measuring

Merge pull request #172 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:VECTO-194-performance-analysis-optimization to develop

* commit '3490f496':
  removed TRACE var for Release, added function for printing the search iteration data
  IterationStatistics
  renamed Enabled --> Enable, and DisableLogging --> Init for test suite
  extended debug output only with TRACE defined
  added IterationStatistics for performance measuring

only compensate torque in brakes when stopping if clutch is engaged (otherwise no operating point might be found)

Merge pull request #171 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-260-aaux-lookup-cycle to develop

* commit 'd564dbab':
  busAux: select correct cycle: move urban down
  engine: add source for dry-run response
  search alg: move calculation of y a little bit up
  do not take braking power into account while coasting (smart aux are off)
  corrected naming: delauney -> Delaunay

Merge remote-tracking branch 'markus/feature/VECTO-260-aaux-lookup-cycle' into VECTO-194-performance-analysis-optimization

Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs

Merge pull request #170 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-260-aaux-lookup-cycle to develop

* commit 'a352c29b':
  combustionEngine: removed check for 'above full-load and below drag-load'
  removed duplicate property (drivingBehavior vs. driverBehavior), moved property from strategy to driver, moved vehiclestopped property to vehicle
  update iteration count inside loop
  disable writing search sequence
  formatting, use tolerance for assertions
  adapting expected values due to change of engine speed from int to double in AAUX
  gui: only log errors
  move constructors up
  added operating point to response, introduce abort criterion for search, coasting handles DistanceExceeded response (i.e. vehicle stops to early) and issues braking action
  code formatting
  code formatting
  [BusAux]: change engine speed from integer to double
  get correct cycle name and estimated driving time
  refactoring bus auxiliaries input provider
  use fulloadcurvereader

Merge pull request #169 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-265-delauney-map-triangulation-fails to develop

* commit 'e74d7267':
  make test run
  adding name to delauney map for error messages
  adding check for duplicate points: same x/y coordinate but different z coordinate

removed duplicate property (drivingBehavior vs. driverBehavior), moved property from strategy to driver, moved vehiclestopped property to vehicle