# Conflicts:
#	VECTO/Input Files/Gearbox.vb
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs

Merge pull request #325 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-396-add-powershift-losses-also-in-measured to develop

* commit '7de44bc9':
  compute shift losses for measured speed mode with gear
  moving computation of powershift losses to base class
  adding constructor to gearinfo class
  move engine inertia to base class

ShiftStrategy & GUI: Added Params CLUpshiftMinAcceleration, CCUpshiftMinAcceleration in GUI and JSON File; Used in ShiftStrategy for Shift-Decisions

Merge pull request #324 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-395-vecto-crasch-during-locked-gears to develop

* commit '77081550':
  handle the case where PT1 would get negative
  Cycle gearbox: don't initialize engine twice (if torque converter is availalbe)
  Measured speed with gear: more  comprehensive error message when using invalid gear in input

Merge pull request #323 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-384-code-for-running-doe-batch-from to develop

* commit '50e6e5b1':
  cleanin up memory after simulation
  clear mod-data when simulation is done and sum-entry is written

- cear ModData after writing vmod-file (and remove all references)
- declaration report: collect required data right after simulation, not when writing declaration report
- add cache for cycles also in engineering mode based on full path of file
- add source for stream data (TableData) where possible

Merge pull request #322 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-394-disable-vecto-command-line-output to develop

* commit '7bbb1591':
  update repo
  introduce new option to run vectocmd withou output (quiet)

Merge pull request #321 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-388-add-shift-losses-for-at-power-shifts to develop

* commit '3902baeb':
  change condition for disengage in cycle gearbox
  update Repo
  removed testcase: invalid input data
  bugfix cycle gearbox: always set torque converter locked when disengaged
  AT Gearbox: reset adding shift losses on commit; driver: handle time fail responses
  update repo
  update repo
  adding calculation of shift losses and testcases
  adding new parameters for simulation: powershift inertia factor, powershift shift time

Conflicts:
	VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
	VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATShiftStrategy.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs

Merge pull request #320 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-391-add-gearbox-out-speed-torque-to to develop

* commit '3cb3f035': (34 commits)
  formatting
  cycle gearbox: disengage only if torque demand is not positive
  clutch: update state only if _no_ dry run!
  Combustion Engine:  change CurrentState only when it is _not_ a dry-run request
  modDataFilter: set v_target....
  driver: set brake power in case the search found a negative braking power, formatting
  Gearbox: check for shift _after_ engine request has been issued and only if response is 'Success'
  Gearbox: use inAngular velocity for average in angluar velocity and not computed from out angluar velocity
  gearbox: when disengaged: set gearbox input speed to engine speed.
  after a gearshift response issue brake aktion again (with open power train)
  add cycle name and loading to output of vecto exception
  adapt testcases
  Gearbox: do not issue initialize requests for finding start gear but use dryrun requests
  bugfix in cycle gearbox
  add n_gbx_out and T_gbx_out to vmod
  adapt expected results: new columns in output files
  fix: initializing gear overwrites engine's previous speed. ineria work does not match
  adding filter to write output data according to simulation (no averaging of speed, etc)
  refactoring: moving 1Hz Filter to separate file, movin modal result fields to separate file
  Debugging Test: MeasuredSpeed_Gear_Vair_Run failing
  ...

the gearbox may issue another dry-run request to check for gear shifts but these requests must not modify the internal state!