# Conflicts:
#	VECTO/GUI/GearboxForm.Designer.vb
#	VectoCore/VectoCoreTest/Reports/ModDataTest.cs

Merge pull request #328 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-398-error-could-not-find-the-declaration to develop

* commit '3fe87694':
  attemt to fix moddataintegritytest
  adapt testcase to chaned crosswind correction
  changed header
  fix: CdxA for construction cycles can be empty
  engineering mode: estimate declaration crosswind correction parameter set from vehicle category and axles
  adding constant CdxA for construction cycles
  correction crosswindcorrection lookup: use parameterset as defined in segment table

engineering mode: estimate declaration crosswind correction parameter set from vehicle category and axles

Merge pull request #327 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-392-gui to develop

* commit '15a873c9':
  make forms scale depending on selected font

# 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