# Conflicts:
#	.gitignore
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
#	HashingTool/Properties/Version.cs
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/Input Files/Vehicle.vb
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/Utils/XMLDefinitions.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoXML.spp

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:master to master

* commit '6dc23637':
  building new release: updating release notes, updating version number, adding release report, adding simulation results
  correcting typo in error message

building new release: updating release notes, updating version number, adding release report, adding simulation results

Merge in VECTO/mq_vecto-sim from VECTO/vecto-sim:master to master

* commit '303b90ae':

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

* commit 'a0b13ffa':
  bugfix in batterySystem::MaxSoC (resulted in confusion (invalid scores) in hybrid strategy), set fuel costs to 0 if ICE is off
  remove unnecessary / erroneous overrides
  fix testcase exempted primary bus
  bugfix torque converter - handle the case the operating point is null
  bugfix dcdc converter: consider efficiency when checking if battery can supply dcdc converter
  update expected vmod file - changed column names, new columsn
  change gearshift test to use ACEA shift lines instead of new EffShift lines
  update expected vmod and vsum file (new/renamed columns)
  removed pif testcases and related file
  xmlvalidator: restore orignial functionality - return null in case no errors occured
  removing testcases for reading PIF - PIF no longer used
  separate completed bus testcases
  shift polygon tests: use previous (ACEA) shiftlines in testcase (not new EffShift lines)
  in case eta for REESS correction cannot be calculated (no charge/discharge situations) set correctable energy to 0
  updating expected .vmod and .vsum files due to new columns or renamed columns

bugfix in batterySystem::MaxSoC (resulted in confusion (invalid scores) in hybrid strategy), set fuel costs to 0 if ICE is off

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

# Conflicts:
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs

in case eta for REESS correction cannot be calculated (no charge/discharge situations) set correctable energy to 0

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

* commit 'bac6f133':

Merge in VECTO/mq_vecto-dev from feature/VECTO-1453-battery-time-dependent-internal-resistance to develop

* commit '381693d7':
  fix some testcases, hybrid stragety: calc aux energy for aux connected to REESS (approx.)
  bugfixes after extending battery to batterysystem
  update battery state in test powertrain
  implementing time-dependent internal resistance

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1453-battery-time-dependent-internal-resistance to develop

* commit '381693d7':
  adding missing file to documentation
  fix some testcases, hybrid stragety: calc aux energy for aux connected to REESS (approx.)
  bugfixes after extending battery to batterysystem
  update battery state in test powertrain
  implementing time-dependent internal resistance

# Conflicts:
#	VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs

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

# Conflicts:
#	Documentation/BusAuxCases with ESS_Formatted.xlsx

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

* commit '41d1e511': (139 commits)
  update battery state in test powertrain
  fix busaux testcases
  use same version of lib also in gui project (json), update testdata
  testcase for single bus simulation - check passenger count calculation
  fix passenger count in single-bus simulation: standing not considered in Coach cycle
  added testcase for passenger count
  update handling of passenger count - sitting / standing
  fix testdata: passenger count
  fix testdata according to new handling of airdrag modified
  ignore testcase no longer useful
  fixing testcases for completed/single bus
  Allow only CreateVifViewModels with unsaved changes to be selected for simulation
  Added backing storage to CreateVifViewModel
  Added Teardown method to backingstorage tests
  Updated Backing storage and added tests
  Added Backing storage to monitor unsaved changes of viewmodels
  Fixed error in CreateVifViewModel SetinputData
  Allow selection of jobs only if they can be simulated
  Added parameters to ProeprtyNameToLabelTextConverter
  Added missing stages to GUILabels
  ...

(cherry picked from commit ee7abe05)