# Conflicts:
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1510-remove-selection-of-shift-strategy-in-job-dialog to develop

* commit 'bcdd24bd':
  remove selection of shift strategy

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1502-pev-do-not-recuperate-below-7km-h-similar-to-conventional to develop

* commit 'c94f350c':
  re-arrange input elements in electric motor form

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1502-pev-do-not-recuperate-below-7km-h-similar-to-conventional to develop

* commit '9c539713':
  extending PEV electric motor controller to not recuperate below certain speed when braking is required
  implementing testcase for PEV: not recuperating at vehicle speeds below 7km/h

extending PEV electric motor controller to not recuperate below certain speed when braking is required

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '70d1f1cc':
  update repo
  update expected values in testcase
  update more testcases after change in em interpolation, add em-off flag in postprocessing tests
  adapt testcases for electric motor after chaning interpolation method
  bugfix looking up torque for a certain  electric power and angular speed in case the forward interpolation gives a different result, a search is started. but the search always returned torque for 0 power
  fix error in testcase interpolating electric power
  adapt expected driving behavior in ADAS tests
  adapt pcc testcases

in case the forward interpolation gives a different result, a search is started. but the search always returned torque for 0 power

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Pull request #120: hybrid strategy: no not allow solutions with too high engine speed even if ICE is off

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit 'ac68ddc6':
  hybrid strategy: no not allow solutions with too high engine speed even if ICE is off

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1501-update-em-map-interpolation-method to develop

* commit '434018e1':
  fixing several testcases

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1501-update-em-map-interpolation-method to develop

* commit 'b2fc09b3':
  remove old electric motor map reader, rename new reader
  adding testcase for new EM powermap interpolation method: calculate losses and compute virtual torque loss for delaunay map. expected efficiency for the whole map is within a very small range around given efficiency
  read cycle from filesystem if available
  first tests for new em powermap interpolation

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1487-calculation-of-em-efficiency-during-recuperation to develop

* commit 'bbb1e3d5':
  only consider entries where the EM is on for calculating efficiency values

adding testcase for new EM powermap interpolation method: calculate losses and compute virtual torque loss for delaunay map. expected efficiency for the whole map is within a very small range around given efficiency