Stefanos DOUMPOULAKIS authored 2 years ago and Markus Quaritsch committed 2 years ago

Merge in VECTO/vecto-dev from bugfix/VECTO-1711-Torque-converter-fix to develop

* commit '8cf458ce':
  bugfix: TC info for all gears

Merge in VECTO/vecto-dev from hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev to develop

* commit '231075d1': (92 commits)
  writing reess usable and total capacity in MRF and CIF: refactor how this value is calculated. use data adapter to consider all the soc limits, calculate capacity based on stored energy in battery system (initialize batteries to min/max soc)
  EM and IEPC: write cont. power in kW to MRF
  bugfix lookup vehicle group and considering vocational flag
  add message to NotImplementedException in XMLDeclarationReportFactory
  throw exception ic socRange exceeds 1
  fix: write continuous torque and overload torque speeds as RPM in VIF
  to replace an existing result, also the vehicleclass needs to match (necessary for primary buses!)
  don't read ng tank system or ovc vor exempted vehicles
  fix mockup run for exempted completed bus: copy code from 'old' factory
  extend mockup results reader with missing architectures
  copy code from 'old' rundata factories into mockup rundata factories to avoid the 'new' architecture-dependent rundata creation (too complex in the mockup)
  vif: correct writing battery soc limits: write in percent, correct ninject binding
  fix writing aux technologies: allow multiple elements for steering pump, correct code for writing
  adding binding and dummy mockup result writer
  mockup tests: use coorect testfile
  bugfix reading vehicle data: return correct jobtype, do not read aux for PEV
  correct testfiles to contain valid data
  fixed bug in target soc determination
  hybrid strategy: additional filter, try to avoid configurations that exceed the battery limits
  make mokup code compile, correct attribute mapping in vif reader
  ...

Merge branch 'hm/feature/VECTO-1638_merge-mockup-in-vecto-core' into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

writing reess usable and total capacity in MRF and CIF: refactor how this value is calculated. use data adapter to consider all the soc limits, calculate capacity based on stored energy in battery system (initialize batteries to min/max soc)

copy code from 'old' rundata factories into mockup rundata factories to avoid the 'new' architecture-dependent rundata creation (too complex in the mockup)

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

Merge branch 'hm/feature/VECTO-1572-mockup-vecto-in-vecto-core' into hm/feature/VECTO-1638_merge-mockup-in-vecto-core

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VECTO.sln
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
#	VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoMockup/VectoMockup/VectoMockup.csproj

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

divide delta soc by 100

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

fixed parameters for single run testcases, assert that the _resultCount in the report must be zero after the simulation

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev