Merge branch 'develop' of...

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

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs

@@ -498,103 +498,60 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		#region Overrides of AbstractXMLResource
 
-		protected override XNamespace SchemaNamespace {
-			get { return NAMESPACE_URI; }
-		}
+		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
 
 		protected override DataSourceType SourceType { get; }
 
 		#endregion
 
-		public override VehicleCategory VehicleCategory {
-			get { return VehicleCategory.HeavyBusPrimaryVehicle; }
-		}
+		public override VehicleCategory VehicleCategory => VehicleCategory.HeavyBusPrimaryVehicle;
 
-		public override bool ExemptedVehicle {
-			get { return true; }
-		}
+		public override bool ExemptedVehicle => true;
 
+		public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>();
 
-		public override IList<ITorqueLimitInputData> TorqueLimits {
-			get { return new List<ITorqueLimitInputData>(); }
-		}
+		public override LegislativeClass? LegislativeClass => GetString(XMLNames.Bus_LegislativeCategory)?.ParseEnum<LegislativeClass>();
 
-		public override PerSecond EngineIdleSpeed {
-			get { return null; }
-		}
 
-		public override bool VocationalVehicle {
-			get { return false; }
-		}
+		public override IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
 
-		public override bool SleeperCab {
-			get { return false; }
-		}
+		public override PerSecond EngineIdleSpeed => null;
 
-		public override TankSystem? TankSystem {
-			get { return null; }
-		}
+		public override bool VocationalVehicle => false;
 
-		public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS {
-			get { return null; }
-		}
+		public override bool SleeperCab => false;
 
-		public override bool ZeroEmissionVehicle {
-			get { return XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle)); }
-		}
+		public override TankSystem? TankSystem => null;
 
-		public override bool HybridElectricHDV {
-			get { return false; }
-		}
+		public override IAdvancedDriverAssistantSystemDeclarationInputData ADAS => null;
 
-		public override bool DualFuelVehicle {
-			get { return false; }
-		}
+		public override bool ZeroEmissionVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle));
 
-		public override Watt MaxNetPower1 {
-			get { return GetDouble("SumNetPower").SI<Watt>(); }
-		}
+		public override bool HybridElectricHDV => false;
 
-		public override Watt MaxNetPower2 {
-			get { return null; }
-		}
+		public override bool DualFuelVehicle => false;
 
-		public override string ExemptedTechnology
-		{
-			get { return GetString("Technology"); }
-		}
+		public override Watt MaxNetPower1 => GetDouble("SumNetPower").SI<Watt>();
 
-		public override IVehicleComponentsDeclaration Components {
-			get { return null; }
-		}
+		public override Watt MaxNetPower2 => null;
 
-		public override XmlElement ComponentNode {
-			get { return null; }
-		}
+		public override string ExemptedTechnology => GetString("Technology");
 
-		public override XmlElement PTONode {
-			get { return null; }
-		}
+		public override IVehicleComponentsDeclaration Components => null;
 
-		public override XmlElement ADASNode {
-			get { return null; }
-		}
+		public override XmlElement ComponentNode => null;
 
-		public override AngledriveType AngledriveType {
-			get { return AngledriveType.None; }
-		}
+		public override XmlElement PTONode => null;
 
-		public override RetarderType RetarderType {
-			get { return RetarderType.None; }
-		}
+		public override XmlElement ADASNode => null;
 
-		public override double RetarderRatio {
-			get { return 0; }
-		}
+		public override AngledriveType AngledriveType => AngledriveType.None;
 
-		public override IPTOTransmissionInputData PTOTransmissionInputData {
-			get { return null; }
-		}
+		public override RetarderType RetarderType => RetarderType.None;
+
+		public override double RetarderRatio => 0;
+
+		public override IPTOTransmissionInputData PTOTransmissionInputData => null;
 	}
 
 	public class XMLDeclarationMediumLorryVehicleDataProviderV26 : XMLDeclarationVehicleDataProviderV21
@@ -643,18 +600,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		#endregion
 
-		public override AngledriveType AngledriveType {
-			get { return AngledriveType.None; }
-		}
+		public override XmlElement ADASNode => null;
 
-		public override RetarderType RetarderType {
-			get { return RetarderType.None; }
-		}
+		public override AngledriveType AngledriveType => AngledriveType.None;
 
-		public override double RetarderRatio {
-			get { return 0; }
-		}
+		public override RetarderType RetarderType => RetarderType.None;
 
+		public override double RetarderRatio => 0;
 	}
 
 	public class XMLDeclarationCompletedBusDataProviderV26 : XMLDeclarationVehicleDataProviderV20
@@ -771,10 +723,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public string VIN => GetString(XMLNames.Vehicle_VIN);
 
-		public virtual LegislativeClass? LegislativeClass
-		{
-			get { return GetString(XMLNames.Bus_LegislativeCategory)?.ParseEnum<LegislativeClass>(); }
-		}
+		public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Bus_LegislativeCategory)?.ParseEnum<LegislativeClass>();
 
 		public virtual VehicleCategory VehicleCategory => VehicleCategoryHelper.Parse(GetString("ChassisConfiguration"));
 
@@ -917,22 +866,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		#region Overrides of XMLDeclarationMultistagePrimaryVehicleBusDataProviderV01
 
-		public override XmlElement ComponentNode
-		{
-			get { return null; }
-		}
+		public override XmlElement ComponentNode => null;
 
-		public override IVehicleComponentsDeclaration Components
-		{
-			get { return null; }
-		}
+		public override IVehicleComponentsDeclaration Components => null;
 
-		public override bool ExemptedVehicle { get { return true; } }
+		public override bool ExemptedVehicle => true;
 
-		public override Watt MaxNetPower1
-		{
-			get { return GetDouble("SumNetPower").SI<Watt>(); }
-		}
+		public override Watt MaxNetPower1 => GetDouble("SumNetPower").SI<Watt>();
 
 		#endregion
 	}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLExemptedPrimaryBusVehicleReport.cs

 using System.Collections.Generic;
+using System.Xml;
 using System.Xml.Linq;
 using TUGraz.VectoCommon.Hashing;
 using TUGraz.VectoCommon.Models;
@@ -17,10 +18,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 		{
 			VehiclePart.Add(
 				new XAttribute(xsi + "type", "VehicleExemptedPrimaryBusType"),
-				new XElement(tns + XMLNames.Component_Manufacturer, modelData.VehicleData.Manufacturer),
-				new XElement(tns + XMLNames.Component_ManufacturerAddress, modelData.VehicleData.ManufacturerAddress),
+				new XElement(tns + XMLNames.ManufacturerPrimaryVehicle, modelData.VehicleData.Manufacturer),
+				new XElement(tns + XMLNames.ManufacturerAddressPrimaryVehicle, modelData.VehicleData.ManufacturerAddress),
 				new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
 				new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
+				new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
 				new XElement(tns + "LegislativeCategory", modelData.VehicleData.LegislativeClass.ToXMLFormat()),
 				new XElement(tns + XMLNames.Bus_ChassisConfiguration, "Bus"),
 				new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),

VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs

@@ -1138,8 +1138,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 		TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 7, TestName = "RunBusSimulation Grp 39/40 P39DD HU/RL"),
 		TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 9, TestName = "RunBusSimulation Grp 39/40 P39DD U/RL"),
 		TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 19, TestName = "RunBusSimulation Grp 39/40 P40DD CO/RL"), // fails! is intended/known
-		
-			TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 18, TestName = "RunBusSimulation Grp 39/40 P40DD CO/LL"),
+		TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 18, TestName = "RunBusSimulation Grp 39/40 P40DD CO/LL"),  // fails! is intended/known
 
 		//TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
 		//TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),