removing tests lo longer needed (exempted vehicles), fixing testcases

VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs

@@ -581,6 +581,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 		public AlternatorType AlternatorTechnology => throw new NotImplementedException();
 		public IList<IAlternatorDeclarationInputData> Alternators => throw new NotImplementedException();
+		public bool ESSupplyFromHEVREESS { get; }
 		public IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage => throw new NotImplementedException();
 
 		public bool SmartElectrics => throw new NotImplementedException();

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -954,6 +954,8 @@ namespace TUGraz.VectoCommon.InputData
 
 		IList<IAlternatorDeclarationInputData> Alternators { get; }
 
+		bool ESSupplyFromHEVREESS { get; }
+
 		IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage { get; }
 	}
 

VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs

@@ -600,15 +600,6 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to APTEcoRollReleaseLockupClutch.
-        /// </summary>
-        public static string Bus_ADAS_APTEcoRollReleaseLockupClutch {
-            get {
-                return ResourceManager.GetString("Bus_ADAS_APTEcoRollReleaseLockupClutch", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to AdBlueDosing.
         /// </summary>

VectoCommon/VectoCommon/Resources/XMLNames.resx

@@ -1386,9 +1386,6 @@
   <data name="Vehicle_LegislativeCategory" xml:space="preserve">
     <value>LegislativeCategory</value>
   </data>
-  <data name="Bus_ADAS_APTEcoRollReleaseLockupClutch" xml:space="preserve">
-    <value>APTEcoRollReleaseLockupClutch</value>
-  </data>
   <data name="Bus_AirdragModifiedMultistep" xml:space="preserve">
     <value>AirdragModifiedMultistep</value>
   </data>

VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs

@@ -475,6 +475,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
+		public bool ESSupplyFromHEVREESS { get; }
+
 		public IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage
 		{
 			get {

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs

@@ -918,7 +918,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			return new ElectricMotorData() {
 				EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels},
 				DragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
-				Inertia = motorData.Inertia,
+				Inertia = motorData.Inertia * count,
 				OverloadRegenerationFactor = motorData.OverloadRecoveryFactor,
 				RatioADC = ratio,
 				RatioPerGear = ratioPerGear,

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
@@ -25,9 +26,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			_dao.SingleBusInputData = singleBusInputData;
 		}
 
-		#region Implementation of IVectoRunDataFactory
-
-		#region Overrides of DeclarationModePrimaryBusVectoRunDataFactory
 		
 		protected override Segment GetSegment(IVehicleDeclarationInputData vehicle)
 		{
@@ -56,7 +54,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			return segment;
 		}
 
-		#endregion
 
 		protected override IDeclarationDataAdapter DataAdapter => _dao;
 
@@ -105,7 +102,26 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			simulationRunData.BusAuxiliaries = _dao.CreateBusAuxiliariesData(mission, _singleBusInputData.PrimaryVehicle, _singleBusInputData.CompletedVehicle, simulationRunData);
 			return simulationRunData;
 		}
+
+		protected override void InitializeReport()
+		{
+			VectoRunData powertrainConfig;
+			List<List<FuelData.Entry>> fuels;
+			var vehicle = InputDataProvider.JobInputData.Vehicle;
+			if (vehicle.ExemptedVehicle) {
+				powertrainConfig = CreateVectoRunData(vehicle, 0, null, new KeyValuePair<LoadingType, Tuple<Kilogram, double?>>());
+				fuels = new List<List<FuelData.Entry>>();
+			} else {
+				powertrainConfig = _segment.Missions.Select(
+						mission => CreateVectoRunData(
+							vehicle, 0, mission, mission.Loadings.First()))
+					.FirstOrDefault(x => x != null);
+				fuels = vehicle.Components.EngineInputData.EngineModes.Select(x => x.Fuels.Select(f => DeclarationData.FuelData.Lookup(f.FuelType, _singleBusInputData.CompletedVehicle.TankSystem)).ToList())
+					.ToList();
+			}
+			Report.InitializeReport(powertrainConfig, fuels);
+		}
 	}
 
-	#endregion
+	
 }

VectoCore/VectoCore/OutputData/XML/ComponentWriter/Declaration/ADAS_Writer.cs

@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.OutputData.XML.ComponentWriter
 			elements.Add(new XElement(_writerNamespace + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adas.EcoRollWithEngineStop()));
 			elements.Add(new XElement(_writerNamespace + XMLNames.Vehicle_ADAS_PCC,adas.PredictiveCruiseControl.ToXMLFormat()));
 			if (adas.ATEcoRollReleaseLockupClutch != null) {
-				elements.Add(new XElement(_writerNamespace + XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, adas.ATEcoRollReleaseLockupClutch));
+				elements.Add(new XElement(_writerNamespace + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, adas.ATEcoRollReleaseLockupClutch));
 			}
 
 			return elements.ToArray();

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

@@ -27,7 +27,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 		{
 			return new XElement(tns + XMLNames.Tag_Vehicle,
 				new XAttribute("xmlns", v24),
-				new XAttribute(xsi + XMLNames.Attr_Type, "Vehicle_Exempted_CompletedBusType"),
+				new XAttribute(xsi + XMLNames.Attr_Type, "Vehicle_Exempted_CompletedBusDeclarationType"),
 				new XAttribute(XMLNames.Component_ID_Attr, vehicleId),
 				new XElement(v24 + XMLNames.Component_Manufacturer, _vehicleInputData.Manufacturer),
 				new XElement(v24 + XMLNames.Component_ManufacturerAddress, _vehicleInputData.ManufacturerAddress),
@@ -333,7 +333,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 				new XElement(v24 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
 				new XElement(v24 + XMLNames.Vehicle_ADAS_PCC, adasData.PredictiveCruiseControl.ToXMLFormat()),
 				adasData.ATEcoRollReleaseLockupClutch != null
-					? new XElement(v24 + XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, adasData.ATEcoRollReleaseLockupClutch)
+					? new XElement(v24 + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, adasData.ATEcoRollReleaseLockupClutch)
 					: null
 			);
 		}

VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs

@@ -67,27 +67,6 @@ namespace TUGraz.VectoCore.Tests.Integration
 		const string ExemptedVehicleV2 = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2.xml";
 		const string ExemptedVehicleV2NoHEV = @"Testdata\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2_nonHEV.xml";
 
-		private const string ExemptedMin = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted.xml";
-		private const string ExemptedAxl = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_axl.xml";
-		private const string ExemptedAxlSleeperT = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_axl+sleeperT.xml";
-		private const string ExemptedAxlSleeperF = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_axl+sleeperF.xml";
-		private const string ExemptedSleeperT = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_sleeperT.xml";
-		private const string ExemptedSleeperF = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_sleeperF.xml";
-		private const string ExemptedPEVMaxNetPower = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_PEV.xml";
-		private const string ExemptedPEVMin = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_PEV_2.xml";
-
-		private const string ExemptedMin_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1.xml";
-
-		private const string ExemptedAxl_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_axl.xml";
-		private const string ExemptedAxlSleeperT_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_axl+SleeperT.xml";
-		private const string ExemptedAxlSleeperF_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_axl+SleeperF.xml";
-		private const string ExemptedSleeperT_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_sleeperT.xml";
-		private const string ExemptedSleeperF_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_sleeperF.xml";
-		private const string ExemptedPEVMaxNetPower_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_PEV.xml";
-		private const string ExemptedPEVMin_v2 = @"TestData\Integration\DeclarationMode\ExemptedVehicle\exempted_v2.2.1_PEV_2.xml";
-
-
-
 		const string ExemptedPrimaryBus = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\exempted_primary_heavyBus.xml";
 
 		protected IXMLInputDataReader xmlInputReader;
@@ -280,102 +259,6 @@ namespace TUGraz.VectoCore.Tests.Integration
 
 
 
-		[
-		TestCase(ExemptedMin, null, null, null, null, false),
-		TestCase(ExemptedAxl, AxleConfiguration.AxleConfig_4x2, null, 30000, 20000, false),
-		TestCase(ExemptedAxlSleeperT, AxleConfiguration.AxleConfig_4x2, true, 30000, 20000, false),
-		TestCase(ExemptedAxlSleeperF, AxleConfiguration.AxleConfig_4x2, false, 30000, 20000, false),
-		TestCase(ExemptedSleeperT, null, true, 30000, 20000, false),
-		TestCase(ExemptedSleeperF, null, false, 30000, 20000, false),
-		TestCase(ExemptedPEVMaxNetPower, AxleConfiguration.AxleConfig_4x2, true, 30000, 20000, true),
-		TestCase(ExemptedPEVMin, null, null, null, null, true),
-
-		TestCase(ExemptedMin_v2, null, null, null, null, false),
-		TestCase(ExemptedAxl_v2, AxleConfiguration.AxleConfig_4x2, null, 30000, 20000, false),
-		TestCase(ExemptedAxlSleeperT_v2, AxleConfiguration.AxleConfig_4x2, true, 30000, 20000, false),
-		TestCase(ExemptedAxlSleeperF_v2, AxleConfiguration.AxleConfig_4x2, false, 30000, 20000, false),
-		TestCase(ExemptedSleeperT_v2, null, true, 30000, 20000, false),
-		TestCase(ExemptedSleeperF_v2, null, false, 30000, 20000, false),
-		TestCase(ExemptedPEVMaxNetPower_v2, AxleConfiguration.AxleConfig_4x2, true, 30000, 20000, true),
-		TestCase(ExemptedPEVMin_v2, null, null, null, null, true),
-		]
-		public void TestExemptedVehiclesAxleConfSleeperCabMRF(string filename, AxleConfiguration? expectedMrfAxleConf,
-			bool? expectedMrfSleeperCab, double? expectedMaxNetPower1, double? expectedMaxNetPower2, bool zeHDV)
-		{
-			var writer = new MockDeclarationWriter(filename);
-
-
-			var inputData = xmlInputReader.CreateDeclaration(filename);
-
-			var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
-			factory.WriteModalResults = true;
-			factory.ActualModalData = true;
-
-			var jobContainer = new JobContainer(new MockSumWriter());
-
-			var runs = factory.SimulationRuns().ToList();
-			Assert.AreEqual(1, runs.Count);
-			foreach (var run in runs) {
-				jobContainer.AddRun(run);
-			}
-			//jobContainer.AddRuns(factory);
-
-			jobContainer.Execute();
-			jobContainer.WaitFinished();
-			var progress = jobContainer.GetProgress();
-			Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error)));
-
-
-			var validator = new XMLValidator(writer.GetReport(ReportType.DeclarationReportManufacturerXML).CreateReader());
-			Assert.IsTrue(validator.ValidateXML(XmlDocumentType.ManufacturerReport));
-
-			var val2 = new XMLValidator(writer.GetReport(ReportType.DeclarationReportCustomerXML).CreateReader());
-			Assert.IsTrue(val2.ValidateXML(XmlDocumentType.CustomerReport));
-
-			var mrf = writer.GetReport(ReportType.DeclarationReportManufacturerXML).Document;
-			Assert.NotNull(mrf);
-
-			var axleConfNode = mrf.XPathSelectElements(XMLHelper.QueryLocalName(XMLNames.Vehicle_AxleConfiguration))
-				.ToArray();
-			if (expectedMrfAxleConf == null) {
-				Assert.AreEqual(0, axleConfNode.Length);
-			} else {
-				Assert.AreEqual(1, axleConfNode.Length, "axleconfiguration missing in mrf");
-				Assert.AreEqual(expectedMrfAxleConf.Value, AxleConfigurationHelper.Parse(axleConfNode.First().Value), "axleconfiguration: incorrect value");
-			}
-
-			var sleeperCabNode = mrf.XPathSelectElements(XMLHelper.QueryLocalName(XMLNames.Vehicle_SleeperCab))
-				.ToArray();
-			if (expectedMrfSleeperCab == null) {
-				Assert.AreEqual(0, sleeperCabNode.Length);
-			} else {
-				Assert.AreEqual(1, sleeperCabNode.Length);
-				Assert.AreEqual(expectedMrfSleeperCab.Value, XmlConvert.ToBoolean(sleeperCabNode.First().Value));
-			}
-
-			var maxNetPower1Node = mrf.XPathSelectElements(XMLHelper.QueryLocalName(XMLNames.Vehicle_MaxNetPower1))
-				.ToArray();
-			if (expectedMaxNetPower1 == null) {
-				Assert.AreEqual(0, maxNetPower1Node.Length);
-			} else {
-				Assert.AreEqual(1, maxNetPower1Node.Length);
-				Assert.AreEqual(expectedMaxNetPower1.Value, maxNetPower1Node.First().Value.ToDouble());
-			}
-
-			var maxNetPower2Node = mrf.XPathSelectElements(XMLHelper.QueryLocalName(XMLNames.Vehicle_MaxNetPower2))
-				.ToArray();
-			if (expectedMaxNetPower2 == null) {
-				Assert.AreEqual(0, maxNetPower2Node.Length);
-			} else {
-				Assert.AreEqual(1, maxNetPower2Node.Length);
-				Assert.AreEqual(expectedMaxNetPower2.Value, maxNetPower2Node.First().Value.ToDouble());
-			}
-
-			var zeNode = mrf.XPathSelectElement(XMLHelper.QueryLocalName(XMLNames.Vehicle_ZeroEmissionVehicle));
-			Assert.NotNull(zeNode);
-			Assert.AreEqual(zeHDV, XmlConvert.ToBoolean(zeNode.Value));
-		}
-
 		private static void SetExemptedParameters(XPathNavigator nav, bool zeroEmission, bool hybrid, bool dualFuel)
 		{
 			var manager = new XmlNamespaceManager(nav.NameTable);

VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs

@@ -175,12 +175,11 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var sumWriter = new SummaryDataContainer(fileWriter);
 			var jobContainer = new JobContainer(sumWriter);
 			var dataProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
-			var runsFactory = new SimulatorFactory(mode, dataProvider, fileWriter) {
-				ModalResults1Hz = false,
-				WriteModalResults = true,
-				ActualModalData = false,
-				Validate = false,
-			};
+			var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, dataProvider, fileWriter);
+			runsFactory.ModalResults1Hz = false;
+			runsFactory.WriteModalResults = true;
+			runsFactory.ActualModalData = false;
+			runsFactory.Validate = false;
 		
 			jobContainer.AddRuns(runsFactory);
 

VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml

@@ -19,6 +19,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
 		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>50</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
 		<NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck>

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<HybridElectricHDV>false</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
-		<SleeperCab>true</SleeperCab>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>false</HybridElectricHDV>
-		<DualFuelVehicle>false</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV_2.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
-		<HybridElectricHDV>false</HybridElectricHDV>
-		<DualFuelVehicle>false</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperF.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<SleeperCab>false</SleeperCab>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>true</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperT.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<SleeperCab>true</SleeperCab>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>true</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<AxleConfiguration>4x2</AxleConfiguration>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>true</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperF.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<SleeperCab>false</SleeperCab>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>true</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperT.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.1.0.xsd"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
-	<Vehicle id="VEH-1234567890">
-		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
-		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
-		<Model>Generic Model</Model>
-		<VIN>VEH-1234567890</VIN>
-		<Date>2017-02-15T11:00:00Z</Date>
-		<LegislativeClass>N3</LegislativeClass>
-		<VehicleCategory>Tractor</VehicleCategory>
-		<CurbMassChassis>7100</CurbMassChassis>
-		<GrossVehicleMass>40000</GrossVehicleMass>
-		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
-		<SleeperCab>true</SleeperCab>
-		<MaxNetPower1>30000</MaxNetPower1>
-		<MaxNetPower2>20000</MaxNetPower2>
-		<HybridElectricHDV>true</HybridElectricHDV>
-		<DualFuelVehicle>true</DualFuelVehicle>
-	</Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file