# Conflicts:
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs

* commit '0c329fa8':
  bugfix in gearbox: disengage when vehicle is stopped

* commit 'd20e15a8':
  bugfix in gearbox: disengage when vehicle is stopped

* commit '1ab01c9b':
  fuel consumption map
  transmissionlossmap: display value in debugger
  renaming parameter
  allow extrapolation of fuel-map in engineering mode
  bugfix in gearbox: disengage when vehicle is stopped

Merge pull request #233 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/API_adaptations to develop

* commit '36bebdb8':
  change aux input structure
  make it kompile

Conflicts:
	VectoCommon/VectoCommon/Utils/Validation.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
	VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs

* commit '8692d7fd':
  add the simulation mode to the validation context
  fix warnings

certain validations are only done in declaration mode (e.g. gross vehicle weight)

* commit '263ebfb8':
  do not read default.vtcc in vecto 2.2 (drag part, nu >= 1)

Merge pull request #229 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:hotfix/VECTO-316-remove-default-values-for-torque to master

* commit '8fa5daff':
  do not read default.vtcc in vecto 2.2 (drag part, nu >= 1)

Merge pull request #228 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/API_adaptations to develop

* commit '9ede62c8': (27 commits)
  removed rims
  remove gear full-load, added gear max torque
  split fuelconsumption map into lookup-part and input data reading part
  updating solution
  adding testproject to examin functionality in vecto 2.2
  adaptations for torque converter input data
  formatting (vecto 2.2)
  making certain parts of vecto 2.2 public to allow for testing
  refactoring/adding torqueconverter input data
  additional testcase for cases with too high input speeds
  torque converter: computation of operating point works (+ testcases green), similar results as with Vecto 2.2
  adding computation of solution for input torque/speed. not tested
  adapt due to changes in reading input data
  separate reading input data into independent classes
  adding parameter numbers as comments for angular gear
  updating documentation on measured speed mode
  changed naming of retarder types
  create aux component for constant aux demand
  remove (unused) efficiency column from transmission loss map (efficiency is sopported for a single gear)
  lazy computation of rolling resistance
  ...

Conflicts:
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs

torque converter: computation of operating point works (+ testcases green), similar results as with Vecto 2.2