Commits · 469831c6f19a86a44aa99051f1fc446a3d4fe1e9 · Stefanos DOUMPOULAKIS / Vecto

This project is mirrored from https://*****:*****@code.europa.eu/vecto/vecto.git. Pull mirroring updated 11 minutes ago.

Jun 07, 2021
- allow starting a cycle at a certain distance (used for debugging) · 469831c6
  Markus Quaritsch authored 3 years ago
  
  469831c6
- driver strategy: handle the case that another brake action gets more urgent... · c5b29faa
  Markus Quaritsch authored 3 years ago
  
  driver strategy: handle the case that another brake action gets more urgent during a coasting phase in a braking action (at the end of the interurban cycle)
  c5b29faa
- adding testcase for P4 hybrid with torque limitations, additional fields in... · 79826988
  Markus Quaritsch authored 3 years ago
  
  adding testcase for P4 hybrid with torque limitations, additional fields in response (angledrive, axlegear)
  79826988
May 27, 2021

Merge branch 'develop' into feature/VECTO-1428-implement-p2.5-hybrid-amt · 2a51f011
Markus Quaritsch authored 3 years ago

2a51f011

Pull request #56: Feature/VECTO-1430 fixes busaux and changes ess · dcfb1547

Markus Quaritsch authored 3 years ago

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

* commit '4df52e78':
  completed busaux testcases  - all 96 green
  bugfix for certain testcases adding more testcases for further configurations, refactor tests, added assertions for powertrain configuration
  more work on busaux & es & ESS Testcases
  create simple testcase for busaux electric configurations with ESS

dcfb1547

May 12, 2021
- completed busaux testcases - all 96 green · 4df52e78
  Markus Quaritsch authored 3 years ago
  
  4df52e78
May 06, 2021
- bugfix for certain testcases · 2398e0fb
  Markus Quaritsch authored 3 years ago
  
  adding more testcases for further configurations, refactor tests, added assertions for powertrain configuration
  2398e0fb
- more work on busaux & es & ESS Testcases · b01a0f38
  Markus Quaritsch authored 3 years ago
  
  b01a0f38
May 05, 2021
- create simple testcase for busaux electric configurations with ESS · 8c764e02
  Markus Quaritsch authored 3 years ago
  
  8c764e02
May 04, 2021
- Pull request #55: moved job file to correct directory. · b3fc8049
  Markus Quaritsch authored 3 years ago
  
  Merge in VECTO/vecto-dev from VECTO/mk_vecto-dev:develop to develop * commit '6552065a': moved job file to correct directory.
  b3fc8049
- moved job file to correct directory. · 6552065a
  Michael KRISPER authored 3 years ago
  
  6552065a
May 03, 2021
- in case the interpolate search is not successful (i.e., difference in electric... · 58b926ce
  Markus Quaritsch authored 3 years ago
  
  in case the interpolate search is not successful (i.e., difference in electric power too high), search again (with interpolate search) and increas y value
  58b926ce
- adding testcase for P3 hybrid with torque limitation (vehicle level) · 0c109f2b
  Markus Quaritsch authored 3 years ago
  
  0c109f2b
- Pull request #54: adding missing files · ac835a51
  Markus Quaritsch authored 3 years ago
  
  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
  ac835a51
- adding missing files · c39370a7
  Markus Quaritsch authored 3 years ago
  
  c39370a7
Apr 29, 2021

Pull request #53: Feature/VECTO-1428 implement p2.5 hybrid amt · f780085c

Markus Quaritsch authored 3 years ago

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

f780085c

P2.5: make sure there is a transmission ratio for every gear · cf45601a
Markus Quaritsch authored 3 years ago

cf45601a
updting gui to allow entering gear ratios per gear · ff518ff1
Markus Quaritsch authored 3 years ago

ff518ff1

Apr 28, 2021
- increase ADC Loss-map to higher em speeds · 39b0f6bc
  Markus Quaritsch authored 3 years ago
  
  39b0f6bc
- adding implementation for P2.5 and test vehicle · 59cdd7a3
  Markus Quaritsch authored 3 years ago
  
  59cdd7a3
Apr 27, 2021

restructuring hybrid testcases · dcf53c3e
Markus Quaritsch authored 3 years ago

dcf53c3e

Pull request #52: Feature/VECTO-1430 fixes busaux and changes ess · 3546e120

Markus Quaritsch authored 3 years ago

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)

3546e120

make max startgear available from strategy, if vehicle is halted make... · e8f6786d

Markus Quaritsch authored 3 years ago

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)

e8f6786d

Apr 26, 2021
- fix testcases after making soc exponent in cost function a parameter, · ed2788e9
  Markus Quaritsch authored 3 years ago
  
  fix in combustion engine when vehicle stops
  ed2788e9
- hybrid strategy: chage gearshift check for AT transmissions · 5792db04
  Markus Quaritsch authored 3 years ago
  
  5792db04
- change testdata: increase max engine off time from 0 to some higher value · bc1af6f9
  Markus Quaritsch authored 3 years ago
  
  bc1af6f9
Apr 23, 2021
- add out speed and out torque to gearbox response · 2905f32d
  Markus Quaritsch authored 3 years ago
  
  2905f32d
- hybrid strategy: make exponent of cost function a parameter · a3c787df
  Markus Quaritsch authored 3 years ago
  
  a3c787df
Apr 22, 2021
- refactor engine stop/start: hybrid strategy can always stop ICE during drive... · 6eafebb4
  Markus Quaritsch authored 3 years ago
  
  refactor engine stop/start: hybrid strategy can always stop ICE during drive (except P1), ESS during standstil as for conventional
  6eafebb4
- make electric aux (high voltage) invisible - not fully supported · 51e54758
  Markus Quaritsch authored 3 years ago
  
  51e54758
- adding missing file browser for compressor map, allow using .vbat files (renamed to .vreess) · eff54b37
  Markus Quaritsch authored 3 years ago
  
  eff54b37
Apr 19, 2021

Merge pull request #51 in VECTO/vecto-dev from... · de7d2093

Markus Quaritsch authored 3 years ago

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

de7d2093

Merge branch 'develop' into feature/VECTO-1426-use-lossmap-for-em-adc-instead-of-generic-efficiency · c91f0542

Markus Quaritsch authored 3 years ago

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

c91f0542

updating GUI for EM lossmap · 543f0c70
Markus Quaritsch authored 3 years ago

543f0c70
refactoring EM to use loss-map instead of efficiency, · 49c599df
Markus Quaritsch authored 3 years ago
```
adding testcases for EM-Loss-map
```
49c599df

Apr 14, 2021

Merge pull request #50 in VECTO/vecto-dev from VECTO/mq_vecto-dev:merge_official_vecto to develop · 0466a028

Markus Quaritsch authored 3 years ago

* 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
  ...

0466a028

fix more testcases · 779c4d33
Markus Quaritsch authored 3 years ago

779c4d33

Apr 12, 2021
- allowing vocational for all classes but ignore if not allowed, make more testcases green · 45adb1cd
  Markus Quaritsch authored 3 years ago
  
  45adb1cd
- make some testcases green by providing missing model data · c33a28fa
  Markus Quaritsch authored 3 years ago
  
  c33a28fa
Apr 09, 2021

Merge branch 'VECTO_CERT/master' into merge_official_vecto · 14960a36

Markus Quaritsch authored 3 years ago

# 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

14960a36