# Conflicts:
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/AbstractEngineeringXMLComponentDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/OutputData/XML/XMLEngineeringWriter.cs
#	VectoCore/VectoCoreTest/XML/XMLWritingTest.cs

Merge pull request #748 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-931-at-error-in-vecto-version-3.3.2.1519 to develop

* commit 'f3a10008':
  AT shift strategy: avoid emergency upshift from TC to locked if acc in locked gear is less than 0
  avoid null-reference execption

restructuring: move torqueconverter component from gearbox to components (internal data structures), use full xsd type for naming injection bindings

Merge pull request #747 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-932-consistency-in-na-values-in-the-vsum-file to develop

* commit '5e459bf8':
  adapt testcase to new 'not available' abbreviation
  use constant for different writings of 'not available' throughout the code

refactoring XML reading: use version-specific reader classes, use ninject for loading correct classes

* commit 'a4052176':
  completed release report
  creating new release: 3.3.2.1548

* commit 'de4b8ffd':
  completed release report

Merge pull request #744 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:ReleaseCandidates/v3.3.2.1519 to master

* commit '5293f0d8':
  creating new release: 3.3.2.1548
  correcting testcase due to different initialization
  adapt testcases due to chanes in FC
  when re-engaging use minimum of current and previous out-angular velocity (fixes testcase VECTO-855 and others)
  refactoring: move digestData class to separate file
  extending xml declaration data provider to allwo reading component data from separate XML documents
  testing shorter time limits for consecutive shifts
  adding new mandatory parameters for vehicle comparison jobs
  adding code for plotting shift polygons of xml job
  Revert "adding testcase for writing xml reports"
  adding testcase for writing xml reports
  surround writing sum-data with try-catch
  adding testcase if sum-file is locked simulation does not abort
  adding testcase where mod-file is opened and writing mod data will fail
  refacotring method
  surround writing modd data with try-catch

refactoring XML Schema - version 2.0 (original 1.0), 2.1 (new parameters according to 2019/318), 2.2 (new tyre dimensions - not official yet)

Merge pull request #743 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-904-range-for-gear-loss-map-not-sufficient to ReleaseCandidates/v3.3.2.1519

* commit 'ef635634':
  correcting testcase due to different initialization
  adapt testcases due to chanes in FC
  when re-engaging use minimum of current and previous out-angular velocity (fixes testcase VECTO-855 and others)
  refactoring: move digestData class to separate file
  extending xml declaration data provider to allwo reading component data from separate XML documents
  testing shorter time limits for consecutive shifts
  adding new mandatory parameters for vehicle comparison jobs
  adding code for plotting shift polygons of xml job

Merge pull request #742 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-909-3.3.2.1519-problems-running-more-than-one-input-.xml to ReleaseCandidates/v3.3.2.1519

* commit '5d534f01':
  Revert "adding testcase for writing xml reports"
  adding testcase for writing xml reports
  surround writing sum-data with try-catch
  adding testcase if sum-file is locked simulation does not abort
  adding testcase where mod-file is opened and writing mod data will fail
  refacotring method
  surround writing modd data with try-catch

Merge pull request #741 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-904-range-for-gear-loss-map-not-sufficient to develop

* commit 'ef635634':
  correcting testcase due to different initialization
  adapt testcases due to chanes in FC
  when re-engaging use minimum of current and previous out-angular velocity (fixes testcase VECTO-855 and others)
  testing shorter time limits for consecutive shifts
  adding new mandatory parameters for vehicle comparison jobs
  adding code for plotting shift polygons of xml job

# Conflicts:
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
#	Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x4_vehicle-class-12_EURO6_2018.xml

when re-engaging use minimum of current and previous out-angular velocity (fixes testcase VECTO-855 and others)

Merge pull request #740 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-922-integrate-vecto-into-vecto-git to develop

* commit '9f9f7ef2':
  refactoring: move digestData class to separate file
  extending xml declaration data provider to allwo reading component data from separate XML documents

* commit '26637d5a':
  adding release report, results, checksums
  new release: update release notes, compile new version, generate help
  updating declaration mode xml test vehicles
  updating header in source files
  updating version number