# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
#	VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs

adding missing files: gearshift position  and shiftlineset (Effshift AT), formerly part of Voith shift strategy

refactoring to use 'gearshift position' instead of uint (AMT) as well as uint and bool (AT) gearboxes. GearList contains ordered list of gears
adapt shift strategies and interfaces.

Merge pull request #31 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1240_hybrid_E2_GS to develop

* commit '1663282b':
  electric motor form: plot graph with values as read from input (not how treated in vecto)
  move conversion of electric motor full-load curve from lookup method in full-load curve to full load curve reader to match with electric map and drag curve

(cherry picked from commit 48f4e8ed)

move conversion of electric motor full-load curve from lookup method in full-load curve to full load curve reader to match with electric map and drag curve

(cherry picked from commit af9fd0a4)

move conversion of electric motor full-load curve from lookup method in full-load curve to full load curve reader to match with electric map and drag curve

Merge pull request #30 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1240_hybrid_E2_GS to develop

* commit '327f9477':
  extend validation context by simulationjobtype (conventional, PEV, HEV) and EM Position
  json file write: bev e2 save tcu params
  enable shift parameters in gui for BEV
  update generic E2 vehicle
  update tc documentation: use latex symbols
  bugfix testcases hybrid

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

Merge pull request #29 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1240_hybrid_E2_GS to develop

* commit '72104626':
  updating version number & release notes
  updating version number
  adding generic E2 vehicle with 2-speed gearbox
  fix testcase parallel hybrid: create engine before gearbox
  powertrain builder: create ICE before gearbox so that gearbox can obtain availability of ICE alredy in constructor (fixes bug introduced in 99cd989d due to additional condition for disengaging before halt)
  fix some testcases: adapt to new model data
  bugfix battery form - max current map
  adding testcase for E2 vehicle with 12speed AMT transmission. reading PEV job from file, adapting powertrain builder, creation of shift strategy, calculation of shift polygons for PEV adapting PEV shift strategy: calculation of start gear, ignore effshift min gear ratio
  bugfix: calculation of overload capacity buffer
  refactoring shift strategy constructor - remove runData instance and take it from vehicle container eff-shift for BEV works for simple cycle and 2-speed gearbox
  started working on E2: shift strategy for electric vehicles