Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1428-implement-p2.5-hybrid-amt to develop

* commit 'c39370a7':
  adding missing files

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1428-implement-p2.5-hybrid-amt to develop

* commit 'cf45601a':
  P2.5: make sure there is a transmission ratio for every gear
  updting gui to allow entering gear ratios per gear
  increase ADC Loss-map to higher em speeds
  adding implementation for P2.5 and test vehicle
  restructuring hybrid testcases

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1430-fixes-busaux-and-changes-ess to develop

* commit 'e8f6786d':
  make max startgear available from strategy, if vehicle is halted make calculations with maxStartGear (in case the downshift in the braking phase before resulted in a different gear at vehicle stop)
  fix testcases after making soc exponent in cost function a parameter, fix in combustion engine when vehicle stops
  hybrid strategy: chage gearshift check for AT transmissions
  change testdata: increase max engine off time from 0 to some higher value
  add out speed and out torque to gearbox response
  hybrid strategy: make exponent of cost function a parameter
  refactor engine stop/start: hybrid strategy can always stop ICE during drive (except P1), ESS during standstil as for conventional
  make electric aux (high voltage) invisible - not fully supported
  adding missing file browser for compressor map, allow using .vbat files (renamed to .vreess)

make max startgear available from strategy, if vehicle is halted make calculations with maxStartGear (in case the downshift in the braking phase before resulted in a different gear at vehicle stop)

fix in combustion engine when vehicle stops

refactor engine stop/start: hybrid strategy can always stop ICE during drive (except P1), ESS during standstil as for conventional

Merge pull request #51 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1426-use-lossmap-for-em-adc-instead-of-generic-efficiency to develop

* commit 'c91f0542':
  updating GUI for EM lossmap
  refactoring EM to use loss-map instead of efficiency, adding testcases for EM-Loss-map
  adding testcase for non-linear EM ADC loss-map

# Conflicts:
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
#	VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs

adding testcases for EM-Loss-map

* commit '779c4d33': (131 commits)
  fix more testcases
  allowing vocational for all classes  but ignore if not allowed, make more testcases green
  make some testcases green by providing missing model data
  removing no longer needed files (.vsum)
  adding release report
  compiling new vecto release
  adapt declaration data test for hvac after adding hvac power demands for other group/cyckle combinations (required for VTP)
  add missing HVAC power demands (needed for VTP simulations
  adding release report
  create new build: update version number, update changelog, update release notes
  introduce new field with CdxA from input. required to write correct CdxA value to MRF
  set correct engine correction factor for VTP simulation,write CO2 values in VTP report (fix)
  remove invalid characters (such as / or \) from mod-filename (e.g. if VIN contains illegal characters)
  adding steering pump power demand for RD cycle groups 10-16 (needed for VTP simulations)
  remove testcase which is no longer applicable: steering pump power demand on LH cycle for group1 vehicles is provided for VTP missions
  adapt testcases for parallel execution
  format of driving cycle for better readability
  fix cycle gearbox for VTP with TC in 1st and 2nd gear
  fix startgear preprocessing for vtp cycle with TC in 1st and 2nd gear
  adding testcase for VTP on a vehicle with TC in 1st and 2nd gear
  ...

# Conflicts:
#	.gitignore
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
#	Documentation/User Manual/5-input-and-output-files/VDRI.md
#	Documentation/User Manual/5-input-and-output-files/VMOD.md
#	Documentation/User Manual/5-input-and-output-files/VSUM.md
#	Documentation/User Manual/help.html
#	HashingTool/Properties/Version.cs
#	Tools/GraphDrawer/Program.cs
#	VECTO.sln.DotSettings
#	VECTO/GUI/MainForm.Designer.vb
#	VECTO/GUI/VectoJobForm.Designer.vb
#	VECTO/GUI/VectoJobForm.resx
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/GUI/VehicleForm.Designer.vb
#	VECTO/GUI/VehicleForm.vb
#	VECTO/Input Files/Vehicle.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VECTO/VECTO.vbproj
#	VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
#	VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
#	VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
#	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
#	VectoCommon/VectoCommon/InputData/DigestData.cs
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
#	VectoCommon/VectoCommon/Models/VehicleCategory.cs
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Common/AbstractXMLType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/AbstractCommonComponentType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs

+ merge conflicts and make things compile...
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Interfaces/IXMLDeclarationVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLJobDataReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractCommonComponentType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractXMLType.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringAuxiliariesDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringGearshiftData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringOverspeed.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataNinjectModule.cs
#	VectoCore/VectoCore/InputData/Reader/ComponentData/DrivingCycleDataReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/JsonKeys.Designer.cs
#	VectoCore/VectoCore/JsonKeys.resx
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/Simulation/SimulationFactoryNinjectModule.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/IdleControllerSwitcher.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/PTOCycleController.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/TorqueConverter.cs
#	VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringEngineWriter.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv
#	VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv
#	VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
#	VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
#	VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs
#	VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
#	VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
#	VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
#	VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
#	VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
#	VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
#	VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs
#	VectoCore/VectoCoreTest/Models/Simulation/MockSumWriter.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
#	VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs
#	VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/vtp_cycle_citybus_atser.vdri
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
#	VectoCore/VectoCoreTest/Utils/GraphWriter.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs

* commit '1d70e4fd': (23 commits)
  PTO: in case no idle loss map is provided, use zero-losses PTO idle loss map
  hybrid strategy: get rid of 'oldDryRunSolution';    selecting best option: if brake power is already set (we found an operating point) - do not select an option where the torque is too high or too low    selecting best option: if target speed is below start speed and target speed is already reached do not allow solutions with too high engine speed
  electric motor: limit max recuperation if battery is almost full (available capacity close to 0 (1e-9))
  max. vehicle propulstion torque: avoid negative torque limits
  hybrid controller: add information on gearbox in case of overload (helpful for debugging cases with vehicle torque limitations)
  gearbox: reset shift-lock (up/donw/up down/up/down) if drivingbehavior changes at-gearbox: provide additional information in response
  hybrid strategy: additional entry were ICE is at max torque (so that a previously searched operating point can be used again)
  set state of busaux battery
  electric motor: handle the case that inertia torque eats up the recuperation torque
  additional exclusion criteria in hybrid strategy: in case vehicle speed is below min speed during gearshift do no shift, if vehicle propulsion limit is set also check if this is exceeded. gearbox: set additional fields in response (dryrun) driver: handle the case that the engine speed is too high after a valid acceleration is found (due to vehicle propulsion limit)
  handle the case that no mechanical power for certain electric power can be found
  adding missing testcase files
  ICE: set motor speed to idle speed in case the vehicle stands still and ICE is off
  hybrid strategy: run evaluation even if response is from torque converter; torque converter fill in response values from engine and electric system handle the case that the max recuperation torque may be null (e.g. the electric machine is operated in a range where electric power is required for recuperation (typically at low em speeds))
  set additional fields (e.g. driver data, engine data) for certain run types (VTP, engine-only) and some test cases to make mod-data postprocessing work allow for missing values in mod-data postprocessing
  updating project with additional testdata
  hybrid strategy: do not initialize the powertrain in case a different gear is engaged to avoid incorrect previous state in testpowertrain (EM)
  more testcases for APT and P3/P4 hybrid
  electric motor: ignore max recuperation setting if electric motor needs electric energy for recuperation (i.e. does not generate electric energy)
  at gearbox & hybrid: calculate in-torque and in-angular velocity in case em is off with mechanical gear ratio
  ...

Merge pull request #49 in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1423-simulation-of-p3-p4-with-apt-transmissions to develop

* commit '70bd2b71': (23 commits)
  PTO: in case no idle loss map is provided, use zero-losses PTO idle loss map
  hybrid strategy: get rid of 'oldDryRunSolution';    selecting best option: if brake power is already set (we found an operating point) - do not select an option where the torque is too high or too low    selecting best option: if target speed is below start speed and target speed is already reached do not allow solutions with too high engine speed
  electric motor: limit max recuperation if battery is almost full (available capacity close to 0 (1e-9))
  max. vehicle propulstion torque: avoid negative torque limits
  hybrid controller: add information on gearbox in case of overload (helpful for debugging cases with vehicle torque limitations)
  gearbox: reset shift-lock (up/donw/up down/up/down) if drivingbehavior changes at-gearbox: provide additional information in response
  hybrid strategy: additional entry were ICE is at max torque (so that a previously searched operating point can be used again)
  set state of busaux battery
  electric motor: handle the case that inertia torque eats up the recuperation torque
  additional exclusion criteria in hybrid strategy: in case vehicle speed is below min speed during gearshift do no shift, if vehicle propulsion limit is set also check if this is exceeded. gearbox: set additional fields in response (dryrun) driver: handle the case that the engine speed is too high after a valid acceleration is found (due to vehicle propulsion limit)
  handle the case that no mechanical power for certain electric power can be found
  adding missing testcase files
  ICE: set motor speed to idle speed in case the vehicle stands still and ICE is off
  hybrid strategy: run evaluation even if response is from torque converter; torque converter fill in response values from engine and electric system handle the case that the max recuperation torque may be null (e.g. the electric machine is operated in a range where electric power is required for recuperation (typically at low em speeds))
  set additional fields (e.g. driver data, engine data) for certain run types (VTP, engine-only) and some test cases to make mod-data postprocessing work allow for missing values in mod-data postprocessing
  updating project with additional testdata
  hybrid strategy: do not initialize the powertrain in case a different gear is engaged to avoid incorrect previous state in testpowertrain (EM)
  more testcases for APT and P3/P4 hybrid
  electric motor: ignore max recuperation setting if electric motor needs electric energy for recuperation (i.e. does not generate electric energy)
  at gearbox & hybrid: calculate in-torque and in-angular velocity in case em is off with mechanical gear ratio
  ...

   selecting best option: if brake power is already set (we found an operating point) - do not select an option where the torque is too high or too low
   selecting best option: if target speed is below start speed and target speed is already reached do not allow solutions with too high engine speed

electric motor: limit max recuperation if battery is almost full (available capacity close to 0 (1e-9))

hybrid controller: add information on gearbox in case of overload (helpful for debugging cases with vehicle torque limitations)

at-gearbox: provide additional information in response

hybrid strategy: additional entry were ICE is at max torque (so that a previously searched operating point can be used again)