# Conflicts:
#	VectoCommon/VectoCommon/Models/HybridStrategyResponse.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs

Merge pull request #34 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1394-refactor-em-model to develop

* commit 'ced7e526':
  updating user manual: vsum, vmod colums after e-motor refactoring; equations for thermal derating of e-motor
  bugfix max speed calculation for e-motor, further fixes for PEV revert changes in velocity gearshift preprocessor correct name of generated file in testcase
  consider e-motor ratio when calculating shift lines
  remove E_REESS from modal results, calculate E_REESS in sum-file from P_REESS_int
  fix testcases with hybrid powertrain after e-motor refactoring
  refactor electric motor: move transmission effiency and transmission ratio from power map transformation to explicit calculation step rename B2 ... positions to E2... add more colums to .vmod and .vsum for electric motor component

updating user manual: vsum, vmod colums after e-motor refactoring; equations for thermal derating of e-motor

revert changes in velocity gearshift preprocessor
correct name of generated file in testcase

refactor electric motor: move transmission effiency and transmission ratio from power map transformation to explicit calculation step
rename B2 ... positions to E2...
add more colums to .vmod and .vsum for electric motor component

Merge pull request #33 in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1393-0.7.2.2119-vsum-and-vmod-comments to develop

* commit 'ea3ea74d':
  update .vmod and .vsum: consistent naming of EM related fields (use drive instead of motoring, correct units, add fields for em losses and em transmission losses .vsum: add ice off time share, correct units, adding energy demand electric aux high voltage system

update .vmod and .vsum: consistent naming of EM related fields (use drive instead of motoring, correct units, add fields for em losses and em transmission losses
.vsum: add ice off time share, correct units, adding energy demand electric aux high voltage system

* commit '9479fa31':
  set correct validation context in testcase
  engine only simulations: set correct simulation type
  add text for added ignore reasons in debug output, correct extension for electric storage files
  update repo
  fix saving files (E3, E4)
  correct energy calculation for supercaps
  sum data container: add info about REESS capacity, fix output for supercaps
  refactoring PEV shift strategy: evaluate all gears and then select best gear
  hybrid strategy: make sure engine aux are initialized correctly in hybrid strategy
  update repository

update expected sum files with new column, update engine-only mod files (previous version contained wrong columns)

# 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.