# Conflicts:
#	VECTO/GUI/GearboxForm.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
#	VECTOAux/VectoAuxiliariesTests/packages.config
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoCommon/VectoHashingTest/packages.config
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/Utils/VectoCSVFile.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/packages.config

* commit '1f5b04e4':
  adding release report, results, checksums

* commit '3b5aeb92':
  new release: update release notes, compile new version, generate help
  updating declaration mode xml test vehicles
  updating header in source files
  updating version number

* commit 'd3e5b681': (57 commits)
  remove testcase that is no longer required (no default values for optional new parameters)
  adding new mandatory input parameters to test data
  xml writer: write new mandatory parameters with default values
  make other parameters in xml declaration input data provider mandatory
  make NgTankSystem input parameter optional
  correct typo in annotation of manufacturer report
  set new parameters added with first amendment of 2017/2400 mandatory
  adding the ini-file for switching to installed mode to the build script
  updating user manual on the installation options
  use path.combine when opening external resources (user manual, release notes, jira guide, ...)
  open csv files read-only
  change nlog log path if mode is set to installed
  reading config file if VECTO should run in 'installed' mode and change path to %APPDATA% and %LOCALAPPDATA% if so change all access to config files and use path .combine for creating file and directory paths
  adapt testcase: allow few traction interruptions to be longer than specified in model data (i.e. due to gearshift right before a speed change (simulation interval can't be changed))
  allow reduction of traction interruption interval by 10%
  correct testdata
  updated testcases with expected fuel consumption (slight changes due to shorter effective traction interruption)
  allow tolerance of 0.1*tractioninterruption for engaging geear
  adding testcase for traction interruption
  default driver strategy: repeat handling of overspeed/gearshift as this may occur in different combinations
  ...

Merge pull request #734 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-869-change-new-vehicle-input-fields-adas-sleeper-cab-etc-to-be-mandatory to develop

* commit 'c0b9ceb9':
  remove testcase that is no longer required (no default values for optional new parameters)
  adding new mandatory input parameters to test data
  xml writer: write new mandatory parameters with default values
  make other parameters in xml declaration input data provider mandatory
  make NgTankSystem input parameter optional
  correct typo in annotation of manufacturer report
  set new parameters added with first amendment of 2017/2400 mandatory

optimize average acc torque preprocessing (reduce from 3 nested loops to two), reduce computation time from 1.8s to ~0.24s

 optimize calculation of gear rating: two separate loops, increase target value for search algorithm, only calculate values when needed, calculate velocity drop only up to max gradient

Merge pull request #733 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-784-configuration-file-for-vecto-log-files to develop

* commit 'f34c74c9':
  adding the ini-file for switching to installed mode to the build script
  updating user manual on the installation options
  use path.combine when opening external resources (user manual, release notes, jira guide, ...)
  open csv files read-only
  change nlog log path if mode is set to installed
  reading config file if VECTO should run in 'installed' mode and change path to %APPDATA% and %LOCALAPPDATA% if so change all access to config files and use path .combine for creating file and directory paths

reading config file if VECTO should run in 'installed' mode and change path to %APPDATA% and %LOCALAPPDATA% if so
change all access to config files and use path .combine for creating file and directory paths