diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 61a9bdd24f9e912d67e79d76b1175f8909f3bb70..30cc6872eae4f881473d70aa472aaa5d80f26e09 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -142,7 +142,7 @@ Public Class VehicleForm
cbLegislativeClass.ValueMember = "Value"
cbLegislativeClass.DisplayMember = "Label"
- cbLegislativeClass.DataSource = [Enum].GetValues(GetType(LegislativeClass?)) _
+ cbLegislativeClass.DataSource = [Enum].GetValues(GetType(LegislativeClass)) _
.Cast(Of LegislativeClass?).Select(Function(x) New With {Key .Value = x, .Label = x.GetLabel()}).ToList()
'Items.AddRange(PtoTypeStrings.Values.Cast(Of Object).ToArray())
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index a4dd118e5b71a2321b0d447fde615d2a0531e78e..7ff583f6e5dd234f6f3066f1d7b258255b8dbc97 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
using System.Xml;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces;
using VECTO3GUI2020.Helper;
@@ -425,7 +426,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#region Implementation of IElectricSupplyDeclarationData
+ public AlternatorType AlternatorTechnology => throw new NotImplementedException();
public IList<IAlternatorDeclarationInputData> Alternators => throw new NotImplementedException();
+ public IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage => throw new NotImplementedException();
public bool SmartElectrics => throw new NotImplementedException();
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
index dfa0194b82a3d1e005fb963526c5f09d3d4cb025..03712ad620c5936d2943be4a2e916751a61466bb 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
@@ -1,4 +1,5 @@

+Imports TUGraz.VectoCommon.BusAuxiliaries
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
@@ -21,12 +22,6 @@ Namespace Mocks
Return 0.0
End Function
- Public ReadOnly Property Technologies As IList(Of String) Implements IAlternatorMap.Technologies
- get
- Return New List(Of string)
- End Get
- End Property
-
public ReadOnly property Source As String Implements IAlternatorMap.Source
get
Return ""
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 4f517297a6937b84db7f63d46d7affbd677f5993..2675bc3e2b12373fed208c08c1d51315a813ee5c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,5 +1,6 @@
Imports System.IO
Imports NUnit.Framework
+Imports TUGraz.VectoCommon.BusAuxiliaries
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 4781a11a5cbd735a07db3e280ace7a6f8f0a34fb..d105b72d978cf37c95db18b485f302bdc3275675 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -1,6 +1,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports System.IO
+Imports TUGraz.VectoCommon.BusAuxiliaries
Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/IAlternatorMap.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IAlternatorMap.cs
index 748ac019dd85da4e1b11563ca0e6e581701c26b6..5b3a5efa42fa94bb6dfeebd3a74aab6482cb63ad 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/IAlternatorMap.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IAlternatorMap.cs
@@ -9,10 +9,9 @@
//
// See the LICENSE.txt for the specific language governing permissions and limitations.
-using System.Collections.Generic;
using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+namespace TUGraz.VectoCommon.BusAuxiliaries
{
public interface IAlternatorMap
{
@@ -26,8 +25,6 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.El
/// <remarks></remarks>
double GetEfficiency(PerSecond rpm, Ampere currentDemand);
- IList<string> Technologies { get; }
-
string Source { get; }
}
}
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
index ba2d478cb1baef7ccefc6f978d5d885a222428cd..4b711a75c8a495045f157a5cb6f309b117d3cb69 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IElectricsUserInputsConfig.cs
@@ -12,7 +12,7 @@
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
+
namespace TUGraz.VectoCommon.BusAuxiliaries
{
public interface IElectricsUserInputsConfig
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 8da635419c8d5bf2ae16771cabcd354426735604..9d35cd05d90a21a0313885155db7fdd0531a6ee2 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -828,13 +828,11 @@ namespace TUGraz.VectoCommon.InputData
public interface IElectricSupplyDeclarationData
{
- IList<IAlternatorDeclarationInputData> Alternators { get; }
-
- bool SmartElectrics { get; }
+ AlternatorType AlternatorTechnology { get; }
- Watt MaxAlternatorPower { get; }
+ IList<IAlternatorDeclarationInputData> Alternators { get; }
- WattSecond ElectricStorageCapacity { get; }
+ IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage { get; }
}
public interface IElectricConsumersDeclarationData
@@ -851,13 +849,22 @@ namespace TUGraz.VectoCommon.InputData
}
public interface IAlternatorDeclarationInputData
+ {
+ Ampere RatedCurrent { get; }
+
+ Volt RatedVoltage { get; }
+ }
+
+ public interface IBusAuxElectricStorageDeclarationInputData
{
string Technology { get; }
- //double Ratio { get; }
+ WattSecond ElectricStorageCapacity { get; }
}
+
+
public interface IPneumaticSupplyDeclarationData
{
CompressorDrive CompressorDrive { get; }
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index acec3050f69fc8bc87dba5a972c38835eb0fae90..54c392912707d2912cd221b63dd348adc87111f0 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -1,35 +1,12 @@
-/*
-* This file is part of VECTO.
+//------------------------------------------------------------------------------
+// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
-*
+//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
+// </auto-generated>
+//------------------------------------------------------------------------------
namespace TUGraz.VectoCommon.Resources {
using System;
@@ -1092,7 +1069,7 @@ namespace TUGraz.VectoCommon.Resources {
}
/// <summary>
- /// Looks up a localized string similar to SCRReagentDosing.
+ /// Looks up a localized string similar to PneumaticSCRReagentDosing.
/// </summary>
public static string BusAux_PneumaticSystem_SCRReagentDosing {
get {
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 99d4e8f5a56d7dfbadbb6f8f6e5f467df268a3ab..0f4f5265577b42bce12a8c80031caa0fbf339727 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1489,7 +1489,7 @@
<value>VehicleDeclarationType</value>
</data>
<data name="BusAux_PneumaticSystem_SCRReagentDosing" xml:space="preserve">
- <value>SCRReagentDosing</value>
+ <value>PneumaticSCRReagentDosing</value>
</data>
<data name="AirDragArea_TransferredCdxA" xml:space="preserve">
<value>TransferredCdxA</value>
diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs
index 4f9ad9d4f424fcb2bc1acf6611d96c939d3a3ec2..20f87411af63df03583ad3aa8359576c6c2c879f 100644
--- a/VectoCommon/VectoCommon/Utils/SI.cs
+++ b/VectoCommon/VectoCommon/Utils/SI.cs
@@ -605,6 +605,12 @@ namespace TUGraz.VectoCommon.Utils
return SIBase<Watt>.Create(wattSecond.Val / second.Value());
}
+ [DebuggerHidden]
+ public static AmpereSecond operator /(WattSecond wattSecond, Volt volt)
+ {
+ return SIBase<AmpereSecond>.Create(wattSecond.Val / volt.Value());
+ }
+
public static Kilogram operator *(WattSecond ws, KilogramPerWattSecond kpws)
{
return SIBase<Kilogram>.Create(ws.Val * kpws.Value());
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
index 718e3513169b5b8eb9c349d9efe3ea1f2bce0749..ad25de035dfcd30b2154b36f9d2095f2aabee7f7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
@@ -591,13 +591,41 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IElectricSupplyDeclarationData
+ public virtual AlternatorType AlternatorTechnology
+ {
+ get
+ {
+ return Body["Aux"]?["ElectricSupply"]?.GetEx<string>("Technology").ParseEnum<AlternatorType>() ?? AlternatorType.Conventional;
+ }
+ }
+
public virtual IList<IAlternatorDeclarationInputData> Alternators
{
get
{
- return Body["Aux"]?["ElectricSupply"]?["Alternators"]
- .Select(x => new AlternatorInputData(x.GetEx<string>("Technology")))
- .Cast<IAlternatorDeclarationInputData>().ToList() ?? new List<IAlternatorDeclarationInputData>();
+ var maxAlternatorPower =
+ Body["Aux"]?["ElectricSupply"]?.GetEx<double>("MaxAlternatorPower").SI<Watt>() ?? null;
+
+ if (maxAlternatorPower == null) {
+ return null;
+ }
+
+ return new[] { new AlternatorInputData(48.SI<Volt>(), maxAlternatorPower / 48.SI<Volt>()) }
+ .Cast<IAlternatorDeclarationInputData>().ToList();
+ }
+ }
+
+ public IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage
+ {
+ get
+ {
+ var batteryCapacity = Body["Aux"]?["ElectricSupply"]?.GetEx<double>("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>() ?? null;
+ if (batteryCapacity == null) {
+ return null;
+ }
+
+ return new[] { new BusAuxBatteryInputData("none", 48.SI<Volt>(), batteryCapacity / 48.SI<Volt>()), }
+ .Cast<IBusAuxElectricStorageDeclarationInputData>().ToList();
}
}
@@ -635,11 +663,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body["Aux"]?["ElectricSupply"]?.GetEx<bool>("SmartElectrics") ?? false; }
}
- public Watt MaxAlternatorPower
- {
- get { return Body["Aux"]?["ElectricSupply"]?.GetEx<double>("MaxAlternatorPower").SI<Watt>() ?? null; }
- }
-
public WattSecond ElectricStorageCapacity
{
get { return Body["Aux"]?["ElectricSupply"]?.GetEx<double>("ElectricStorageCapacity").SI(Unit.SI.Watt.Hour).Cast<WattSecond>() ?? null; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index 52d912753c7dc5bb2a2d77cc19aedaf48b11e4f1..6a22c683b4e07c86480be0b980db9421ea694d2e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -6,6 +6,7 @@ using System.Xml;
using System.Xml.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.XML.Common;
@@ -79,16 +80,52 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Implementation of IElectricSupplyDeclarationData
+ public AlternatorType AlternatorTechnology
+ {
+ get
+ {
+ return GetString(new[]
+ { XMLNames.BusAux_ElectricSystem, XMLNames.BusAux_ElectricSystem_AlternatorTechnology })
+ .ParseEnum<AlternatorType>();
+ }
+ }
+
public virtual IList<IAlternatorDeclarationInputData> Alternators
{
get
{
- return GetNodes(new[] { XMLNames.BusAux_ElectricSystem, XMLNames.BusAux_ElectricSystem_AlternatorTechnology })
- .Cast<XmlNode>().Select(x => new AlternatorInputData(x.InnerText))
+ return GetNodes(new[] { XMLNames.BusAux_ElectricSystem, "SmartAlternator" })
+ .Cast<XmlNode>().Select(x => {
+ var ratedCurrent = GetNode("RatedCurrent", x).InnerText.ToDouble().SI<Ampere>();
+ var ratedVoltage = GetNode("RatedVoltage", x).InnerText.ToDouble().SI<Volt>();
+ return new AlternatorInputData(ratedVoltage, ratedCurrent);
+ })
.Cast<IAlternatorDeclarationInputData>().ToList();
}
}
+ public IList<IBusAuxElectricStorageDeclarationInputData> ElectricStorage
+ {
+ get
+ {
+ return GetNodes(new[] { XMLNames.BusAux_ElectricSystem, "Battery" })
+ .Cast<XmlNode>().Select(x => {
+ var ratedCapacity = GetNode("RatedCapacity", x).InnerText.ToDouble().SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>();
+ var voltage = GetNode("NominalVoltage", x).InnerText.ToDouble().SI<Volt>();
+ var technology = GetNode("BatteryTechnology", x).InnerText;
+ return new BusAuxBatteryInputData(technology, voltage, ratedCapacity);
+ })
+ .Concat(GetNodes(new [] { XMLNames.BusAux_ElectricSystem, "Capacitor" }).Cast<XmlNode>()
+ .Select(x => {
+ var ratedCapacity = GetNode("RatedCapacitance", x).InnerText.ToDouble().SI<Farad>();
+ var voltage = GetNode("RatedVoltage", x).InnerText.ToDouble().SI<Volt>();
+ var technology = GetNode("CapacitorTechnology", x).InnerText;
+ return new BusAuxCapacitorInputData(technology, voltage, ratedCapacity);
+ }).Cast<IBusAuxElectricStorageDeclarationInputData>())
+ .Cast<IBusAuxElectricStorageDeclarationInputData>().ToList();
+ }
+ }
+
public virtual bool SmartElectrics
{
get { return GetBool(new[] { XMLNames.BusAux_ElectricSystem, XMLNames.BusAux_ElectricSystem_SmartElectrics }); }
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index d85813a0c9b63865b9332473caa44c31d6d612a9..a7df5c9d5f21dc070dcb577c193bd351a1e2ad38 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -204,20 +204,72 @@ namespace TUGraz.VectoCore.InputData.Impl
public class AlternatorInputData : IAlternatorDeclarationInputData
{
- public AlternatorInputData(string technology)
+ public AlternatorInputData(Volt ratedVoltage, Ampere ratedCurrent)
{
- Technology = technology;
-
+ RatedCurrent = ratedCurrent;
+ RatedVoltage = ratedVoltage;
+
}
#region Implementation of IAlternatorDeclarationInputData
-
- public virtual string Technology { get; }
+ public Ampere RatedCurrent { get; }
+ public Volt RatedVoltage { get; }
+
#endregion
}
-
+ public class BusAuxBatteryInputData : IBusAuxElectricStorageDeclarationInputData
+ {
+ public BusAuxBatteryInputData(string technology, Volt voltage, AmpereSecond ratedCapacity)
+ {
+ Technology = technology;
+ Voltage = voltage;
+ Capacity = ratedCapacity;
+ }
+
+ public Volt Voltage { get; set; }
+
+ public AmpereSecond Capacity { get; set; }
+
+ #region Implementation of IBusAuxElectricStorageDeclarationInputData
+
+ public string Technology { get; }
+
+ public WattSecond ElectricStorageCapacity
+ {
+ get { return Capacity * Voltage; }
+ }
+
+ #endregion
+ }
+
+ public class BusAuxCapacitorInputData : IBusAuxElectricStorageDeclarationInputData
+ {
+ public BusAuxCapacitorInputData(string technology, Volt voltage, Farad ratedCapacity)
+ {
+ Technology = technology;
+ Voltage = voltage;
+ Capacity = ratedCapacity;
+ }
+
+ public Volt Voltage { get; set; }
+
+ public Farad Capacity { get; set; }
+
+ #region Implementation of IBusAuxElectricStorageDeclarationInputData
+
+ public string Technology { get; }
+ public WattSecond ElectricStorageCapacity
+ {
+ get { return Capacity * Voltage * Voltage / 2.0; }
+ }
+
+ #endregion
+ }
+
+
+
public class ResultInputData : IResultsInputData
{
public string Status { get; internal set; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index 8e47fcb9d9432533dbb943e5eec9bbc9f09003ce..12a4d7b9f2ced03bd518aebd0bf095c4d41c41ab 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -115,18 +115,22 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = GetDefaultElectricalUserConfig();
var primaryBusAuxiliaries = primaryVehicle.Components.BusAuxiliaries;
- retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.SmartElectrics ? AlternatorType.Smart : AlternatorType.Conventional;
+ retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
retVal.ElectricalConsumers = currentDemand;
retVal.AlternatorMap = new SimpleAlternator(
CalculateAlternatorEfficiency(
primaryBusAuxiliaries.ElectricSupply.Alternators
- .Concat(completedVehicle.Components.BusAuxiliaries.ElectricSupply.Alternators).ToList())) {
- Technologies = primaryBusAuxiliaries.ElectricSupply.Alternators
- .Concat(completedVehicle.Components.BusAuxiliaries.ElectricSupply.Alternators).Select(x => x.Technology)
- .ToList()
- };
- retVal.MaxAlternatorPower = primaryBusAuxiliaries.ElectricSupply.MaxAlternatorPower;
- retVal.ElectricStorageCapacity = primaryBusAuxiliaries.ElectricSupply.ElectricStorageCapacity ?? 0.SI<WattSecond>();
+ .Concat(completedVehicle.Components.BusAuxiliaries.ElectricSupply?.Alternators ??
+ new List<IAlternatorDeclarationInputData>()).ToList()));
+ switch (retVal.AlternatorType) {
+ case AlternatorType.Smart when primaryBusAuxiliaries.ElectricSupply.Alternators.Count == 0:
+ throw new VectoException("at least one alternator is required when specifying smart electrics!");
+ case AlternatorType.Smart when primaryBusAuxiliaries.ElectricSupply.ElectricStorage.Count == 0:
+ throw new VectoException("at least one electric storage (battery or capacitor) is required when specifying smart electrics!");
+ }
+
+ retVal.MaxAlternatorPower = primaryBusAuxiliaries.ElectricSupply.Alternators.Sum(x => x.RatedVoltage * x.RatedCurrent);
+ retVal.ElectricStorageCapacity = primaryBusAuxiliaries.ElectricSupply.ElectricStorage.Sum(x => x.ElectricStorageCapacity) ?? 0.SI<WattSecond>();
return retVal;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
index c9484b7ce78dbadb987db9a8cce44dc828d2f768..d4895ea0363ba2a54b1f941e3d0fe50cfd503419 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterMultistageBus.cs
@@ -1,5 +1,6 @@
using System.Linq;
using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
@@ -49,16 +50,21 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = GetDefaultElectricalUserConfig();
var primaryBusAuxiliaries = primaryVehicle.Components.BusAuxiliaries;
- retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.SmartElectrics ? AlternatorType.Smart : AlternatorType.Conventional;
+ retVal.AlternatorType = primaryBusAuxiliaries.ElectricSupply.AlternatorTechnology;
retVal.ElectricalConsumers = currentDemand;
retVal.AlternatorMap = new SimpleAlternator(
- CalculateAlternatorEfficiency(primaryBusAuxiliaries.ElectricSupply.Alternators))
- {
- Technologies = primaryBusAuxiliaries.ElectricSupply.Alternators.Select(x => x.Technology).ToList()
- };
- retVal.MaxAlternatorPower = primaryBusAuxiliaries.ElectricSupply.MaxAlternatorPower;
- retVal.ElectricStorageCapacity = primaryBusAuxiliaries.ElectricSupply.ElectricStorageCapacity ?? 0.SI<WattSecond>();
+ CalculateAlternatorEfficiency(primaryBusAuxiliaries.ElectricSupply.Alternators));
+
+ switch (retVal.AlternatorType) {
+ case AlternatorType.Smart when primaryBusAuxiliaries.ElectricSupply.Alternators.Count == 0:
+ throw new VectoException("at least one alternator is required when specifying smart electrics!");
+ case AlternatorType.Smart when primaryBusAuxiliaries.ElectricSupply.ElectricStorage.Count == 0:
+ throw new VectoException("at least one electric storage (battery or capacitor) is required when specifying smart electrics!");
+ }
+
+ retVal.MaxAlternatorPower = primaryBusAuxiliaries.ElectricSupply.Alternators.Sum(x => x.RatedVoltage * x.RatedCurrent);
+ retVal.ElectricStorageCapacity = primaryBusAuxiliaries.ElectricSupply.ElectricStorage.Sum(x => x.ElectricStorageCapacity) ?? 0.SI<WattSecond>();
return retVal;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
index 95282d1c3cddf11e583da0b634c890f65df9f306..f7b09265fd25ac83a610590545459d9b1481b567 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
@@ -101,14 +101,20 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = GetDefaultElectricalUserConfig();
- retVal.AlternatorType = busAux.ElectricSupply.SmartElectrics ? AlternatorType.Smart : AlternatorType.Conventional;
+ retVal.AlternatorType = busAux.ElectricSupply.AlternatorTechnology;
retVal.ElectricalConsumers = currentDemand;
- retVal.AlternatorMap = new SimpleAlternator(CalculateAlternatorEfficiency(busAux.ElectricSupply.Alternators)) {
- Technologies = busAux.ElectricSupply.Alternators.Select(x => x.Technology).ToList()
- };
- retVal.MaxAlternatorPower = busAux.ElectricSupply.MaxAlternatorPower;
- retVal.ElectricStorageCapacity = busAux.ElectricSupply.ElectricStorageCapacity ?? 0.SI<WattSecond>();
-
+ retVal.AlternatorMap = new SimpleAlternator(CalculateAlternatorEfficiency(busAux.ElectricSupply.Alternators));
+
+ switch (retVal.AlternatorType) {
+ case AlternatorType.Smart when busAux.ElectricSupply.Alternators.Count == 0:
+ throw new VectoException("at least one alternator is required when specifying smart electrics!");
+ case AlternatorType.Smart when busAux.ElectricSupply.ElectricStorage.Count == 0:
+ throw new VectoException("at least one electric storage (battery or capacitor) is required when specifying smart electrics!");
+ }
+
+ retVal.MaxAlternatorPower = busAux.ElectricSupply.Alternators.Sum(x => x.RatedVoltage * x.RatedCurrent);
+ retVal.ElectricStorageCapacity = busAux.ElectricSupply.ElectricStorage.Sum(x => x.ElectricStorageCapacity) ?? 0.SI<WattSecond>();
+
return retVal;
}
@@ -127,12 +133,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
protected virtual double CalculateAlternatorEfficiency(IList<IAlternatorDeclarationInputData> alternators)
{
- var sum = 0.0;
- foreach (var entry in alternators) {
- sum += DeclarationData.BusAuxiliaries.AlternatorTechnologies.Lookup(entry.Technology);
- }
-
- return sum / alternators.Count;
+ return DeclarationData.BusAuxiliaries.AlternatorTechnologies.Lookup("default");
}
protected virtual Dictionary<string, ElectricConsumerEntry> GetElectricConsumers(Mission mission, IVehicleDeclarationInputData vehicleData, IActuations actuations, VehicleClass vehicleClass)
@@ -310,8 +311,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
MaxPossibleBenefitFromTechnologyList =
Constants.BusAuxiliaries.SteadyStateModel.MaxPossibleBenefitFromTechnologyList,
-
- COP = 3.5
};
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index f86702c1f1699a04e2211f6561a0021c603c586f..0823b9f1db8d33473091cbaafcbba82bc070589e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -527,9 +527,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
ResultCardTraction = new DummyResultCard(),
AlternatorGearEfficiency = Constants.BusAuxiliaries.ElectricSystem.AlternatorGearEfficiency,
DoorActuationTimeSecond = Constants.BusAuxiliaries.ElectricalConsumers.DoorActuationTimeSecond,
- AlternatorMap = new SimpleAlternator(busAux.ElectricSystem.AlternatorEfficiency) {
- Technologies = new List<string>() { "engineering mode" }
- },
+ AlternatorMap = new SimpleAlternator(busAux.ElectricSystem.AlternatorEfficiency),
AlternatorType =
busAux.ElectricSystem.ESSupplyFromHEVREESS &&
busAux.ElectricSystem.AlternatorType != AlternatorType.Smart
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/CombinedBusAuxiliaries.cs b/VectoCore/VectoCore/InputData/Reader/Impl/CombinedBusAuxiliaries.cs
index de6e03bde4c8c8f4948cb9ed05e904653931df92..a69d3d657786a0efd7a1ffba713cd87e53556f7e 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/CombinedBusAuxiliaries.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/CombinedBusAuxiliaries.cs
@@ -6,90 +6,90 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.InputData.Reader.Impl {
- public class CombinedBusAuxiliaries : IBusAuxiliariesDeclarationData, IElectricSupplyDeclarationData, IPneumaticSupplyDeclarationData, IElectricConsumersDeclarationData, IPneumaticConsumersDeclarationData, IHVACBusAuxiliariesDeclarationData
- {
- private IBusAuxiliariesDeclarationData CompletedAux;
- private IBusAuxiliariesDeclarationData PrimaryAux;
-
- public CombinedBusAuxiliaries(IBusAuxiliariesDeclarationData primary, IBusAuxiliariesDeclarationData completed)
- {
- PrimaryAux = primary;
- CompletedAux = completed;
- }
-
- #region Implementation of IBusAuxiliariesDeclarationData
-
- public XmlNode XMLSource { get { return null; } }
- public string FanTechnology { get { return PrimaryAux.FanTechnology; } }
- public IList<string> SteeringPumpTechnology { get { return PrimaryAux.SteeringPumpTechnology; } }
- public IElectricSupplyDeclarationData ElectricSupply { get { return this; } }
- public IElectricConsumersDeclarationData ElectricConsumers { get { return this; } }
- public IPneumaticSupplyDeclarationData PneumaticSupply { get { return this; } }
- public IPneumaticConsumersDeclarationData PneumaticConsumers { get { return this; } }
- public IHVACBusAuxiliariesDeclarationData HVACAux { get { return this; } }
-
- #endregion
-
- #region Implementation of IElectricSupplyDeclarationData
-
- public IList<IAlternatorDeclarationInputData> Alternators
- {
- get { return PrimaryAux.ElectricSupply.Alternators.Concat(CompletedAux.ElectricSupply.Alternators).ToList(); }
- }
-
- public bool SmartElectrics { get; }
- public Watt MaxAlternatorPower { get; }
- public WattSecond ElectricStorageCapacity { get; }
-
- #endregion
-
- #region Implementation of IPneumaticSupplyDeclarationData
-
- public CompressorDrive CompressorDrive { get; }
- public string Clutch { get; }
- public double Ratio { get; }
- public string CompressorSize { get; }
- public bool SmartAirCompression { get; }
- public bool SmartRegeneration { get; }
-
- #endregion
-
- #region Implementation of IElectricConsumersDeclarationData
-
- public bool? InteriorLightsLED { get; }
- public bool? DayrunninglightsLED { get; }
- public bool? PositionlightsLED { get; }
- public bool? HeadlightsLED { get; }
- public bool? BrakelightsLED { get; }
-
- #endregion
-
- #region Implementation of IPneumaticConsumersDeclarationData
-
- public ConsumerTechnology AirsuspensionControl { get; }
- public ConsumerTechnology AdBlueDosing { get; }
- public ConsumerTechnology DoorDriveTechnology { get; }
-
- #endregion
-
- #region Implementation of IHVACBusAuxiliariesDeclarationData
-
- public BusHVACSystemConfiguration? SystemConfiguration { get; }
- public HeatPumpType? HeatPumpTypeDriverCompartment { get; }
- public HeatPumpMode? HeatPumpModeDriverCompartment { get; }
- public HeatPumpType? HeatPumpTypePassengerCompartment { get; }
- public HeatPumpMode? HeatPumpModePassengerCompartment { get; }
- public Watt AuxHeaterPower { get; }
- public bool? DoubleGlazing { get; }
- public bool HeatPump { get; }
- public bool? OtherHeatingTechnology { get; }
- public bool? AdjustableCoolantThermostat { get; }
- public bool? AdjustableAuxiliaryHeater { get; }
- public bool EngineWasteGasHeatExchanger { get; }
- public bool? SeparateAirDistributionDucts { get; }
- public bool? WaterElectricHeater { get; }
- public bool? AirElectricHeater { get; }
-
- #endregion
- }
+ //public class CombinedBusAuxiliaries : IBusAuxiliariesDeclarationData, IElectricSupplyDeclarationData, IPneumaticSupplyDeclarationData, IElectricConsumersDeclarationData, IPneumaticConsumersDeclarationData, IHVACBusAuxiliariesDeclarationData
+ //{
+ // private IBusAuxiliariesDeclarationData CompletedAux;
+ // private IBusAuxiliariesDeclarationData PrimaryAux;
+
+ // public CombinedBusAuxiliaries(IBusAuxiliariesDeclarationData primary, IBusAuxiliariesDeclarationData completed)
+ // {
+ // PrimaryAux = primary;
+ // CompletedAux = completed;
+ // }
+
+ // #region Implementation of IBusAuxiliariesDeclarationData
+
+ // public XmlNode XMLSource { get { return null; } }
+ // public string FanTechnology { get { return PrimaryAux.FanTechnology; } }
+ // public IList<string> SteeringPumpTechnology { get { return PrimaryAux.SteeringPumpTechnology; } }
+ // public IElectricSupplyDeclarationData ElectricSupply { get { return this; } }
+ // public IElectricConsumersDeclarationData ElectricConsumers { get { return this; } }
+ // public IPneumaticSupplyDeclarationData PneumaticSupply { get { return this; } }
+ // public IPneumaticConsumersDeclarationData PneumaticConsumers { get { return this; } }
+ // public IHVACBusAuxiliariesDeclarationData HVACAux { get { return this; } }
+
+ // #endregion
+
+ // #region Implementation of IElectricSupplyDeclarationData
+
+ // public IList<IAlternatorDeclarationInputData> Alternators
+ // {
+ // get { return PrimaryAux.ElectricSupply.Alternators.Concat(CompletedAux.ElectricSupply.Alternators).ToList(); }
+ // }
+
+ // public bool SmartElectrics { get; }
+ // public Watt MaxAlternatorPower { get; }
+ // public WattSecond ElectricStorageCapacity { get; }
+
+ // #endregion
+
+ // #region Implementation of IPneumaticSupplyDeclarationData
+
+ // public CompressorDrive CompressorDrive { get; }
+ // public string Clutch { get; }
+ // public double Ratio { get; }
+ // public string CompressorSize { get; }
+ // public bool SmartAirCompression { get; }
+ // public bool SmartRegeneration { get; }
+
+ // #endregion
+
+ // #region Implementation of IElectricConsumersDeclarationData
+
+ // public bool? InteriorLightsLED { get; }
+ // public bool? DayrunninglightsLED { get; }
+ // public bool? PositionlightsLED { get; }
+ // public bool? HeadlightsLED { get; }
+ // public bool? BrakelightsLED { get; }
+
+ // #endregion
+
+ // #region Implementation of IPneumaticConsumersDeclarationData
+
+ // public ConsumerTechnology AirsuspensionControl { get; }
+ // public ConsumerTechnology AdBlueDosing { get; }
+ // public ConsumerTechnology DoorDriveTechnology { get; }
+
+ // #endregion
+
+ // #region Implementation of IHVACBusAuxiliariesDeclarationData
+
+ // public BusHVACSystemConfiguration? SystemConfiguration { get; }
+ // public HeatPumpType? HeatPumpTypeDriverCompartment { get; }
+ // public HeatPumpMode? HeatPumpModeDriverCompartment { get; }
+ // public HeatPumpType? HeatPumpTypePassengerCompartment { get; }
+ // public HeatPumpMode? HeatPumpModePassengerCompartment { get; }
+ // public Watt AuxHeaterPower { get; }
+ // public bool? DoubleGlazing { get; }
+ // public bool HeatPump { get; }
+ // public bool? OtherHeatingTechnology { get; }
+ // public bool? AdjustableCoolantThermostat { get; }
+ // public bool? AdjustableAuxiliaryHeater { get; }
+ // public bool EngineWasteGasHeatExchanger { get; }
+ // public bool? SeparateAirDistributionDucts { get; }
+ // public bool? WaterElectricHeater { get; }
+ // public bool? AirElectricHeater { get; }
+
+ // #endregion
+ //}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
index d5cefea0660cb1e0b230dfa61068bd91c0a5a6cb..8ef09f4b2c30c3398fa426d75cb4cef3a2fd7a86 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/SimpleAlternator.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
+using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
@@ -23,8 +24,6 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
return _efficiency;
}
- public IList<string> Technologies { get; set; }
-
public string Source { get { return null; } }
#endregion
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 57fc97308860b97a59cede651c670f85d9c45778..2563f1fad92a9057b563c3f4e9f0c5eeecf7fd70 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -20,6 +20,7 @@ using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
+
public class PEVAMTShiftStrategy : LoggingObject, IShiftStrategy
{
protected readonly IDataBus DataBus;
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index 4b12004b4b9ff979f3ce399abe2b29198d6c8485..8f96e87f1b2c4c3d381baa7491721cd3277376b2 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -905,7 +905,7 @@ namespace TUGraz.VectoCore.OutputData
row[string.Format(Fields.AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.HeatingVentilationAirCondition)] =
busAux.SSMInputs is ISSMDeclarationInputs inputs ? inputs.HVACTechnology : "engineering mode";
row[string.Format(Fields.AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.ElectricSystem)] =
- string.Join("/", busAux.ElectricalUserInputsConfig.AlternatorMap.Technologies);
+ string.Join("/", busAux.ElectricalUserInputsConfig.AlternatorType.GetLabel());
row[string.Format(Fields.AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.PneumaticSystem)] =
busAux.PneumaticUserInputsConfig.CompressorMap.Technology;
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 1aa4b14fd43d9558fd867db5b86dfd34a688b73e..76c40c06b22ca87517885f8c7450ef9fa7c0fb1c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -271,7 +271,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="AdBlueDosing" type="xs:boolean"/>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index 20f7195836c584d3f241df58665abdc7c9f45a48..c6e16750bf98bdc8a43265ec28d441aa044bf62c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Josef Kober (Technische Universität Graz) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
@@ -240,7 +240,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="SCRReagentDosing" type="xs:boolean"/>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 5493d6a51819ba7a407c2657a804df62d013a288..65ce70d494ecece738bdb9e2dc739fae153e40fa 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -34,6 +34,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NUnit.Framework;
using System.IO;
+using TUGraz.VECTO;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
@@ -45,7 +46,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VECTO;
+
namespace TUGraz.VectoCore.Tests.FileIO
{
@@ -493,8 +494,8 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(1, busAux.ElectricSupply.Alternators.Count);
- Assert.AreEqual("standard alternator", busAux.ElectricSupply.Alternators[0].Technology);
- Assert.AreEqual(false, busAux.ElectricSupply.SmartElectrics);
+ //Assert.AreEqual("standard alternator", busAux.ElectricSupply.Alternators[0].Technology);
+ Assert.AreEqual(AlternatorType.Conventional, busAux.ElectricSupply.AlternatorTechnology);
Assert.AreEqual("", busAux.PneumaticSupply.CompressorSize);
Assert.AreEqual(1.0, busAux.PneumaticSupply.Ratio);
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 4b46982020a83a8c664d8ea6e458e3fba61ab37f..7c1c4d19dd210c8bd2bf18d22c8b92af4b38ed9a 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -103,7 +103,9 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
public void TestCompletedBus()
{
var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(JobFile_Group41), Path.GetFileName(JobFile_Group41)));
- var inputData = CompletedVIF.CreateCompletedVif(JSONInputDataFactory.ReadJsonJob(JobFile_Group41) as JSONInputDataCompletedBusFactorMethodV7, xmlInputReader); // JSONInputDataFactory.ReadJsonJob(JobFile_Group41);
+ var inputData = CompletedVIF.CreateCompletedVif(
+ JSONInputDataFactory.ReadJsonJob(JobFile_Group41) as JSONInputDataCompletedBusFactorMethodV7,
+ xmlInputReader);
var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer)
{
@@ -598,7 +600,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.AreEqual(1.0, genericPneumaticUI.CompressorGearRatio);
Assert.AreEqual(genericPneumaticUI.CompressorGearRatio, specificPneumaticUI.CompressorGearRatio);
- Assert.AreEqual(false, genericPneumaticUI.SmartAirCompression);
+ Assert.AreEqual(true, genericPneumaticUI.SmartAirCompression);
Assert.AreEqual(genericPneumaticUI.SmartAirCompression, specificPneumaticUI.SmartAirCompression);
Assert.AreEqual(false, genericPneumaticUI.SmartRegeneration);
@@ -1029,8 +1031,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
inputData = tmp;
break;
case JSONInputDataCompletedBusFactorMethodV7 completedJson: {
- var completedVif = CompletedVIF.CreateCompletedVif(completedJson, xmlInputReader);
- inputData = new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null);
+ inputData = CompletedVIF.CreateCompletedVif(completedJson, xmlInputReader);
break;
}
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index d6fde08463d7b325301a5ee2029f8df5c740d39c..1fb3b2f6d2991834d3f217ab1d547ab51965bbdb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -249,7 +249,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index 60d0e40d0ab928e8769e869b37c9e78a91ba13bd..edac9d402239cda727e06804182bcdf5881eb98f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
@@ -196,7 +196,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index d6cb93e6a683c0ff7641e3fd886d33d9b3ec1954..2e2d5f6e986c980bc220fdd7a75b63ec16449af7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
@@ -183,7 +183,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index 36c7ce235908e93c097de92dc5e11da6daca668e..4219c8578373897a6e02b6a4b4c16853defb697d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
@@ -2200,7 +2200,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index b8c85321b6908600643e72b1b7792f1499493cb7..8c295412cb80623fa03bb0ed9b4939c061e7cd3e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
@@ -1713,7 +1713,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index e576b9c606316cfbe8d53a9e1fdf3fdc19b81621..8280da3de3b4f002e45489138af883e7966cdf0c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -245,7 +245,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
index 79831ea6a1847b85c71d1b0c34d930a886703722..c4bea06ee54b9f6e8dd1d963240706be853b5966 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
@@ -3349,7 +3349,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index 3e6193ac6e8b3ae4428c0cae358b0da6c54a4afd..7be76fb9ace842b96c63965e67fcd9e9df75cc00 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -17,6 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<CorrectedActualMass>8300</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+ <NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
@@ -66,7 +67,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<SystemConfiguration>7</SystemConfiguration>
<HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
<HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
- <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+ <HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 0bb245c753dda1a5165ba1933eb61587241f352a..3379693363ea865a1587972bd5c7c309716a4eb5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -17,6 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<CorrectedActualMass>8300</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index 78dfcf158de1b6ab76838d6072eeb7cf07a67d94..b2eb57ba5297be0c47006675b087f065cf2720e9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -218,7 +218,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -423,7 +423,7 @@
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
- <Payload unit="kg">879.90</Payload>
+ <Payload unit="kg">1075.44</Payload>
<PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
index bc8e0f7b7829f20d04d4818ea34c683f3e8fea93..9ee432111624b9ec7e8b3b1998c51b91c3c97e02 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -3276,7 +3276,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 61bf46efb1f83fcde569baac64b9637f62908cf4..24c1114427f0b957eda716e1e443eac0a4878376 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
- <VehicleCategory>Bus</VehicleCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>8x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
@@ -1534,17 +1534,18 @@
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
- <SmartElectrics>false</SmartElectrics>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
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 e850655fee89cc93344757252c6ea62128749a92..f00a8112fe4e09d458a0badf8177bf8fa22a0d60 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -1,28 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
- <Model>Sample Bus Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
- <LegislativeClass>M3</LegislativeClass>
- <ClassBus>II+III</ClassBus>
- <VehicleCode>CA</VehicleCode>
- <CurbMassChassis>8300</CurbMassChassis>
+ <Model>Sample Bus Model</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>8300</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
- <RegisteredPassengers>
- <LowerDeck>50</LowerDeck>
- <UpperDeck>0</UpperDeck>
- </RegisteredPassengers>
+ <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+ <ClassBus>II+III</ClassBus>
+ <NumberPassengersLowerDeck>50</NumberPassengersLowerDeck>
+ <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+ <BodyworkCode>CA</BodyworkCode>
<LowEntry>true</LowEntry>
- <HeightIntegratedBody>2.700</HeightIntegratedBody>
- <VehicleLength>11.830</VehicleLength>
- <VehicleWidth>2.550</VehicleWidth>
- <EntranceHeight>0.120</EntranceHeight>
+ <HeightIntegratedBody>2700</HeightIntegratedBody>
+ <VehicleLength>11830</VehicleLength>
+ <VehicleWidth>2550</VehicleWidth>
+ <EntranceHeight>120</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
- <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -43,28 +50,26 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</Signature>
- </v2.6:AirDrag>
+ </v2.8:AirDrag>
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
<LEDLights>
+ <Interiorlights>false</Interiorlights>
<Dayrunninglights>false</Dayrunninglights>
- <Headlights>false</Headlights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
- <Interiorlights>false</Interiorlights>
+ <Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>7</SystemConfiguration>
- <CompressorType>
- <DriverAC>2-stage</DriverAC>
- <PassengerAC>4-stage</PassengerAC>
- </CompressorType>
+ <HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
+ <HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+ <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
<DoubleGlazing>true</DoubleGlazing>
- <HeatPump>false</HeatPump>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
</HVAC>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
index 5a1f996f15299333832d9624b894f7c14ec86c01..095050c4686fd49b8b8fce67577fd27ec30545e0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
@@ -3276,7 +3276,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index 4ccf5d410765c92bc3541dc9d2a6204a4af8abf3..680613a7bd1119fdda7e5674722c44e96d1d81be 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartES" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -3285,7 +3285,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index 788861f365b4b43930008b6f0331c149018f9196..f7452fd6df79b0c1c660e0731c03cac1a098aacf 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -3285,7 +3285,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index 49e7eb95766fe98f469b49fdbbcc48e879e8188d..510a78327853b541a61a6d9487c145292fc8ced1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -3276,7 +3276,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index b5fdeffd7f4d1234b158dc0ce16da710013c4e89..e31a44e7d3507c8bb177972986a14d1dfca04794 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -3276,7 +3276,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index 13ad55d5c3162909d37bf819e5eba202ac2fdc74..f60a12e48e37cf148783cea1ae0e0909cdf8b0b9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -3276,7 +3276,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
index 117df858b87edc1ba5fe0f0e2b72b478d3ae8d84..3b8a9919d3f236fd6510b210ddfb380664cc7f07 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
@@ -3349,7 +3349,7 @@
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
index b161fdea75119e288e0ac2d1de2043e366a05809..acefa00c1c84e2c9b1329ddc7047f0fbddd9d933 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
@@ -6,7 +6,7 @@
<Model>Generic Model</Model>
<VIN>VEH-1234567890</VIN>
<Date>2017-02-15T11:00:00Z</Date>
- <VehicleCategory>Bus</VehicleCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,19 +3265,18 @@
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
- <SmartElectrics>false</SmartElectrics>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+ <CompressorDrive>mechanically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>false</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <AdBlueDosing>true</AdBlueDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index d28ccb58f969e64ac151edf5f221fec8d75c1a12..18f35e7a477dcb28441ff35d5042049ec435ffe4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index b92decec60bd365d548232ff187b6f719f0e2c32..d545658cf8bf874cad37f5d93067f8a64f5aab89 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -285,7 +285,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index 6f60023779fd123f93015fb83b2ae4fb788e1e16..361b9948987401786b0ac5721c8e31f7015eef28 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index a0d6796546d7b60e27c3e42be94ba9407b27d913..e3b3dabf98a8496f7ddb83c82524568d20af9473 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 259f55756bc4f19f37e83a57bab3ddb9b2c80dfe..129c8154a1a3b14971dbef400a69a74562e6ed15 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 0432e3d99f8c6c52fe469f3522b6f4e82d469af2..9c5437d5798030b9c2381ecf975e43a13e2448fc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index eea06d04f94318f7dcf80f773ae63fcfc5c8a586..c22deb2185a35a96ca63ab3a41b24f52d39bed61 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 50f5c1dbc9733a6f4788ee28b41fd28895e05038..3869a5acb8b39eebf8960a16a90df0b27c40577e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index c84e9834cb77a20a97a56d3eb3576f69bd733656..36fdc33ca1e7ae9b1a455d0e8b2ebd1b04c3770a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>8x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
</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"/>
<tcl:Entry gear="12" maxTorque="1900"/>
</TorqueLimits>
<Components xsi:type="VehicleComponentsPIFType">
<Engine>
<Data xsi:type="EngineDataPIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<RatedSpeed>1800</RatedSpeed>
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
<FullLoadAndDragCurve>
<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
</FullLoadAndDragCurve>
<Fuels>
<FuelType>Diesel CI</FuelType>
</Fuels>
</Mode>
</Data>
</Engine>
<Transmission>
<Data xsi:type="TransmissionDataPIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<Gears xsi:type="TransmissionGearsPIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="3">
<Ratio>9.020</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="4">
<Ratio>7.040</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="5">
<Ratio>5.640</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="6">
<Ratio>4.400</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="7">
<Ratio>3.390</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="8">
<Ratio>2.650</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="9">
<Ratio>2.050</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="10">
<Ratio>1.600</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="11">
<Ratio>1.280</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="12">
<Ratio>1.000</Ratio>
</Gear>
</Gears>
</Data>
</Transmission>
<TorqueConverter>
<Data xsi:type="TorqueConverterDataPIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>Torq-4546565455</CertificationNumber>
<Date>2018-01-12T12:00:00Z</Date>
<AppVersion>3.0.3</AppVersion>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
</TorqueConverter>
<Angledrive>
<Data xsi:type="AngledriveDataPIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>ANG-Z64665456654</CertificationNumber>
<Date>2019-01-12T12:00:00Z</Date>
<AppVersion>3.2.3</AppVersion>
<Ratio>20</Ratio>
</Data>
</Angledrive>
<Axlegear>
<Data xsi:type="AxlegearDataPIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>AX-6654888s5f4</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
</Data>
</Axlegear>
<AxleWheels>
<Data xsi:type="AxleWheelsDataPIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
<v2.0:TwinTyres>false</v2.0:TwinTyres>
<v2.0:Steered>true</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
<v2.0:TwinTyres>true</v2.0:TwinTyres>
<v2.0:Steered>false</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
<v2.0:TwinTyres>false</v2.0:TwinTyres>
<v2.0:Steered>false</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AuxiliaryDataPIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>smart</AlternatorTechnology>
<SmartAlternator>
<RatedCurrent>10</RatedCurrent>
<RatedVoltage>12</RatedVoltage>
<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
<BatteryNominalVoltage>12</BatteryNominalVoltage>
<BatteryRatedCapacity>50</BatteryRatedCapacity>
<CapacitorTechnology>10</CapacitorTechnology>
<CapacitorRatedCapacitance>30</CapacitorRatedCapacitance>
<CapacitorRatedVoltage>40</CapacitorRatedVoltage>
</SmartAlternator>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
<MaxAlternatorPower>15000</MaxAlternatorPower>
<ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>electrically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<SCRReagentDosing>true</SCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</Vehicle>
<InputDataSignature>
<di:Reference URI="#VEH-PrimaryBus_SmartPS">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
<Payload unit="kg">1294.51</Payload>
<PassengerCount>18.23</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
<Payload unit="kg">4236.57</Payload>
<PassengerCount>59.67</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
<Payload unit="kg">1254.68</Payload>
<PassengerCount>17.67</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
<Payload unit="kg">4106.21</Payload>
<PassengerCount>57.83</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
<Payload unit="kg">1277.49</Payload>
<PassengerCount>17.99</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
<Payload unit="kg">3193.72</Payload>
<PassengerCount>44.98</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
<Payload unit="kg">1738.08</Payload>
<PassengerCount>24.48</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
<Payload unit="kg">5793.60</Payload>
<PassengerCount>81.60</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
<Payload unit="kg">1853.95</Payload>
<PassengerCount>26.11</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
<Payload unit="kg">4634.88</Payload>
<PassengerCount>65.28</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>String</SimulationToolVersion>
<Date>2017-01-01T00:00:00Z</Date>
</ApplicationInformation>
</Data>
<Signature>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
</Signature>
</PrimaryVehicle>
</VectoOutputMultistage>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>8x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
</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"/>
<tcl:Entry gear="12" maxTorque="1900"/>
</TorqueLimits>
<Components xsi:type="VehicleComponentsPIFType">
<Engine>
<Data xsi:type="EngineDataPIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Bus 6x2</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
<Date>2017-02-15T11:00:00Z</Date>
<AppVersion>VectoEngine x.y</AppVersion>
<Displacement>12730</Displacement>
<RatedSpeed>1800</RatedSpeed>
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
<FullLoadAndDragCurve>
<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
</FullLoadAndDragCurve>
<Fuels>
<FuelType>Diesel CI</FuelType>
</Fuels>
</Mode>
</Data>
</Engine>
<Transmission>
<Data xsi:type="TransmissionDataPIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
<Gears xsi:type="TransmissionGearsPIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="2">
<Ratio>11.640</Ratio>
<MaxTorque>1900</MaxTorque>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="3">
<Ratio>9.020</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="4">
<Ratio>7.040</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="5">
<Ratio>5.640</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="6">
<Ratio>4.400</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="7">
<Ratio>3.390</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="8">
<Ratio>2.650</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="9">
<Ratio>2.050</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="10">
<Ratio>1.600</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="11">
<Ratio>1.280</Ratio>
<MaxSpeed>2000</MaxSpeed>
</Gear>
<Gear number="12">
<Ratio>1.000</Ratio>
</Gear>
</Gears>
</Data>
</Transmission>
<TorqueConverter>
<Data xsi:type="TorqueConverterDataPIFType">
<Manufacturer>Generic Torque Converter</Manufacturer>
<Model>Generic Torque Converter Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>Torq-4546565455</CertificationNumber>
<Date>2018-01-12T12:00:00Z</Date>
<AppVersion>3.0.3</AppVersion>
<Characteristics>
<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
</Characteristics>
</Data>
</TorqueConverter>
<Angledrive>
<Data xsi:type="AngledriveDataPIFType">
<Manufacturer>Generic Angledrive</Manufacturer>
<Model>Generic Angledrive Model</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>ANG-Z64665456654</CertificationNumber>
<Date>2019-01-12T12:00:00Z</Date>
<AppVersion>3.2.3</AppVersion>
<Ratio>20</Ratio>
</Data>
</Angledrive>
<Axlegear>
<Data xsi:type="AxlegearDataPIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
<CertificationNumber>AX-6654888s5f4</CertificationNumber>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<LineType>Single portal axle</LineType>
<Ratio>2.590</Ratio>
</Data>
</Axlegear>
<AxleWheels>
<Data xsi:type="AxleWheelsDataPIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
<v2.0:TwinTyres>false</v2.0:TwinTyres>
<v2.0:Steered>true</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
<v2.0:TwinTyres>true</v2.0:TwinTyres>
<v2.0:Steered>false</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
<v2.0:TwinTyres>false</v2.0:TwinTyres>
<v2.0:Steered>false</v2.0:Steered>
<v2.0:Tyre>
<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Wheel</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
<v2.0:FzISO>31300</v2.0:FzISO>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</v2.0:Tyre>
</Axle>
</Axles>
</Data>
</AxleWheels>
<Auxiliaries>
<Data xsi:type="AuxiliaryDataPIFType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
<SteeringPump>
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
<AlternatorTechnology>smart</AlternatorTechnology>
<SmartAlternator>
<RatedCurrent>10</RatedCurrent>
<RatedVoltage>12</RatedVoltage>
<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
<BatteryNominalVoltage>12</BatteryNominalVoltage>
<BatteryRatedCapacity>50</BatteryRatedCapacity>
<CapacitorTechnology>10</CapacitorTechnology>
<CapacitorRatedCapacitance>30</CapacitorRatedCapacitance>
<CapacitorRatedVoltage>40</CapacitorRatedVoltage>
</SmartAlternator>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
<MaxAlternatorPower>15000</MaxAlternatorPower>
<ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
<CompressorDrive>electrically</CompressorDrive>
<Clutch>none</Clutch>
<CompressorRatio>1.000</CompressorRatio>
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</Vehicle>
<InputDataSignature>
<di:Reference URI="#VEH-PrimaryBus_SmartPS">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
<Payload unit="kg">1352.52</Payload>
<PassengerCount>19.89</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
<Payload unit="kg">6762.60</Payload>
<PassengerCount>99.45</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
<Payload unit="kg">1294.51</Payload>
<PassengerCount>18.23</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">866.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
<Payload unit="kg">4236.57</Payload>
<PassengerCount>59.67</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">970.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
<Payload unit="kg">1578.29</Payload>
<PassengerCount>23.21</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
<Payload unit="kg">7891.43</Payload>
<PassengerCount>116.05</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
<Payload unit="kg">1254.68</Payload>
<PassengerCount>17.67</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">875.01</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
<Payload unit="kg">4106.21</Payload>
<PassengerCount>57.83</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
<Payload unit="kg">1277.49</Payload>
<PassengerCount>17.99</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
<Payload unit="kg">3193.72</Payload>
<PassengerCount>44.98</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
<Payload unit="kg">1738.08</Payload>
<PassengerCount>24.48</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">995.69</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
<Payload unit="kg">5793.60</Payload>
<PassengerCount>81.60</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
<Payload unit="kg">1853.95</Payload>
<PassengerCount>26.11</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
<Payload unit="kg">4634.88</Payload>
<PassengerCount>65.28</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
<CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>String</SimulationToolVersion>
<Date>2017-01-01T00:00:00Z</Date>
</ApplicationInformation>
</Data>
<Signature>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
</Signature>
</PrimaryVehicle>
</VectoOutputMultistage>
\ No newline at end of file
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 67986574295f05f465cd6943b58caf9d68f2e9a3..6824f8acd0cf299bf226c5ad50e5ee2e540b25db 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
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 61843e188f1d860114dd4da139628d1759c42178..92403a01db57e8ef18d08e365de439cbf7422bc8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -206,7 +206,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 0cd4c1586e661a1629e368883f9d4c05b0c7b00a..670ffa2900957743b4956bae6ab1f8ea07b72435 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 1d9d20501bd8f8ea149252e06c19d8bdd63ce334..277747f03176ab21422b7342bf5db5f336926ecf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -7,7 +7,7 @@ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6"
xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
<PrimaryVehicle>
<Data id="text" xsi:type="PrimaryVehicleDataType">
<Vehicle xsi:type="VehiclePIFType">
@@ -284,7 +284,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
index 823dfe2b31882809a7fcaaab7be5509df0dda699..2b6c8f979119c6687a0cb1d961df683138b885b9 100644
--- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
@@ -43,6 +43,7 @@ using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
+
namespace TUGraz.VectoCore.Tests.Utils
{
/// <summary>
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index 2e76958784900fd015b92d5ca8bb209789f2d68f..4146c848ab0cf0c2386ab18279548d1fd63a17aa 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.Tests.XML
var electricSupl = components.BusAuxiliaries.ElectricSupply;
Assert.IsNotNull(electricSupl.Alternators);
Assert.AreEqual(1, electricSupl.Alternators.Count);
- Assert.AreEqual("default", electricSupl.Alternators.First().Technology);
+ Assert.AreEqual(AlternatorType.Conventional, electricSupl.AlternatorTechnology);
//Assert.AreEqual(ConsumerTechnology.Pneumatically, components.BusAuxiliaries.PneumaticConsumers.DoorDriveTechnology);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index f9364d40d847f3c81893de8c236cf6eb80bbfabc..3664a684f9a39b5b6b62e93fade955e3e362ff51 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -357,11 +357,12 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(1, aux.SteeringPumpTechnology.Count);
Assert.AreEqual("Variable displacement elec. controlled", aux.SteeringPumpTechnology[0]);
- Assert.AreEqual(1, aux.ElectricSupply.Alternators.Count);
- Assert.AreEqual("conventional", aux.ElectricSupply.Alternators[0].Technology);
- Assert.AreEqual(true, aux.ElectricSupply.SmartElectrics);
- Assert.AreEqual(15000, aux.ElectricSupply.MaxAlternatorPower.Value());
- Assert.AreEqual(50.SI(Unit.SI.Watt.Hour).Cast<WattSecond>(), aux.ElectricSupply.ElectricStorageCapacity);
+ Assert.AreEqual(0, aux.ElectricSupply.Alternators.Count);
+ Assert.AreEqual(AlternatorType.Conventional, aux.ElectricSupply.AlternatorTechnology);
+ //Assert.AreEqual(true, aux.ElectricSupply.SmartElectrics);
+ //Assert.AreEqual(730, aux.ElectricSupply.Alternators.FirstOrDefault().RatedCurrent.Value());
+ //Assert.AreEqual(48, aux.ElectricSupply.Alternators.FirstOrDefault().RatedVoltage.Value());
+ //Assert.AreEqual(50.SI(Unit.SI.Watt.Hour).Cast<WattSecond>(), aux.ElectricSupply.ElectricStorage.FirstOrDefault().ElectricStorageCapacity);
Assert.AreEqual("Large Supply 2-stage", aux.PneumaticSupply.CompressorSize);//SizeOfAirSupply
Assert.AreEqual(CompressorDrive.electrically, aux.PneumaticSupply.CompressorDrive);
@@ -613,7 +614,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("", vehicleData.ManufacturerAddress);
Assert.AreEqual("VEH-2234567890", vehicleData.VIN);
Assert.AreEqual(DateTime.Parse("2021-02-13T07:20:08.0187663Z").ToUniversalTime(), vehicleData.Date);
- Assert.AreEqual(false, vehicleData.AirdragModifiedMultistage);
+ Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
Assert.AreEqual(true, vehicleData.ADAS.EngineStopStart);
@@ -703,7 +704,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(LegislativeClass.M3, vehicleData.LegislativeClass);
Assert.AreEqual(25000.SI<Kilogram>(), vehicleData.CurbMassChassis);
Assert.AreEqual(30000.SI<Kilogram>(), vehicleData.GrossVehicleMassRating);
- Assert.AreEqual(true, vehicleData.AirdragModifiedMultistage);
+ Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Liquefied, vehicleData.TankSystem);
Assert.AreEqual(RegistrationClass.B, vehicleData.RegisteredClass);
Assert.AreEqual(30, vehicleData.NumberOfPassengersLowerDeck);
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
index c4e2e44865db0e0ceb4da708f58a696a8d7da710..f1722f1a0540b054eab07f62120c0b7c4a74d9c5 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
@@ -305,8 +305,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("Variable displacement elec. controlled", auxiliaries.SteeringPumpTechnology[0]);
Assert.AreEqual(1, auxiliaries.ElectricSupply.Alternators.Count);
- Assert.AreEqual("default", auxiliaries.ElectricSupply.Alternators[0].Technology);
- Assert.AreEqual(false, auxiliaries.ElectricSupply.SmartElectrics);
+ //Assert.AreEqual("default", auxiliaries.ElectricSupply.Alternators[0].Technology);
+ Assert.AreEqual(AlternatorType.Smart, auxiliaries.ElectricSupply.AlternatorTechnology);
}
private void TestPneumaticSystem(IPneumaticSupplyDeclarationData supply,
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index d6fde08463d7b325301a5ee2029f8df5c740d39c..1fb3b2f6d2991834d3f217ab1d547ab51965bbdb 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -249,7 +249,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index e576b9c606316cfbe8d53a9e1fdf3fdc19b81621..8280da3de3b4f002e45489138af883e7966cdf0c 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -245,7 +245,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>