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

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1476-update-em-gui-em-component to develop

* commit 'e8dc2cc5':
  moving drag curve per voltage level to single drag curve for EM. updating GUI, input data provider, data apapter, etc.

moving drag curve per voltage level to single drag curve for EM. updating GUI, input data provider, data apapter, etc.

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1494-tab-order-for-controls-in-vecto-gui to develop

* commit 'a284cf24':
  update tab index (tab sequence) for all dialogs

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1491-electric-energy-storage-editor-does-not-show-values to develop

* commit '7f1c6f18':
  correctly open battery dialog

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

* commit 'ff800b70':
  adding testcase for mod-data integrity test of a P1 vehicle correct average EM-speed calculation in case EM is at position P1. EM is immediately on when ICE is turned on.
  E_EM_Drive and E_EM_Recuperate only account timesteps where EM is ON, if EM is off this is accounted as E_EM_Drag
  bugfix for mod-data integrity: use correct 'previous input speed' in clutch in case the ICE was turned on in this simulation step
  adding testcase for mod-data integrity of vehicle with ess

correct average EM-speed calculation in case EM is at position P1. EM is immediately on when ICE is turned on.