# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs

Merge pull request #702 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-696_regression to develop

* commit '90e859f3':
  correct testcase: expected torque loss is 0 in case the angular speed is 0
  Gearbox: set torque loss to 0 if angular speed is 0. already done for transmission component and gearbox when disengaged. added for engaged gear.

Gearbox: set torque loss to 0 if angular speed is 0. already done for transmission component and gearbox when disengaged. added for engaged gear.

Merge pull request #701 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-750-simulation-error-drivingaction to develop

* commit 'daf8d58a':

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
#	VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs

Merge pull request #700 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-787-apt-drivingaction-accelerate-after-overload to develop

* commit '87e97425':
  make testcases run: return null for brakin action in case the gear changed and the response gets an overload response; adapt tolerances for at moddataintegrity tests
  Testing fixes for bugreport: allow breakpoint for setting gear; shiftStrategy: refactor testing next gear, re-setting previous gear after dry-run requests; AT-Gearbox: modify currentState only on success
  correcting computation in torque converter (correct SI units)
  Make component data in Monitoring Report optional
  increase tolerance for drive-off torque threshold
  at shift rules: when decelerating although below target speed and driver wants to accelerate, check if there is a lower gear available
  allow higher enine speeds in tc mode
  use original equations for calculating tc operating point
  trying different solutions for torque converter operating point
  adding solver for polynoms of 4th order
  at shift strategy: allow upshift only if engine speed in next gear is above downshift line (in particular for C->L gearshifts
  Driver: handle responseFailTimeInterval;  AT gearbox: respond only once with timeFail interval
  adding new rule for AT gearboxes:

make testcases run: return null for brakin action in case the gear changed and the response gets an overload response; adapt tolerances for at moddataintegrity tests

# Conflicts:
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs

* commit '4f194981':
  updating xml schema with parameter documentation, generate new parrameter list
  adding file to xmlspy project
  adding ADAS benefits to user manual

Merge pull request #698 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-768-vtp-mode_1 to develop

* commit 'f923a162':
  updating report and schema
  use generic values for fan parameters in declaration mode
  removing ncv of test fuel (adding note in gui)

* commit '79b02089':
  adding category attributes to test

Merge pull request #696 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-797-vecto-abort-with-at-transmission-and-tc-table-value to develop

* commit 'e2a49f32':
  increase tolerance for mod-data test due to switch to line-search as default for AT gearboxes
  increase tolerance for 0 torque in at gearbox due to increased search tolerance

in some cases outTorque may be smalller than 0, while inTorque is greater than 0 => this would lead to an overload response.

Testing fixes for bugreport: allow breakpoint for setting gear; shiftStrategy: refactor testing next gear, re-setting previous gear after dry-run requests; AT-Gearbox: modify currentState only on success

* commit 'ee00e83e':
  fixes for running exempted vehicles from GUI
  set new version number, add -DEV suffix for builds