Commits · 5c4843c52b7dcf820ccd26795bd469af29fb12b4 · VECTO / Guests / VECTO Sim Tobia

Feb 02, 2022

separate ADAS input data and BusAux Input data for Conventional, HEV, PEV,... · 5c4843c5

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

5c4843c5

Feb 01, 2022

Merge branch 'develop' into merge/multistage_and_xml · 5fb7a74d

Markus QUARITSCH authored 3 years ago

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

5fb7a74d

re-adding adas tests and testdata, fixing several testcases · 7f39d3bc
Markus QUARITSCH authored 3 years ago

7f39d3bc

Pull request #149: Dev/testcases updated testcases · 6756fb9b

Michael KRISPER authored 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

6756fb9b

Merge remote-tracking branch 'origin/develop' into dev/testcases · 332ddfab
Michael KRISPER authored 3 years ago

332ddfab
corrected test cases for P2 Hybrid Group 5 BatterySystem 2 DriveCycle Interurban Short · 95592907
Michael KRISPER authored 3 years ago

95592907

Jan 28, 2022
- adding tyre dimensions · 585f05c2
  Markus QUARITSCH authored 3 years ago
  
  585f05c2
- correcting sorting order in schema, removing double definition · c6ef3038
  Markus QUARITSCH authored 3 years ago
  
  c6ef3038
Jan 27, 2022

Pull request #148: Bugfix/VECTO-1525 pcc preprocessing · 6d6f176d

Markus QUARITSCH authored 3 years ago

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

6d6f176d

pcc segment preprocessor: update targetspeed also in case of non-highway... · 792138f1

Markus QUARITSCH authored 3 years ago

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

792138f1

adding testcase for pcc segment preprocessing where a pcc segment starts shortly after standstill · 55dfc7f3
Markus QUARITSCH authored 3 years ago

55dfc7f3

Merge branch 'feature/VECTO-1454-xml-schema-for-new-components' into merge/multistage_and_xml · 99595471

Markus QUARITSCH authored 3 years ago

# 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

99595471

Jan 25, 2022
- HybridResultEntry Improved DebuggerDisplay · 7808ca76
  Michael KRISPER authored 3 years ago
  
  7808ca76
- HybridStrategy.SelectBestOption: added emergency shift also for upshift · 5070693a
  Michael KRISPER authored 3 years ago
  
  5070693a
- correcting aux technologies in xml schema · a0e98e8b
  Markus QUARITSCH authored 3 years ago
  
  a0e98e8b
- renaming classnames from v210 to v24 · 71cc497f
  Markus QUARITSCH authored 3 years ago
  
  71cc497f
- changing and renaming namespaces in code, updating more testfiles · af5a5b87
  Markus QUARITSCH authored 3 years ago
  
  af5a5b87
- updating test-xml files and generic vehicles after namespace changes · 08fb543f
  Markus QUARITSCH authored 3 years ago
  
  08fb543f
Jan 24, 2022

HybridStrategy.DoSelectBestOption: When Braking search with MaxBY... · 8f761677
Michael KRISPER authored 3 years ago
```
HybridStrategy.DoSelectBestOption: When Braking search with MaxBY MechanicalAssistPower instead of MinBy
```
8f761677
added check for EngineSpeedTooHigh when shifting down · a47f8cb0
Michael KRISPER authored 3 years ago

a47f8cb0

updated testcases for TestFullCycleModDataIntegrityAT citybus AT Serial and... · 939f407e

Michael KRISPER authored 3 years ago

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

939f407e

removed check for ResponseEngineSpeedTooHigh from DistanceRun again · d7dc4c59
Michael KRISPER authored 3 years ago

d7dc4c59
renaming XML schema for 2nd amendment to official namespace · d8bd8654
Markus QUARITSCH authored 3 years ago

d8bd8654
removed check for ResponseEngineSpeedToHigh from DistanceRun again. · 85c47a99
Michael KRISPER authored 3 years ago

85c47a99
updated testcases · 554f4638
Michael KRISPER authored 3 years ago

554f4638

Merge branch 'develop' into merge/multistage_hybrid · 9424b715

Markus QUARITSCH authored 3 years ago

# Conflicts:
#	VECTO/GUI/MainForm.vb
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/Input Files/MockVehicleInputData.vb
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/Utils/XMLDefinitions.cs
#	VectoCore/VectoCore/Utils/XMLHelper.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs
#	VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
#	VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
#	VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	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

9424b715

Jan 21, 2022
- more work on reading xml, correcting testdata · 65f4e606
  Markus QUARITSCH authored 3 years ago
  
  refactoring strucure of vehicle data provider for v2.10 vehicles
  65f4e606
Jan 19, 2022
- refactoring reading modified XMLs for electric machines, refactoring reading PTO · 851ae5ea
  Markus QUARITSCH authored 3 years ago
  
  851ae5ea
Jan 18, 2022
- move continuous torque/overload torque to voltage levels (GUI), adapt code for... · b64438bf
  Markus QUARITSCH authored 3 years ago
  
  move continuous torque/overload torque to voltage levels (GUI), adapt code for saving EM, make code compile
  b64438bf
- changing sample and test xml files after changes in PTO · 96282c48
  Markus QUARITSCH authored 3 years ago
  
  96282c48
- update PTO technologies · 459a2735
  Markus QUARITSCH authored 3 years ago
  
  459a2735
- removing impossible testfile · b0076c8d
  Markus QUARITSCH authored 3 years ago
  
  b0076c8d
- update project after renaming file · 4662552d
  Markus QUARITSCH authored 3 years ago
  
  4662552d
- update test files after changes in schema · 133b1b71
  Markus QUARITSCH authored 3 years ago
  
  133b1b71
- Updated Test Aux_SteeringPumpLookupValues · 508bb1f6
  Michael KRISPER authored 3 years ago
  
  508bb1f6
- adapt test data (xml) and generic vehicles (xml) due to changes in schema · b488f219
  Markus QUARITSCH authored 3 years ago
  
  b488f219
- renaming schema file for vif, adding limits for boosting type, renaming... · 90709db8
  Markus QUARITSCH authored 3 years ago
  
  renaming schema file for vif, adding limits for boosting type, renaming attribute from stage to step in vif
  90709db8
- Updated 4 Testcases: TestSimulationExemptedVehicle · ba0e74df
  Michael KRISPER authored 3 years ago
  
  ba0e74df
Jan 17, 2022
- update testfiles for changes in schema · 8b0b084a
  Markus QUARITSCH authored 3 years ago
  
  8b0b084a
- updating sample xml files due to changes in annex and schema · b818f683
  Markus QUARITSCH authored 3 years ago
  
  b818f683