This reverts commit fdb933b4.

sumcontainer: add row in case no gears are available, set test directory in testcase, add missing validation attribute

Harald Martini authored 3 years ago and Markus Quaritsch committed 3 years ago

(cherry picked from commit 139c0238)

Harald Martini authored 3 years ago and Markus Quaritsch committed 3 years ago

(cherry picked from commit 2d9961a8)

Harald Martini authored 3 years ago and Markus Quaritsch committed 3 years ago

(cherry picked from commit 1197335f)

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:merge/Vecto_3.3.10 to develop

* commit '29840cd2': (31 commits)
  ignore torque limits (gbx in) in case torque converter is _not_ locked
  adaptations driver model: in case search braking power after an accelerate does not find an operating point, allow new search but set action to braking in case of hybrid vehicles (allows hybrid strategy to select different operating point)
  fix bug reading medium lorries
  fix bug initializing busaux with angular speed 0
  fix errors after merge, make things compile
  building new release: updating release notes, updating version number, adding release report, adding simulation results
  correcting typo in error message
  adding release report
  updating version number, release notes, changelog for release
  update release notes
  updating release notes: info on handling exempted vehicles
  change sleepercab from boolean too boolean?, adapt testdata and testcases for exempted vehicles; lookup vehicle class for exempted vehicles if axleconfiguration is available
  adding 2.2.1 schema, adding inputdataprovider for 2.2.1 exempted vehicles, adapting testcase for exempted
  adding testfiles for exempted vehicles
  update latest version of  MRF: allow axle configuration, sleeper cab and vehicle group for exempted vehicles
  adding sleeper cab as optional input in XSD 1.0; new xsd version 2.2.1 for exempted vehicles with axle configuration and sleeper cab as input parameters
  engine FLD: avoid duplicate entries if intersection falls at second grid point
  intersect engine FLD: only add intersection point if it is not already part of the entries.
  adding testcase exempted vehicle schema version 2: non HEV and no maxNetPower in input bugfix in xmldeclarationdataprovider
  add missing base type for 1.0 xml schema
  ...

# Conflicts:
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedTruck.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs

adaptations driver model: in case search braking power after an accelerate does not find an operating point, allow new search but set action to braking in case of hybrid vehicles (allows hybrid strategy to select different operating point)

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

* commit 'd7ab4abc':
  make testcases  run
  make bus auxiliaries work with PEV vehicles

# 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