Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

# Conflicts:
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml

Michael KRISPER authored 3 years ago and Markus Quaritsch committed 3 years ago

Pull request #156: ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:bugfix/VECTO-1531-electricmotor-lookup-maximum-torque to develop

* commit 'd30de630':
  ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.

ElectricMotorData.EfficiencyMapLookupTorque: Fixed bug when only one level is limited by battery, but the other is not.

Michael KRISPER authored 3 years ago and Markus Quaritsch committed 3 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:develop to develop

* commit '691e0916':
  Corrected access to GraphWriter in Test Projects when TRACE flag is off.

Michael KRISPER authored 3 years ago and Markus Quaritsch committed 3 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:develop to develop

* commit '97f3a6fe':
  Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.
  Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Buses\FactorMethod: removed accidentially checked in files from output bin-directory. Updated test data with latest version.

Pull request #153: Feature/VECTO-1522 vecto warning if there are more steered axles than steering pump technologies

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1522-vecto-warning-if-there-are-more-steered-axles-than-steering-pump-technologies to develop

* commit '1b42c61b':
  adding steered axles to input provider, hand over number of steered axles to dataadapter aux-method.
  adding testcase checking number of steered axles matches number of steering pump technologies

adding steered axles to input provider, hand over number of steered axles to dataadapter aux-method.

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit '16f7ab6e':
  updating release notes

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop

* commit 'c9b6e221':
  correcting directory name of test files after changing schema namespace

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:merge/multistage_and_xml to develop

* commit '88d6b468': (374 commits)
  fix validation testcase
  removing tests lo longer needed (exempted vehicles), fixing testcases
  separate ADAS input data and BusAux Input data for Conventional, HEV, PEV, IEPC into separate classes as different inputs are available
  re-adding adas tests and testdata, fixing several testcases
  adding tyre dimensions
  correcting sorting order in schema, removing double definition
  correcting aux technologies in xml schema
  renaming classnames from v210 to v24
  changing and renaming namespaces in code, updating more testfiles
  updating test-xml files and generic vehicles after namespace changes
  renaming XML schema for 2nd amendment to official namespace
  more work on reading xml, correcting testdata refactoring strucure of vehicle data provider for v2.10 vehicles
  refactoring reading modified XMLs for electric machines, refactoring reading PTO
  move continuous torque/overload torque to voltage levels (GUI), adapt code for saving EM, make code compile
  changing sample and test xml files after changes in PTO
  update PTO technologies
  removing impossible testfile
  update project after renaming file
  update test files after changes in schema
  adapt test data (xml) and generic vehicles (xml) due to changes in schema
  ...

separate ADAS input data and BusAux Input data for Conventional, HEV, PEV, IEPC into separate classes as different inputs are available

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
#	VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Michael KRISPER authored 3 years ago and Markus Quaritsch committed 3 years ago

Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:dev/testcases to develop

* commit '332ddfab':
  corrected test cases for P2 Hybrid Group 5 BatterySystem 2 DriveCycle  Interurban Short
  HybridResultEntry Improved DebuggerDisplay
  HybridStrategy.SelectBestOption: added emergency shift also for upshift
  HybridStrategy.DoSelectBestOption: When Braking search with MaxBY MechanicalAssistPower instead of MinBy
  added check for EngineSpeedTooHigh when shifting down
  updated testcases for TestFullCycleModDataIntegrityAT citybus AT Serial and Parallel: ShiftTime set to 1 second (instead of 0 which is wrong)
  removed check for ResponseEngineSpeedTooHigh from DistanceRun again
  removed check for ResponseEngineSpeedToHigh from DistanceRun again.
  updated testcases
  Updated Test Aux_SteeringPumpLookupValues
  Updated 4 Testcases: TestSimulationExemptedVehicle

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1525-pcc-preprocessing to develop

* commit '792138f1':
  pcc segment preprocessor: update targetspeed also in case of non-highway sections to avoid that pcc sections reach into parts without highway
  adding testcase for pcc segment preprocessing where a pcc segment starts shortly after standstill

pcc segment preprocessor: update targetspeed also in case of non-highway sections to avoid that pcc sections reach into parts without highway

# Conflicts:
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml
#	Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
#	Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
#	Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
#	Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
#	Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
#	Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
#	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
#	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
#	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
#	Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
#	Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml
#	Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml
#	Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml
#	Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml
#	Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml
#	VECTO.sln
#	VECTO/GUI/ElectricMotorForm.Designer.vb
#	VECTO/GUI/ElectricMotorForm.vb
#	VECTO/Input Files/ElectricMachine.vb
#	VECTO/Input Files/MockVehicleInputData.vb
#	VECTO/Input Files/Vehicle.vb
#	VECTO3GUI2020/Properties/Version.cs
#	VectoCommon/VectoCommon/Hashing/VectoComponents.cs
#	VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
#	VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/Impl/InputData.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
#	VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
#	VectoCore/VectoCore/Utils/XMLDefinitions.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
#	VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
#	VectoCore/VectoXML.spp

HybridStrategy.DoSelectBestOption: When Braking search with MaxBY MechanicalAssistPower instead of MinBy

updated testcases for TestFullCycleModDataIntegrityAT citybus AT Serial and Parallel: ShiftTime set to 1 second (instead of 0 which is wrong)