diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index ef6b6f00fdb464a26c1108e1e35ceb7db083a679..4752c7bb662bf5d85834391a314dcadc2f61b985 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/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();
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index b3328b16ee35eea8ff12ee673fe4d547408c3963..087518be4301d6817f734dd829b4fb096b50605a 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -954,6 +954,8 @@ namespace TUGraz.VectoCommon.InputData
IList<IAlternatorDeclarationInputData> Alternators { get; }
+ bool ESSupplyFromHEVREESS { get; }
+
IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage { get; }
}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 5f0449ddb84d880e37c2fc818c2c3599a756f403..e64483c26e0e3ffa0c7ea8bc808b9e3be476f6ec 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/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>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 2ec2d373f122ff1ac506c7383016c56a08d363fc..431dbe7fdb2313bd29e35837c23e7f5caf5ab7c6 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/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>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
index c7868c85e0f1fbe1d66970005d7a5050bff02865..27a5c7422897a0e9c49b1441e21e365431837ae4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
+++ b/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 {
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 90bba937046aab27606e050daa9b8350a373cd67..b06af35e367853576be19db626ff0c69bcaaed27 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/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,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index f6162580c1b61181fe929401151cf204888c3fa9..9fbcf5fe1c116cb812bb0d54386ab1f7eeb3cce2 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
@@ -25,10 +26,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
_dao.SingleBusInputData = singleBusInputData;
}
- #region Implementation of IVectoRunDataFactory
-
- #region Overrides of DeclarationModePrimaryBusVectoRunDataFactory
-
+
protected override Segment GetSegment(IVehicleDeclarationInputData vehicle)
{
//if (vehicle.VehicleCategory != VehicleCategory.HeavyBusCompletedVehicle) {
@@ -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
+
}
diff --git a/VectoCore/VectoCore/OutputData/XML/ComponentWriter/Declaration/ADAS_Writer.cs b/VectoCore/VectoCore/OutputData/XML/ComponentWriter/Declaration/ADAS_Writer.cs
index fcb3983c0e6015e122abacbbd148a8fd28a46afa..2160ebc6ceb4d461ad8b1b5caa3552f95997706a 100644
--- a/VectoCore/VectoCore/OutputData/XML/ComponentWriter/Declaration/ADAS_Writer.cs
+++ b/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();
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 77571122a5d00629ecbedf6f14a586179d959344..7349f080ee0d2081f5341792e2f889c2f68536a2 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/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
);
}
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
index 31b7f4df3a30384e77bf9918dd5d9024b103c0c4..92e3a59fbc0e5602b0626cf00f448583810c9d61 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
+++ b/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);
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
index af882338aafe3a38c726325d2ffada3de02491ba..c37ea78d34b6c9858bba4ed31d4aba8877c84403 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
@@ -175,13 +175,12 @@ 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);
//foreach (var i in new[] { 0, 1, 4, 5 }) {
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index fa8ee56fb26c63cd6aa20b86d62bca46253ab537..d18dc30e4433fb844d44703d1305bbc2612a8168 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/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>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted.xml
deleted file mode 100644
index b437e77a26760af10c552b5d5dcabbd0dfcaf243..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV.xml
deleted file mode 100644
index 67fdf8d43c5d419031f4de2955c8d878098da396..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV_2.xml
deleted file mode 100644
index 5c30b4004abdf92e44f3c6ff28aca69edb13338b..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_PEV_2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperF.xml
deleted file mode 100644
index 4f42484c8c9d6db9c17f9c114c70640c1f5f2627..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperF.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperT.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperT.xml
deleted file mode 100644
index 244646f740b0c2a11b039a53b1df1aec35f9f19a..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl+sleeperT.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl.xml
deleted file mode 100644
index 99c300940a78ca9dbd5242d2f2cc9c74b87a30f8..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_axl.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperF.xml
deleted file mode 100644
index 2715486feb7b090aa380d2501a79eb2ab1c75243..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperF.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperT.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperT.xml
deleted file mode 100644
index b1c887ea5bc82b38c85381c2bc75c3922c5d21f8..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_sleeperT.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1.xml
deleted file mode 100644
index 3ea24084124cdfb5223acbdde41217eca1623b08..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV.xml
deleted file mode 100644
index 48d78a570746c4e4909c7225f189736175abc28a..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV_2.xml
deleted file mode 100644
index 672cbd0a9b7f32f04e922c6c7a578aa10d328df4..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_PEV_2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperF.xml
deleted file mode 100644
index c11c7a0d696cc7a15fddec754fee9eb803be2fcd..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperF.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperT.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperT.xml
deleted file mode 100644
index 1c1699e1594ba420ec9a9f837b07053e9cdc38f3..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl+SleeperT.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl.xml
deleted file mode 100644
index dd5832f90ecbe8410745de203575ae8bae8600b0..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_axl.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperF.xml
deleted file mode 100644
index cd16516726d5333c6dc8cb4e4df007cf27c49094..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperF.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperT.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperT.xml
deleted file mode 100644
index b9cb686b58dbd0fb0abd2408dafb8ab33fbf904c..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/exempted_v2.2.1_sleeperT.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0"
- xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1"
- xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
- xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:q1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
- xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/\XSD/VectoInput.2.0.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVehicleDeclarationType">
- <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>
- </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
index 61ffe14f8c1d362315d33ed0bbad8ab468ee0dcc..eece28613dbeaa210d1387700b9d5e2907cf2180 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_vehicle-fullElectricSP.xml
@@ -5,45 +5,46 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
- xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<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>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>7100</CurbMassChassis>
- <GrossVehicleMass>40000</GrossVehicleMass>
+ <CorrectedActualMass>7100</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <v2.1:PTO xsi:type="PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <PTO xsi:type="PTOType" >
<PTOShaftsGearWheels>only the drive shaft of the PTO</PTOShaftsGearWheels>
<PTOOtherElements>multi-disc clutch</PTOOtherElements>
- </v2.1:PTO>
+ </PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>true</SleeperCab>
- <v2.1:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
- </v2.1:ADAS>
- <v2.1:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ </ADAS>
+ <v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Entry gear="6" maxTorque="1800" />
<Entry gear="1" maxTorque="2500" />
<Entry gear="12" maxTorque="1900" />
- </v2.1:TorqueLimits>
- <Components xsi:type="v2.0:VehicleComponentsType">
- <Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
- <Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType">
+ </v2.4:TorqueLimits>
+ <Components xsi:type="Components_Conventional_LorryType">
+ <Engine>
+ <Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -188,7 +189,7 @@
<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#ENG-gooZah3D">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -197,10 +198,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>sNtMe9udO39TyKXzgwYEpVKImWizFalaBVqq3jLktuo=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
- <Gearbox xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="GearboxComponentDeclarationType">
- <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType">
+ <Gearbox>
+ <Data id="gbx-vi2Oak2N" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2588,7 +2589,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#gbx-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -2597,10 +2598,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
- <TorqueConverter xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterComponentDeclarationType">
- <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
+ <TorqueConverter>
+ <Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Some Manufacturer</Manufacturer>
<Model>Some Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2613,15 +2614,15 @@
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"></Entry>
</Characteristics>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#tc-123xyz">
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></di:DigestMethod>
<di:DigestValue>q2sumDwsqQKLw4xwkEllgsygF5bHBwZPSS66UNaXXis=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</TorqueConverter>
- <Angledrive xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveComponentDeclarationType">
- <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType">
+ <Angledrive>
+ <Data id="agl-vi2Oak2N" xsi:type="AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2638,7 +2639,7 @@
<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#agl-vi2Oak2N">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -2647,10 +2648,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</Angledrive>
- <Retarder xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderComponentDeclarationType">
- <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType">
+ <Retarder>
+ <Data id="RET-Shai9imi" xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
<Model>Generic Retarder</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -2684,7 +2685,7 @@
<Entry retarderSpeed="2300.00" torqueLoss="20.58" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#RET-Shai9imi">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -2693,10 +2694,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
- <Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
- <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType">
+ <Axlegear>
+ <Data id="AXL-EC3ohnoh" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -3200,7 +3201,7 @@
<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#AXL-EC3ohnoh">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -3209,10 +3210,10 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
- <AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
- <Data xsi:type="AxleWheelsDataDeclarationType">
+ <AxleWheels>
+ <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsDataDeclarationType">
<Axles>
<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
@@ -3271,14 +3272,14 @@
</Axles>
</Data>
</AxleWheels>
- <Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
- <v2.0:Data xsi:type="v2.3:AuxiliariesDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+ <Auxiliaries>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
- <Technology>Full electric steering gear</Technology>
- <Technology>Electric driven pump</Technology>
+ <Technology axleNumber="1">Full electric steering gear</Technology>
+ <Technology axleNumber="2">Electric driven pump</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology - LED headlights, all</Technology>
@@ -3289,10 +3290,10 @@
<HVAC>
<Technology>Default</Technology>
</HVAC>
- </v2.0:Data>
+ </Data>
</Auxiliaries>
- <AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
- <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <AirDrag>
+ <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -3302,7 +3303,7 @@
<TransferredCdxA>6.32</TransferredCdxA>
<DeclaredCdxA>6.34</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<di:Reference URI="#CabinX23h">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -3311,7 +3312,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
</v2.0:Vehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 2c9ef0a0eb6b92f8f247c5331db5988363d0c84c..22f99e3cd63fed7b699ae186af47573cc3bca2cf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
- <ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
- <v2.1:EngineStopStart>true</v2.1:EngineStopStart>
- <v2.1:EcoRollWithoutEngineStop>false</v2.1:EcoRollWithoutEngineStop>
- <v2.1:EcoRollWithEngineStop>true</v2.1:EcoRollWithEngineStop>
- <v2.1:PredictiveCruiseControl>1,2,3</v2.1:PredictiveCruiseControl>
- <!--<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>-->
- </ADAS>
+ <vif0.1:ADAS xsi:type="ADAS_Conventional_Type" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <EngineStopStart>true</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+ <APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
+ </vif0.1:ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
<tcl:Entry gear="1" maxTorque="2500"/>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 525e727f57c37b1a15f29affb06ad5147c4e08b7..052309dd41d4347025229b653143db65209000e7 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -3831,6 +3831,105 @@
<None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\MT_6.vgbx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\AMT_12.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Axle_4x2_Tractor.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Default.vrlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_drag.vemd">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_fld.vemp">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_Map.vemo">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_10.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_11.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_12.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_7.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_8.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_9.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_fld.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_Map.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\HEV_Parameter.vhctl">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\LongHaul_mod5_id_2.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\MaxCurrent.vimax">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_12.7l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_EM.vem">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_ESSoff.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_REESS.vreess">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload_ESSoff.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_Internal_Resistance.vbatr">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_SOC_curve.vbatv">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Truck.vacc">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\Multistage\newVifCompletedConventional-noADAS.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -6895,6 +6994,15 @@
<Content Include="TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_nonHEV.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted_v2_nonHEV.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -7378,6 +7486,9 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_tyre-sample.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_vehicle-fullElectricSP.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel_WHR.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
index 0fb66918516f6fa09eb376ff12d26e932f5daba8..38dba2fac60c03f056e175c5021b6cc7c30358bb 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
@@ -796,7 +796,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
- Assert.IsNull(vehicle.TorqueLimits);
+ Assert.AreEqual(0, vehicle.TorqueLimits.Count);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
}
else
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index 7b185c8519218c9e26535e2ce1dcb56625392edc..e0c0068ab735dfe618f1eb956f8fb43a9f20696d 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(DateTime.Parse("2018-02-15T11:00:00Z").ToUniversalTime(), vehicle.Date);
Assert.AreEqual(null, vehicle.LegislativeClass);
Assert.AreEqual(null, vehicle.CurbMassChassis);//CorrectedActualMass
- Assert.AreEqual(null, vehicle.GrossVehicleMassRating);//TechnicalPermissibleMaximumLadenMass
+ Assert.AreEqual(4000, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
Assert.AreEqual(null, vehicle.AirdragModifiedMultistep);
Assert.AreEqual(null, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus
@@ -151,7 +151,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.DoorDriveTechnology);
Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType);
- Assert.AreEqual(null, vehicle.ADAS);
+ Assert.NotNull(vehicle.ADAS);
Assert.AreEqual(null, vehicle.Components);
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(DateTime.Parse("2021-02-13T07:20:08.0187663Z").ToUniversalTime(), vehicle.Date);
Assert.AreEqual(null, vehicle.LegislativeClass);
Assert.AreEqual(15000, vehicle.CurbMassChassis.Value());//CorrectedActualMass
- Assert.AreEqual(null, vehicle.GrossVehicleMassRating);//TechnicalPermissibleMaximumLadenMass
+ Assert.AreEqual(4000, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
Assert.AreEqual(null, vehicle.AirdragModifiedMultistep);
Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus