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:bugfix/VECTO-1778-problems-inserting-the-e-pto-in-vecto to develop

* commit 'df3953b6':
  remove todo, no longer needed
  adding e-PTO to IEPC architecture (engineering mode)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1731-declaration-mode-xev-primary-bus to develop

* commit '895c504e':
  adding fallback search in case the interpolate search finds an invalid ICE operating point
  serial hybrid strategy: use next gear in case gearbox is disengaged
  fixed IEPC and IHPC mockup runs
  inject IDeclarationCyclefactory into VectoMockupRunDataFactoryFactory
  error message in case no primary result can be found. extend results in VIF used for testcase
  added S2-HEV vif
  only calculate fuel factor (completed bus) if there are fuels in the primary bus - i.e. don't calculate for PEV
  override checking gears method for IEPC
  remove xml element in vif that's not allowed for PEV
  remove line with no contents
  updated user manual

Stefanos DOUMPOULAKIS authored 1 year ago and Markus Quaritsch committed 1 year ago

Merge in VECTO/vecto-dev from VECTO/sd_vecto:disable-issue-15-fix to develop

* commit 'a1a9fdf7':
  fix: disabled codeu issue 15 fix because of failing testcases

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

extend results in VIF used for testcase

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

only calculate fuel factor (completed bus) if there are fuels in the primary bus - i.e. don't calculate for PEV

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1731-declaration-mode-xev-primary-bus to develop

* commit 'ad8f05ab': (228 commits)
  drivingcycle: if vehicle speed is already at the next targetspeed and the estimated remaining distance is too short, simulate the current interval
  check for AbstractXMLDeclarationCompleteBusDataProvider instead of ConventionalCompletedBusDataProvider when loading a step input
  implemented VIF simulation in vecto console
  updated readme
  implemented simulation of vifs in VECTO gui
  added S-hev vif
  fixed wrong mod suffix for generic serial hybrid
  added S2-HEV testcase
  set ovc mode to charge sustaining for non ovc hevs
  fix error message: hybrid strategy parameters may be null
  update expected vmod data
  use sufficiently large ADC lossmap
  correctly set ovc mode for completed simulation. ignore ovc mode at first when searching primary result, only consider ovc mode when more than one result is available
  fix setting gearshift parameters IEPC: in case the Axlegear is included in the IEPC, ignore Axlegear component from input, set ratio to 1 for shift params calculation
  serialize efficiency maps if IEPC data
  bugfix PEV/IEPC VIF: no SCR Dosing in VIF. adapt code and testcases
  check if xmlns attribute is already set when writing airdrag node
  added completed bus tests
  added s-hev primary bus testcase
  added check if gearnumber attributes matches the number of provided gears
  ...

drivingcycle: if vehicle speed is already at the next targetspeed and the estimated remaining distance is too short, simulate the current interval

check for AbstractXMLDeclarationCompleteBusDataProvider instead of ConventionalCompletedBusDataProvider when loading a step input

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

ignore ovc mode at first when searching primary result, only consider ovc mode when more than one result is available

fix setting gearshift parameters IEPC: in case the Axlegear is included in the IEPC, ignore Axlegear component from input, set ratio to 1 for shift params calculation

adapt code and testcases