# Conflicts:
#	Documentation/Checklist_Release_VECTO.dotx
#	VECTO/VECTO.vbproj
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs

Merge pull request #806 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1214-validation-of-input-data-fails-when-gearbox-speed-limits-are-applied to develop

* commit '74df1e83':
  limit max engine speed in validation to maximum of max gear speed and max engine speed

Merge pull request #804 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1211-simulation-abort-urban-delivery-ref-load to develop

* commit '5a3ef313':
  adapt testcase: slightly lower fuel consumption due to changes in limiting acceleration while coasting
  driver model: in case the limitation mode is set to none for an operating point, don't limit the acceleration as well (might be higher than driver acc in case of traction interruption)

adapt testcase: slightly lower fuel consumption due to changes in limiting acceleration while coasting

driver model: in case the limitation mode is set to none for an operating point, don't limit the acceleration as well (might be higher than driver acc in case of traction interruption)

Merge pull request #803 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-1207-run-vecto-in-64bit-mode-by-default to develop

* commit 'd51d4d17':
  change build settings: disable 'prefer 32bit' -> application runs in 64bit mode

Merge pull request #802 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1209-unexpected-response-response-overload to develop

* commit '242a7ac9':
  engine idle controller: in case an overload occurs, use same max engine speed as for request before

Merge pull request #801 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-1194-handling-input-parameter-vocational-for-groups-other-than-4-5-9-10 to develop

* commit '73c49ca5':
  remove wrongly added testcases - handling of vocational is done in factory, not segmentation lookup
  declarationmode factory: in case no segment was found, try again with vocational set to false; additional parameter in dataobjectadapter to overwrite vocational field from input in case no segment with vocational was found.
  addingtestcases to simulate vocational vehicles other than 4, 5, 9 10

* commit '2007eb85':
  revert unintendedly committed change

Merge branch 'develop' into feature/VECTO-1194-handling-input-parameter-vocational-for-groups-other-than-4-5-9-10

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

Merge branch 'develop' into feature/VECTO-1194-handling-input-parameter-vocational-for-groups-other-than-4-5-9-10

declarationmode factory: in case no segment was found, try again with vocational set to false; additional parameter in dataobjectadapter to overwrite vocational field from input in case no segment with vocational was found.

* commit 'd8409906':
  add annotations to manufacturer report for items added in latest amendment of monitoring data
  Vecto AAUX: set correct directory before running tests (required when running tests individually)

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

Merge pull request #798 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1189-error-in-delaunay-triangulation-invariant-violated to develop

* commit '5e0f94ae':
  removed inverted lossmap in transmission loss map class (forward calculation) as the triangulation may cause errors due to limited numerical accuracy (even with double precision)

removed inverted lossmap in transmission loss map class (forward calculation) as the triangulation may cause errors due to limited numerical accuracy (even with double precision)

Merge pull request #797 in VECTO/vecto-sim from ~EMBRANDST/vecto-sim:bugfix/VECTO-1159-simulation-abort-in-urbandelivery-lowloading to develop

* commit '9e7d34fb':
  bugfix: Decreasing MaxDistance to break earlier

Merge pull request #796 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:ReleaseCandidates/v3.3.4.1686 to master

* commit 'ee7ab587':
  updating release report
  adding results and release report
  compiling release version
  updating changelog
  updating release report
  updating .gitignore
  bugfix: Increasing number of iterations to find operating point
  validation of run-data: limit max. speed for checking loss-maps up to vehicle's design speed + ovespeed, limited by vehicle's max possible speed

Merge pull request #795 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-1074-vecto-calculation-aborts-with-interpolation-error to develop

* commit 'dfadc1cb':
  updating .gitignore
  validation of run-data: limit max. speed for checking loss-maps up to vehicle's design speed + ovespeed, limited by vehicle's max possible speed
  use same nunit test adapter for all projects (3.11.2)

(cherry picked from commit dfadc1cb)

Merge pull request #794 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:ReleaseCandidates/v3.3.4.1686 to ReleaseCandidates/v3.3.4.1686

* commit '1f88d62c':
  bugfix: Increasing number of iterations to find operating point
  validation of run-data: limit max. speed for checking loss-maps up to vehicle's design speed + ovespeed, limited by vehicle's max possible speed

(cherry picked from commit bada208b)

validation of run-data: limit max. speed for checking loss-maps up to vehicle's design speed + ovespeed, limited by vehicle's max possible speed

(cherry picked from commit b5ba8517)