diff --git a/VECTO3GUI2020/Helper/Converter/XToBoolConverter.cs b/VECTO3GUI2020/Helper/Converter/XToBoolConverter.cs
index 0e53d526652abe4aff86a34bf81bc29e0484151e..696dfbadae63e62e2698cd406c53284181b21684 100644
--- a/VECTO3GUI2020/Helper/Converter/XToBoolConverter.cs
+++ b/VECTO3GUI2020/Helper/Converter/XToBoolConverter.cs
@@ -19,7 +19,8 @@ namespace VECTO3GUI2020.Helper.Converter
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ return value;
+
}
}
}
\ No newline at end of file
diff --git a/VECTO3GUI2020/Helper/IndexedStorage.cs b/VECTO3GUI2020/Helper/IndexedStorage.cs
index 65c5998a65667311d341fe6b1a06528edface780..fee593ec2cf4c5b5f33aabc8463d2ae868f18540 100644
--- a/VECTO3GUI2020/Helper/IndexedStorage.cs
+++ b/VECTO3GUI2020/Helper/IndexedStorage.cs
@@ -10,12 +10,13 @@ namespace VECTO3GUI2020.Helper
public class IndexedStorage<T> where T : IEquatable<T>
{
private Dictionary<string, T> indexedStorageDictionary = new Dictionary<string, T>();
- private readonly Action _onValueChanged;
+ private readonly Action<string> _valueChangedCallback;
- public IndexedStorage(Action onValueChanged = null)
+
+ public IndexedStorage(Action<string> valueChangedCallback = null)
{
- _onValueChanged = onValueChanged;
+ _valueChangedCallback = valueChangedCallback;
}
@@ -41,9 +42,9 @@ namespace VECTO3GUI2020.Helper
indexedStorageDictionary.Add(identifier, default(T));
}
indexedStorageDictionary[identifier] = value;
- if (value.Equals(oldValue))
+ if (!value.Equals(oldValue))
{
- _onValueChanged?.Invoke();
+ _valueChangedCallback?.Invoke(identifier);
}
}
}
diff --git a/VECTO3GUI2020/Resources/ViewModelBindings.xaml b/VECTO3GUI2020/Resources/ViewModelBindings.xaml
index 7675556d63ab8b5807f8118246a106ca560ee2be..8ab51b42b3298ef42586280491f1b96d77eb0b38 100644
--- a/VECTO3GUI2020/Resources/ViewModelBindings.xaml
+++ b/VECTO3GUI2020/Resources/ViewModelBindings.xaml
@@ -11,12 +11,13 @@
xmlns:multistageviews="clr-namespace:VECTO3GUI2020.Views.Multistage"
xmlns:componentimpl="clr-namespace:VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle.Components"
xmlns:componentviews="clr-namespace:VECTO3GUI2020.Views.JobEditViews.Vehicle.Components"
- xmlns:multistageimpl="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation">
+ xmlns:multistageimpl="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
+ xmlns:viewModel="clr-namespace:VECTO3GUI2020.ViewModel">
<DataTemplate x:Shared="False" DataType="{x:Type impl:JobListViewModel}">
<views:JobListView />
</DataTemplate>
- <DataTemplate x:Shared="False" DataType="{x:Type impl:MessageViewModel}">
- <views:MessageView />
+ <DataTemplate x:Shared="False" DataType="{x:Type viewModel:OutputViewModel}">
+ <views:OutputView />
</DataTemplate>
<DataTemplate x:Shared="False" DataType="{x:Type impl:MainWindowViewModel}">
@@ -27,6 +28,8 @@
<views:SettingsView/>
</DataTemplate>
+
+
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index 9d254753c89d11e0c3f77d45c9ac6b8f47b666ab..1d637e51d3e180c088f7134b26b6528c92d6d130 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -271,6 +271,7 @@ namespace VECTO3GUI2020.Util.XML.Implementation
aDASElement.Add(new XElement(adasNamespace + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, ecoRollWithEngineStop));
aDASElement.Add(new XElement(adasNamespace + XMLNames.Vehicle_ADAS_PCC,
_inputData.ADAS.PredictiveCruiseControl.ToXMLFormat()));
+ aDASElement.Add(new XElement(adasNamespace + XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, _inputData.ADAS?.ATEcoRollReleaseLockupClutch ));
}
_Xelement.DescendantsAndSelf().Where(e => e.Value.IsNullOrEmpty()).Remove();
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index c8fad6b01ab52c6a7fe4b539eb2ae1e43d6679d1..77bb4842dbfdf80cb6b0cf130b4de6478d49e462 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -185,6 +185,7 @@
<Compile Include="ViewModel\Implementation\Document\DeclarationJobViewModel.cs" />
<Compile Include="ViewModel\Implementation\Document\DeclarationTrailerJobDocumentViewModel.cs" />
<Compile Include="Model\Interfaces\IAuxiliaryModelFactory.cs" />
+ <Compile Include="ViewModel\Implementation\MessageEntry.cs" />
<Compile Include="ViewModel\Interfaces\Document\IDocumentViewModel.cs" />
<Compile Include="ViewModel\Interfaces\Document\IDocumentViewModelFactory.cs" />
<Compile Include="ViewModel\Interfaces\Document\IJobViewModel.cs" />
@@ -416,6 +417,9 @@
<Compile Include="Views\Multistage\VehicleView_v2_8.xaml.cs">
<DependentUpon>VehicleView_v2_8.xaml</DependentUpon>
</Compile>
+ <Compile Include="Views\OutputView.xaml.cs">
+ <DependentUpon>OutputView.xaml</DependentUpon>
+ </Compile>
<Compile Include="Views\SettingsView.xaml.cs">
<DependentUpon>SettingsView.xaml</DependentUpon>
</Compile>
@@ -640,6 +644,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Views\OutputView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Views\SettingsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
index 4f890e5988ea09aabca2bb5fc7d366ba82c7db69..a84917bc92057c93c020aee4a6f5e161ee655551 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
@@ -26,11 +26,19 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
get => _jobEditViewModel as IEditViewModel;
}
- #endregion
+ public bool Selected
+ {
+ get => _selected;
+ set => SetProperty(ref _selected, value);
+ }
+
+ #endregion
#region Members
public IXMLInputDataReader _xMLInputDataReader;
- #endregion
+ private bool _selected;
+
+ #endregion
public DeclarationJobViewModel(XmlDocumentType xmlDocumentType, string sourcefile, IXMLInputDataReader xMLInputDataReader,
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
index 2b6d2a9a89159f0e7858af118ebed7d02c76b23b..435206562afabef6c00c34e48c96a561974247fd 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
@@ -20,7 +20,13 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
public IJobEditViewModel EditViewModel { get => _jobEditViewModel; }
- IEditViewModel IDocumentViewModel.EditViewModel => throw new System.NotImplementedException();
+ public bool Selected
+ {
+ get => throw new System.NotImplementedException();
+ set => throw new System.NotImplementedException();
+ }
+
+ IEditViewModel IDocumentViewModel.EditViewModel => throw new System.NotImplementedException();
private IXMLInputDataReader _xMLInputDataReader;
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
index 0b1a04f02756a0e43c4435a7d81cfdd819874d36..02fa7b5a68fa649b879d4cd27e2ef14c0bc40ee7 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
@@ -1,18 +1,34 @@
using Microsoft.Win32;
using Ninject;
using System;
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
+using System.IO;
+using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
+using System.Windows.Data;
using System.Windows.Input;
+using System.Xml;
+using System.Xml.Linq;
using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.WindowsAPICodePack.Shell.Interop;
using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCore;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
+using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Utils;
using VECTO3GUI2020.Annotations;
using VECTO3GUI2020.Helper;
@@ -26,6 +42,7 @@ using VECTO3GUI2020.ViewModel.MultiStage.Interfaces;
using VECTO3GUI2020.Views;
using IDocumentViewModel = VECTO3GUI2020.ViewModel.Interfaces.Document.IDocumentViewModel;
using RelayCommand = VECTO3GUI2020.Util.RelayCommand;
+using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace VECTO3GUI2020.ViewModel.Implementation
{
@@ -51,7 +68,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
private BackgroundWorker fileReadingBackgroundWorker;
-
+ private object _jobsLock = new Object();
private ObservableCollection<IDocumentViewModel> _jobs = new ObservableCollection<IDocumentViewModel>();
public ObservableCollection<IDocumentViewModel> Jobs{ get => _jobs; set => SetProperty(ref _jobs, value);}
@@ -65,6 +82,10 @@ namespace VECTO3GUI2020.ViewModel.Implementation
private IAsyncRelayCommand _simulationCommand;
private readonly IOutputViewModel _outputViewModel;
+
+
+
+
#endregion
@@ -72,9 +93,10 @@ namespace VECTO3GUI2020.ViewModel.Implementation
public JobListViewModel()
{
-
+ BindingOperations.EnableCollectionSynchronization(Jobs, _jobsLock);
InitFileBackGroundWorker();
+
}
@@ -110,30 +132,245 @@ namespace VECTO3GUI2020.ViewModel.Implementation
Debug.WriteLine(e.ProgressPercentage);
}
- public void JobDataGrid_OnDrop(object sender, DragEventArgs e)
+ private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
+ private bool _simulationRunning = false;
+
+ public bool SimulationRunning
{
- throw new System.NotImplementedException();
+ get => _simulationRunning;
+ set
+ {
+ SetProperty(ref _simulationRunning, value);
+ OnPropertyChanged(nameof(SimulationCommand));
+ OnPropertyChanged(nameof(CancelSimulation));
+ }
}
+ private ICommand _cancelSimulationCommand;
+
+
+ private async Task RunSimulationExecute()
+ {
+ cancellationTokenSource = new CancellationTokenSource();
+ SimulationRunning = true;
+ await RunSimulationAsync(cancellationTokenSource.Token,
+ new Progress<MessageEntry>((message) => { _outputViewModel.Messages.Add(message); }),
+ new Progress<int>((i) => _outputViewModel.Progress = i));
+ SimulationRunning = false;
+ _outputViewModel.Progress = 0;
+ cancellationTokenSource.Dispose();
+ }
+
+ private async Task RunSimulationAsync(CancellationToken ct, IProgress<MessageEntry> outputMessages, IProgress<int> progress)
+ {
+ progress.Report(0);
+ for (int i = 0; i <= 100; i++) {
+ await Task.Delay(0);
+ progress.Report(i);
+ if (ct.IsCancellationRequested) {
+ return;
+ }
+ }
+ IDocumentViewModel[] jobs;
+ lock (_jobsLock) {
+ jobs = Jobs.Where(x => x.Selected).ToArray();
+ if (jobs.Length == 0) {
+ outputMessages.Report(new MessageEntry() {
+ Message = "No Jobs Selected",
+ Time = DateTime.Now,
+ Type = MessageType.InfoMessage,
+ });
+ }
+ }
+
+ //TODO add output path to settings
+ var outputPath = Settings.Default.DefaultFilePath;
+ var sumFileWriter = new FileOutputWriter(outputPath);
+
+
+
+ var sumContainer = new SummaryDataContainer(sumFileWriter);
+ var jobContainer = new JobContainer(sumContainer);
+
+
+
+ var mode = ExecutionMode.Declaration;
+
+ var fileWriters = new Dictionary<int, FileOutputWriter>();
+ var finishedRuns = new List<int>();
+
+ var xmlReader = _inputDataReader;
+
+
+
+
+ foreach (var jobEntry in jobs) {
+ try
+ {
+ var fullFileName = Path.GetFullPath(jobEntry.DataSource.SourceFile);
+ if (!File.Exists(fullFileName))
+ {
+ outputMessages.Report(new MessageEntry()
+ {
+ Type = MessageType.ErrorMessage,
+ Message =
+ $"File {Path.GetFileName(jobEntry.DataSource.SourceFile)} not found!"
+ });
+ continue;
+ }
+
+ outputMessages.Report(
+ new MessageEntry()
+ {
+ Type = MessageType.StatusMessage,
+ Message = $"Reading file {Path.GetFileName(fullFileName)}"
+ });
+
+
+
+ var extension = Path.GetExtension(jobEntry.DataSource.SourceFile);
+ IInputDataProvider input = null;
+ switch (extension)
+ {
+ case Constants.FileExtensions.VectoJobFile:
+ input = JSONInputDataFactory.ReadJsonJob(fullFileName);
+ var tmp = input as IDeclarationInputDataProvider;
+ mode = tmp?.JobInputData.SavedInDeclarationMode ?? false ? ExecutionMode.Declaration : ExecutionMode.Engineering;
+ break;
+ case ".xml":
+ var xdoc = XDocument.Load(fullFileName);
+ var rootNode = xdoc.Root?.Name.LocalName ?? "";
+ if (XMLNames.VectoInputEngineering.Equals(rootNode, StringComparison.InvariantCultureIgnoreCase))
+ {
+ input = xmlReader.CreateEngineering(fullFileName);
+ mode = ExecutionMode.Engineering;
+ }
+ else if (XMLNames.VectoInputDeclaration.Equals(rootNode, StringComparison.InvariantCultureIgnoreCase)
+ || XMLNames.VectoOutputMultistage.Equals(rootNode, StringComparison.InvariantCultureIgnoreCase))
+ {
+ using (var reader = XmlReader.Create(fullFileName))
+ {
+ input = xmlReader.CreateDeclaration(reader);
+ }
+ mode = ExecutionMode.Declaration;
+ }
+ break;
+ }
+
+ if (input == null)
+ {
+ outputMessages.Report(
+ new MessageEntry()
+ {
+ Type = MessageType.ErrorMessage,
+ Message = $"No input provider for job {Path.GetFileName(fullFileName)}"
+ });
+ continue;
+ }
+
+ var fileWriter = new FileOutputWriter(GetOutputDirectory(fullFileName));
+ var runsFactory = new SimulatorFactory(mode, input, fileWriter)
+ {
+ WriteModalResults = true,
+ ModalResults1Hz = true,
+ Validate = true,
+ ActualModalData = true,
+ SerializeVectoRunData = true
+
+ };
+ foreach (var runId in jobContainer.AddRuns(runsFactory))
+ {
+ fileWriters.Add(runId, fileWriter);
+ }
+
+ // TODO MQ-20200525: Remove the following loop in production (or after evaluation of LAC!!
+
+ /*
+ if (!string.IsNullOrWhiteSpace(LookAheadMinSpeedOverride))
+ {
+ foreach (var run in jobContainer.Runs)
+ {
+ var tmpDriver = ((VectoRun)run.Run).GetContainer().RunData.DriverData;
+ tmpDriver.LookAheadCoasting.Enabled = true;
+ tmpDriver.LookAheadCoasting.MinSpeed = LookAheadMinSpeedOverride.ToDouble().KMPHtoMeterPerSecond();
+ }
+ }
+ */
+
+ outputMessages.Report(
+ new MessageEntry()
+ {
+ Type = MessageType.StatusMessage,
+ Message = $"Finished reading data for job {Path.GetFileName(fullFileName)}"
+ });
+ }
+ catch (Exception ex)
+ {
+ /*
+ MessageBox.Show(
+ $"ERROR running job {Path.GetFileName(jobEntry.DataSource.SourceFile)}: {ex.Message}", "Error", MessageBoxButton.OK,
+ MessageBoxImage.Exclamation);
+ */
+ outputMessages.Report(
+ new MessageEntry()
+ {
+ Type = MessageType.ErrorMessage,
+ Message = ex.Message
+ });
+ }
+ }
- #region Commands
+ }
- public IAsyncRelayCommand SimulationCommand
+ private string GetOutputDirectory(string jobFilePath)
{
- get => _simulationCommand ?? new AsyncRelayCommand(RunSimulationAsync, () => true);
+ var outFile = jobFilePath;
+ var OutputDirectory = Settings.Default.DefaultFilePath;
+ if (!string.IsNullOrWhiteSpace(OutputDirectory))
+ {
+ if (Path.IsPathRooted(OutputDirectory))
+ {
+ outFile = Path.Combine(OutputDirectory, Path.GetFileName(jobFilePath) ?? "");
+ }
+ else
+ {
+ outFile = Path.Combine(Path.GetDirectoryName(jobFilePath) ?? "", OutputDirectory, Path.GetFileName(jobFilePath) ?? "");
+ }
+ if (!Directory.Exists(Path.GetDirectoryName(outFile)))
+ {
+ Directory.CreateDirectory(Path.GetDirectoryName(outFile));
+ }
+ }
+
+ return outFile;
}
- private Task RunSimulationAsync(CancellationToken arg)
+
+ #region Commands
+
+ public ICommand CancelSimulation
{
-
- _outputViewModel.Messages.Add("hi");
- return null;
+ get
+ {
+ return _cancelSimulationCommand ?? new RelayCommand(() => { cancellationTokenSource.Cancel(); },
+ () => SimulationRunning);
+ }
+ }
+
+ public IAsyncRelayCommand SimulationCommand
+ {
+ get
+ {
+ return _simulationCommand ?? new AsyncRelayCommand(RunSimulationExecute, () => !SimulationRunning);
+ }
}
+
+
public ICommand NewManufacturingStageFile
{
get
@@ -417,4 +654,25 @@ namespace VECTO3GUI2020.ViewModel.Implementation
#endregion
}
+
+
+ public class VectoSimulationProgress
+ {
+ public enum MsgType
+ {
+ StatusMessage,
+ InfoMessage,
+ Progress,
+ LogError,
+ LogWarning,
+
+ }
+
+ public string Message { get; set; }
+
+ public MsgType Type { get; set; }
+
+ public string Link { get; set; }
+ }
+
}
diff --git a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs
index db7164a67121333f147e8591063fd954526e339d..ddb2e680e424c12a871fd59f19b6ea9167b75478 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/MainWindowViewModel.cs
@@ -27,12 +27,13 @@ namespace VECTO3GUI2020.ViewModel.Implementation
#endregion
- public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel)
+ public MainWindowViewModel(IWindowHelper windowHelper, ISettingsViewModel settingsViewModel, IJobListViewModel jobListViewModel, IOutputViewModel outputViewModel)
{
_windowHelper = windowHelper;
_settingsViewModel = settingsViewModel;
_jobListVm = jobListViewModel;
- _bottomView = new TestViewModel();
+ _bottomView = outputViewModel;
+ //_bottomView = new TestViewModel();
}
public IMainViewModel CurrentViewModelTop
diff --git a/VECTO3GUI2020/ViewModel/Implementation/MessageEntry.cs b/VECTO3GUI2020/ViewModel/Implementation/MessageEntry.cs
new file mode 100644
index 0000000000000000000000000000000000000000..cb78c24f3d5bb74fdc641e058eb19d690329b7e3
--- /dev/null
+++ b/VECTO3GUI2020/ViewModel/Implementation/MessageEntry.cs
@@ -0,0 +1,47 @@
+using System;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+
+namespace VECTO3GUI2020.ViewModel.Implementation
+{
+
+ public enum MessageType
+ {
+ InfoMessage,
+ StatusMessage,
+ ErrorMessage,
+ WarningMessage,
+ }
+
+ public class MessageEntry : ObservableObject
+ {
+
+
+ private string _message;
+ private DateTime _time = DateTime.Today;
+ private string _source;
+ private MessageType _type;
+
+ public string Message
+ {
+ get { return _message; }
+ set { SetProperty(ref _message, value); }
+ }
+
+ public MessageType Type
+ {
+ get { return _type; }
+ set { SetProperty(ref _type, value); }
+ }
+
+ public DateTime Time
+ {
+ get { return _time; }
+ set { SetProperty(ref _time, value); }
+ }
+ public string Source
+ {
+ get { return _source; }
+ set { SetProperty(ref _source, value); }
+ }
+ }
+}
diff --git a/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs
index 2de6894cfeb8e15aca5776e9303f1a416074433d..88ea0207fc5b29c0c9cc417dd1abb3b4018677b2 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/OutputViewModel.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.ObjectModel;
using System.Windows.Data;
+using VECTO3GUI2020.ViewModel.Implementation;
using VECTO3GUI2020.ViewModel.Implementation.Common;
+using VECTO3GUI2020.ViewModel.Interfaces;
using VECTO3GUI2020.ViewModel.Interfaces.Common;
namespace VECTO3GUI2020.ViewModel
@@ -11,9 +13,10 @@ namespace VECTO3GUI2020.ViewModel
public class OutputViewModel : ViewModelBase, IOutputViewModel
{
private object _messageLock = new Object();
- private ObservableCollection<string> _messages = new ObservableCollection<string>();
+ private ObservableCollection<MessageEntry> _messages = new ObservableCollection<MessageEntry>();
+ private int _progress;
- public ObservableCollection<string> Messages
+ public ObservableCollection<MessageEntry> Messages
{
get
{
@@ -21,16 +24,26 @@ namespace VECTO3GUI2020.ViewModel
}
}
+ public int Progress
+ {
+ get => _progress;
+ set => SetProperty(ref _progress, value);
+ }
+
public OutputViewModel()
{
BindingOperations.EnableCollectionSynchronization(Messages, _messageLock );
}
+
+
}
- public interface IOutputViewModel
+ public interface IOutputViewModel : IMainViewModel
{
- ObservableCollection<string> Messages { get; }
+ ObservableCollection<MessageEntry> Messages { get; }
+
+ int Progress { get; set; }
}
}
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
index 274af232039353d30a366b7ee93f15e1d6511996..e345cf9e5f89547dccf870b55b93a00863248933 100644
--- a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
@@ -11,5 +11,6 @@ namespace VECTO3GUI2020.ViewModel.Interfaces.Document
DataSource DataSource { get; }
IEditViewModel EditViewModel { get; }
+ bool Selected { get; set; }
}
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 201f3a6e959daf1fa6f2a36a354707ca8267f54c..f139399557404b86ca8d9d4a89e1ff91c8812868 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -141,7 +141,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
.BusAuxiliaries);
AirdragModifiedMultistageEditingEnabled = false;
- _editingEnabledDictionary = new IndexedStorage<bool>(() => OnPropertyChanged(nameof(EditingEnabledDictionary)));
+ _editingEnabledDictionary = new IndexedStorage<bool>((identifier) => {
+
+ OnPropertyChanged(identifier);
+ OnPropertyChanged(nameof(EditingEnabledDictionary));
+
+ });
}
public IVehicleDeclarationInputData ConsolidatedVehicleData
@@ -178,6 +183,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
NumberOfPassengersLowerDeck = vehicleInputData.NumberOfPassengersLowerDeck;
VehicleCode = vehicleInputData.VehicleCode;
LowEntry = vehicleInputData.LowEntry;
+ MeasurementsGroupEditingEnabled =
+ vehicleInputData.Height != null ||
+ vehicleInputData.Width != null ||
+ vehicleInputData.Length != null ||
+ vehicleInputData.EntranceHeight != null;
Height = vehicleInputData.Height;
Width = vehicleInputData.Width;
Length = vehicleInputData.Length;
@@ -257,7 +267,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public bool MeasurementsGroupEditingEnabled
{
get { return _measurementsGroupEditingEnabled; }
- set { SetProperty(ref _measurementsGroupEditingEnabled, value); }
+ set
+ {
+ SetProperty(ref _measurementsGroupEditingEnabled, value);
+ OnPropertyChanged(nameof(HeightInMm));
+ OnPropertyChanged(nameof(WidthInMm));
+ OnPropertyChanged(nameof(EntranceHeightInMm));
+ OnPropertyChanged(nameof(LengthInMm));
+ }
}
public ConvertedSI HeightInMm
@@ -278,7 +295,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
SetProperty(ref _height, value);
- //OnPropertyChanged(nameof(HeightInMm));
+ OnPropertyChanged(nameof(HeightInMm));
}
}
@@ -301,7 +318,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
SetProperty(ref _length, value);
- //OnPropertyChanged(nameof(LengthInMm));
+ OnPropertyChanged(nameof(LengthInMm));
}
}
@@ -324,7 +341,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
SetProperty(ref _width, value);
- //OnPropertyChanged(nameof(WidthInMm));
+ OnPropertyChanged(nameof(WidthInMm));
}
}
@@ -351,7 +368,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
SetProperty(ref _entranceHeight, value);
- //OnPropertyChanged(nameof(EntranceHeightInMm));
+ OnPropertyChanged(nameof(EntranceHeightInMm));
}
}
@@ -584,6 +601,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
SetProperty(ref _adasEditingEnabled, value);
+ OnPropertyChanged(nameof(EngineStopStartNullable));
+ OnPropertyChanged(nameof(EcoRollTypeNullable));
+ OnPropertyChanged(nameof(PredictiveCruiseControlNullable));
+ OnPropertyChanged(nameof(ATEcoRollReleaseLockupClutch));
}
}
@@ -853,6 +874,20 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (AirdragModifiedMultistageEditingEnabled && (AirdragModifiedEnum == AIRDRAGMODIFIED.UNKNOWN)) {
result = "Air drag modified has to be set";
}
+ break;
+ case nameof(EcoRollTypeNullable):
+ case nameof(EngineStopStartNullable):
+ case nameof(PredictiveCruiseControlNullable):
+ case nameof(ATEcoRollReleaseLockupClutch):
+ if (AdasEditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null){
+ result = $"{propertyName} has to be set if editing is enabled}}";
+ }
+ break;
+ default:
+ if (EditingEnabledDictionary[propertyName] == true && this.GetType().GetProperty(propertyName).GetValue(this) == null) {
+ result = $"{propertyName} has to be set if editing is enabled}}";
+ }
+
break;
}
//https://www.youtube.com/watch?v=5KF0GGObuAQ
@@ -869,12 +904,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
}
- public string Error { get => String.Join(",", Errors.Values); }
+ public string Error
+ {
+ get => String.Join(",", Errors.Values);
+ }
public bool HasErrors
{
get
{
- return !Error.IsNullOrEmpty();
+ return !Error.IsNullOrEmpty() || MultistageAuxiliariesViewModel.HasErrors;
}
}
#endregion
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
index c9559da36e055430e911d31b1bfea4b9976394a2..51fe765ba99a5d65deb4cb5578f73e7730b2471a 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
@@ -70,9 +70,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public DigestData Signature => throw new NotImplementedException();
public void SetInputData(IVehicleDeclarationInputData vehicleInputData)
{
- _vehicleViewModel.SetVehicleInputData(vehicleInputData);
- _vehicleViewModel.MultistageAirdragViewModel.SetAirdragInputData(vehicleInputData?.Components?.AirdragInputData);
- _vehicleViewModel.MultistageAuxiliariesViewModel.SetAuxiliariesInputData(vehicleInputData?.Components?.BusAuxiliaries);
+ VehicleViewModel.SetVehicleInputData(vehicleInputData);
+ VehicleViewModel.MultistageAirdragViewModel.SetAirdragInputData(vehicleInputData?.Components?.AirdragInputData);
+ VehicleViewModel.MultistageAuxiliariesViewModel.SetAuxiliariesInputData(vehicleInputData?.Components?.BusAuxiliaries);
+ OnPropertyChanged(nameof(CurrentView));
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 528100375d1b144b4af751889c435aa63c12201b..178050c93e522a11f381f8cdb6447ab5bf6e7020 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Xml;
+using Castle.Core.Internal;
using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
@@ -24,10 +26,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
void SetAuxiliariesInputData(IBusAuxiliariesDeclarationData componentsAuxiliaryInputData);
bool HasValues { get; }
object PrimaryVehicleHybridElectric { get; set; }
+ bool HasErrors { get; }
+ Dictionary<string, string> Errors { get; }
}
- public class MultistageAuxiliariesViewModel : ViewModelBase, IMultistageAuxiliariesViewModel
+ public class MultistageAuxiliariesViewModel : ViewModelBase, IMultistageAuxiliariesViewModel, IDataErrorInfo
{
private IBusAuxiliariesDeclarationData _consolidatedInputData;
@@ -169,13 +173,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
SetProperty(ref _heatPumpGroupEditingEnabled, value);
- //if (value == false)
- //{
- // HeatPumpTypePassengerCompartment = null;
- // HeatPumpModePassengerCompartment = null;
- // HeatPumpModeDriverCompartment = null;
- // HeatPumpTypeDriverCompartment = null;
- //}
+ OnPropertyChanged(nameof(HeatPumpModeDriverCompartment));
+ OnPropertyChanged(nameof(HeatPumpTypeDriverCompartment));
+ OnPropertyChanged(nameof(HeatPumpTypePassengerCompartment));
+ OnPropertyChanged(nameof(HeatPumpModePassengerCompartment));
+ OnPropertyChanged(nameof(SystemConfiguration));
}
}
@@ -403,6 +405,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
PositionlightsLED = componentsAuxiliaryInputData.ElectricConsumers?.PositionlightsLED;
HeadlightsLED = componentsAuxiliaryInputData.ElectricConsumers?.HeadlightsLED;
BrakelightsLED = componentsAuxiliaryInputData.ElectricConsumers?.BrakelightsLED;
+
+ OnPropertyChanged(String.Empty);
}
private void ResetData()
@@ -427,14 +431,18 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
PositionlightsLED = null;
HeadlightsLED = null;
BrakelightsLED = null;
+
+ OnPropertyChanged(String.Empty);
}
public MultistageAuxiliariesViewModel(IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData)
{
ConsolidatedInputData = consolidatedAuxiliariesInputData;
- HeatPumpGroupEditingEnabled = true;
- _editingEnabledDictionary = new IndexedStorage<bool>(() => {
+ _editingEnabledDictionary = new IndexedStorage<bool>((identifier) => {
+
+
OnPropertyChanged(nameof(EditingEnabledDictionary));
+ OnPropertyChanged(nameof(identifier));
});
}
@@ -475,5 +483,60 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public ConsumerTechnology AdBlueDosing => throw new NotImplementedException();
#endregion
+
+ #region Implementation of IDataErrorInfo
+
+ public Dictionary<string, string> Errors { get; private set; } = new Dictionary<string, string>();
+
+ public string this[string propertyName]
+ {
+ get
+ {
+ string result = null;
+ switch (propertyName)
+ {
+ case nameof(HeatPumpTypeDriverCompartment):
+ case nameof(HeatPumpModeDriverCompartment):
+ case nameof(HeatPumpModePassengerCompartment):
+ case nameof(HeatPumpTypePassengerCompartment):
+ case nameof(SystemConfiguration):
+ if (HeatPumpGroupEditingEnabled == true &&
+ this.GetType().GetProperty(propertyName).GetValue(this) == null) {
+ result = $"{propertyName} has to be set if editing is enabled}}";
+ }
+ break;
+ default:
+ if (EditingEnabledDictionary[propertyName] == true && this.GetType().GetProperty(propertyName).GetValue(this) == null)
+ {
+ result = $"{propertyName} has to be set if editing is enabled}}";
+ }
+ break;
+ }
+ //https://www.youtube.com/watch?v=5KF0GGObuAQ
+
+ if (result == null)
+ {
+ if (Errors.ContainsKey(propertyName))
+ Errors.Remove(propertyName);
+ }
+ else
+ {
+ Errors[propertyName] = result;
+ }
+
+
+ return result;
+ }
+ }
+
+ public string Error { get => String.Join(",", Errors.Values); }
+ public bool HasErrors
+ {
+ get
+ {
+ return !Error.IsNullOrEmpty();
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
index 4e082ad46be88001cec9e98b8a20cd20c4c5bc52..eec000a3137613fc0b1544d7b8c6ee991eaf9067 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
@@ -1,4 +1,5 @@
using System;
+using System.CodeDom;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@@ -101,21 +102,36 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
get
{
return _saveVifCommand ?? new RelayCommand(() => {
+ if (_manufacturingStageViewModel.Vehicle is IMultistageVehicleViewModel vehicleViewModel)
+ {
+ if (vehicleViewModel.HasErrors)
+ {
+ _dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values)
+ + (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
+ "Error");
+ return;
+ }
+ } else {
+ throw new NotImplementedException();
+ }
+
+
var outputFile = _multistageDependencies.DialogHelperLazy.Value.SaveToXMLDialog(Settings.Default.DefaultFilePath);
if (outputFile == null) {
return;
}
- SaveVif(this, outputFile);
+ SaveVif(vifData:this, outputFile:outputFile, dialogHelper:_dialogHelper.Value);
}, () => true);
}
}
- public static void SaveVif(IMultistageVIFInputData vifData, FileOutputVIFWriter writer)
+ public static void SaveVif(IMultistageVIFInputData vifData, FileOutputVIFWriter writer, IDialogHelper dialogHelper = null)
{
- SaveVif(vifData, null, writer);
+ SaveVif(vifData, null, writer, dialogHelper);
}
-
- public static void SaveVif(IMultistageVIFInputData vifData, string outputFile, FileOutputVIFWriter writer = null)
+
+ public static void SaveVif(IMultistageVIFInputData vifData, string outputFile,
+ FileOutputVIFWriter writer = null, IDialogHelper dialogHelper = null)
{
if (writer == null) {
var numberOfManufacturingStages = vifData.MultistageJobInputData.JobInputData.ManufacturingStages?.Count ?? 0;
@@ -138,13 +154,21 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
jobContainer.WaitFinished();
using (var reader = XmlReader.Create(writer.XMLMultistageReportFileName)) {
- var validator = new XMLValidator(reader);
- var valid = validator.ValidateXML(XmlDocumentType.MultistageOutputData);
- if (!valid)
- Debug.WriteLine("Invalid Outputfile");
- Debug.WriteLine($"Written to {writer.XMLMultistageReportFileName}");
+ var validator = new XMLValidator(reader);
+ var valid = validator.ValidateXML(XmlDocumentType.MultistageOutputData);
+ if (!valid){
+ dialogHelper?.ShowMessageBox($"Error writing file {validator.ValidationError}", "Error",
+ MessageBoxButton.OK, MessageBoxImage.Error);
+ Debug.WriteLine("Invalid Outputfile");
+ return;
+ } else {
+ dialogHelper?.ShowMessageBox($"Written to {writer.XMLMultistageReportFileName}", "Info",
+ MessageBoxButton.OK, MessageBoxImage.Information);
+ Debug.WriteLine($"Written to {writer.XMLMultistageReportFileName}");
+ }
}
+
}
private ICommand _saveInputDataCommand;
@@ -165,7 +189,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if(_manufacturingStageViewModel.Vehicle is IMultistageVehicleViewModel vehicleViewModel)
{
if (vehicleViewModel.HasErrors) {
- _dialogHelper.Value.ShowMessageBox(string.Join("\n", vehicleViewModel.Errors.Values), "Error" );
+ _dialogHelper.Value.ShowMessageBox("Vehicle\n" + string.Join("\n", vehicleViewModel.Errors.Values)
+ + (vehicleViewModel.MultistageAuxiliariesViewModel.HasErrors ? ("\nAuxiliaries\n" + string.Join("\n", vehicleViewModel.MultistageAuxiliariesViewModel.Errors.Values)) : ""),
+ "Error");
return;
}
}
@@ -224,6 +250,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private readonly IMultistageDependencies _multistageDependencies;
private readonly DataSource _dataSource;
private readonly IMultistageBusInputDataProvider _inputData;
+ private bool _selected;
public ICommand LoadVehicleDataCommand
{
@@ -281,6 +308,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public IEditViewModel EditViewModel => this;
+ public bool Selected
+ {
+ get => _selected;
+ set => SetProperty(ref _selected, value);
+ }
+
#endregion
#region Implementation of IMultistageVIFInputData
diff --git a/VECTO3GUI2020/Views/JoblistView.xaml b/VECTO3GUI2020/Views/JoblistView.xaml
index e73d67579a6737dbd733e8e10f9d7c6462e25843..b714c17aea7e2cb3acc6bea2d88b3a4bfb0119f8 100644
--- a/VECTO3GUI2020/Views/JoblistView.xaml
+++ b/VECTO3GUI2020/Views/JoblistView.xaml
@@ -20,7 +20,11 @@
<Grid>
<StackPanel HorizontalAlignment="Stretch">
<Button x:Name="button" Margin="4" HorizontalAlignment="Stretch"
- Style="{StaticResource MultiStageButtonStyle1}" >Simulation</Button>
+ Style="{StaticResource MultiStageButtonStyle1}"
+ Command="{Binding SimulationCommand}">Simulation</Button>
+ <Button Margin="4" HorizontalAlignment="Stretch"
+ Style="{StaticResource MultiStageButtonStyle1}"
+ Command="{Binding CancelSimulation}">Stop</Button>
<Button x:Name="button1" Margin="4" HorizontalAlignment="Stretch"
Style="{StaticResource MultiStageButtonStyle1}"
Command="{Binding moveJobUp}"
@@ -38,7 +42,7 @@
BorderBrush ="{StaticResource AccentColorButton}" BorderThickness="1"
Name="JobDataGrid"
HorizontalAlignment="Stretch"
- IsReadOnly="True"
+
CanUserReorderColumns="False"
AutoGenerateColumns="False"
SelectionMode="Single"
@@ -56,8 +60,10 @@
AlternatingRowBackground="LightGray" CellStyle="{DynamicResource DataGridCellStyle1}"
>
<DataGrid.Columns>
- <DataGridTextColumn Header="Name" Binding="{Binding DocumentName}" Width="1*"></DataGridTextColumn>
- <DataGridTextColumn Header="Type" Binding="{Binding DocumentType}" Width="1*"></DataGridTextColumn>
+ <DataGridCheckBoxColumn IsReadOnly="False" Header="Simulate" Binding="{Binding Selected}" Width="1*"></DataGridCheckBoxColumn>
+ <DataGridTextColumn IsReadOnly="True" Header="Name" Binding="{Binding DocumentName}" Width="4*"></DataGridTextColumn>
+ <DataGridTextColumn IsReadOnly ="True" Header="Type" Binding="{Binding DocumentType}" Width="4*"></DataGridTextColumn>
+
</DataGrid.Columns>
<DataGrid.RowDetailsTemplate>
<DataTemplate>
diff --git a/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml b/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml
index 2e0428f1e9fef66402e3c032ea6da910cd7a61b0..cefd5441326ba274af6d6b3db9febf11749a0be0 100644
--- a/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml
+++ b/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml
@@ -96,13 +96,13 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
-
-<!--ItemsSource="{Binding ListItems, ElementName=MultistageParameterControl}"-->
+
+ <!--SelectedIndex="{Binding EditingEnabled, ElementName=MultistageParameterControl, Converter={StaticResource BoolToIntConverter}}"-->
+ <!--ItemsSource="{Binding ListItems, ElementName=MultistageParameterControl}"-->
<ComboBox x:Name="comboBoxCurrent" Grid.Column="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="2 0 2 0"
- SelectedIndex="{Binding EditingEnabled, ElementName=MultistageParameterControl, Converter={StaticResource BoolToIntConverter}}"
- SelectedItem="{Binding Content, Mode=TwoWay, ElementName=MultistageParameterControl, ValidatesOnExceptions=True, UpdateSourceTrigger=PropertyChanged}"
- IsEnabled="{Binding EditingEnabled, ElementName=MultistageParameterControl}"
- IsEditable="False" MouseDoubleClick="Control_OnMouseDoubleClick">
+ SelectedItem="{Binding Content, Mode=TwoWay, ElementName=MultistageParameterControl, ValidatesOnExceptions=True, UpdateSourceTrigger=PropertyChanged}"
+ IsEnabled="{Binding EditingEnabled, ElementName=MultistageParameterControl}"
+ IsEditable="False" MouseDoubleClick="Control_OnMouseDoubleClick">
<ComboBox.ItemsSource>
<PriorityBinding>
<Binding Path="ListItems" ElementName="MultistageParameterControl" Converter="{StaticResource NullToUnsetValue}" UpdateSourceTrigger="PropertyChanged"/>
@@ -146,15 +146,20 @@
Converter={StaticResource BooleanToVisibilityConverter}}"
IsChecked="{Binding EditingEnabled,
ElementName=MultistageParameterControl,
- Mode=TwoWay}"/>
+ Mode=TwoWay}"
+ />
<CheckBox x:Name="checkBox" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" IsTabStop="False" IsChecked="{Binding ElementName=MultistageParameterControl,
Path=PreviousContent,
- Converter={StaticResource XToBoolConverter}}" IsEnabled="False">
+ Converter={StaticResource XToBoolConverter}}" IsEnabled="False"
+ >
</CheckBox>
- <CheckBox x:Name="checkBox1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=MultistageParameterControl,
- Path=EditingEnabled, UpdateSourceTrigger=PropertyChanged}">
+ <CheckBox x:Name="checkBox1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center"
+ IsEnabled="{Binding ElementName=MultistageParameterControl,
+ Path=EditingEnabled, UpdateSourceTrigger=PropertyChanged}"
+ IsChecked="{Binding Content, ElementName=MultistageParameterControl, Mode=TwoWay, ValidatesOnExceptions=True, Converter={StaticResource XToBoolConverter},
+ UpdateSourceTrigger=PropertyChanged}">
</CheckBox>
<Label x:Name="label4" Grid.Column="4"
diff --git a/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml.cs b/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml.cs
index a4e411f9ac04a8b89d3c1a5c91525258f17de0b1..b73b9868210361aa3e18f276c167d13760a43a69 100644
--- a/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml.cs
+++ b/VECTO3GUI2020/Views/Multistage/CustomControls/MultiStageParameter.xaml.cs
@@ -10,6 +10,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms.VisualStyles;
@@ -23,6 +24,7 @@ using Microsoft.Build.Framework;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
using VECTO3GUI2020.Annotations;
+using VECTO3GUI2020.Helper.Converter;
using VECTO3GUI2020.Properties;
using VECTO3GUI2020.Views.CustomControls;
@@ -80,9 +82,30 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
}
public static readonly DependencyProperty ModeProperty = DependencyProperty.Register(
- "Mode", typeof(MultistageParameterViewMode), typeof(MultiStageParameter), new PropertyMetadata(MultistageParameterViewMode.TEXTBOX));
+ "Mode", typeof(MultistageParameterViewMode), typeof(MultiStageParameter),
+ new PropertyMetadata(MultistageParameterViewMode.TEXTBOX, propertyChangedCallback:ModeChanged));
- public MultistageParameterViewMode Mode
+ private static void ModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var param = (MultiStageParameter)d;
+ if(param.GetBindingExpression(e.Property)?.Status != BindingStatus.Active)
+ {
+ return;
+ }
+ param.OnModeChanged((MultistageParameterViewMode)e.NewValue);
+ }
+
+ public void OnModeChanged(MultistageParameterViewMode mode)
+ {
+ if (mode != MultistageParameterViewMode.CHECKBOX) {
+ checkBox1.SetValue(CheckBox.IsCheckedProperty, DependencyProperty.UnsetValue);
+ }
+
+
+
+ }
+
+ public MultistageParameterViewMode Mode
{
get { return (MultistageParameterViewMode)GetValue(ModeProperty); }
set { SetValue(ModeProperty, value); }
@@ -147,7 +170,8 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
}
set
{
- SetValue(EditingEnabledProperty, value);
+ SetCurrentValue(EditingEnabledProperty, value);
+ OnPropertyChanged(nameof(EditingEnabled));
}
}
@@ -195,8 +219,48 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
private static object ContentCoerced(DependencyObject d, object basevalue)
{
- ((MultiStageParameter)d).ContentChanged();
-
+ var multiStageParameter = ((MultiStageParameter)d);
+ var binding = multiStageParameter.GetBindingExpression(ContentProperty);
+
+
+
+ if (binding?.Status != BindingStatus.Active)
+ {
+ return basevalue;
+ }
+
+
+ if (multiStageParameter.resolvedContentProperty == true)
+ {
+ return basevalue;
+ }
+
+ if (multiStageParameter.DummyContent == null)
+ {
+ multiStageParameter.DummyContent = multiStageParameter.CreateDummyContent();
+ }
+
+ if (multiStageParameter.Content != null && multiStageParameter.EditingEnabled == false)
+ {
+ multiStageParameter.EditingEnabled = true;
+ }
+
+ if (multiStageParameter.Mode == MultistageParameterViewMode.COMBOBOX)
+ {
+ multiStageParameter.GenerateListItemsAndSetComboboxValue();
+ }
+
+
+ if (multiStageParameter.GeneratedLabelText == null)
+ {
+ multiStageParameter.SetLabelText();
+ }
+
+ multiStageParameter.resolvedContentProperty = true;
+
+
+
+
@@ -267,30 +331,16 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
{
var multiStageParameter = (CustomControls.MultiStageParameter)this;
var binding = multiStageParameter.GetBindingExpression(ContentProperty);
- if (binding?.Status != BindingStatus.Active || resolvedContentProperty) {
- return;
- }
-
- if (multiStageParameter.DummyContent == null) {
- multiStageParameter.DummyContent = multiStageParameter.CreateDummyContent();
+ if (binding?.Status != BindingStatus.Active) {
+ return;
}
- if (multiStageParameter.Content != null) {
+ if (multiStageParameter.Content != null && multiStageParameter.EditingEnabled == false)
+ {
multiStageParameter.EditingEnabled = true;
}
- if (multiStageParameter.Mode == MultistageParameterViewMode.COMBOBOX) {
- multiStageParameter.GenerateListItemsAndSetComboboxValue();
- }
-
-
- if (multiStageParameter.GeneratedLabelText == null) {
- multiStageParameter.SetLabelText();
- }
-
- resolvedContentProperty = true;
- EditingEnabledChanged(EditingEnabled);
}
@@ -402,6 +452,7 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
if (multistageParameter.Content != null) {
multistageParameter.Content = null;
}
+
}
else
{
@@ -416,8 +467,8 @@ namespace VECTO3GUI2020.Views.Multistage.CustomControls
if (multistageParameter.Mode == MultistageParameterViewMode.COMBOBOX)
{
//Set default value;
- multistageParameter.GetBindingExpression(ListItemsProperty)?.UpdateTarget();
- multistageParameter.GetBindingExpression(ContentProperty)?.UpdateTarget();
+ //multistageParameter.GetBindingExpression(ListItemsProperty)?.UpdateTarget();
+ //multistageParameter.GetBindingExpression(ContentProperty)?.UpdateTarget();
/*
diff --git a/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml b/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
index 7fb94114a081a2ded31c2bd9b298d5a0fdd6ff80..ba65f7d57ac1f7f26772815ce13313706f8872bf 100644
--- a/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
@@ -6,61 +6,70 @@
xmlns:local="clr-namespace:VECTO3GUI2020.Views.Multistage"
xmlns:customControls="clr-namespace:VECTO3GUI2020.Views.Multistage.CustomControls"
xmlns:impl="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
+ xmlns:properties="clr-namespace:VECTO3GUI2020.Properties"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" BorderBrush="{DynamicResource ButtonHighlightColor}" BorderThickness="2" Margin="4"
d:DataContext="{d:DesignInstance impl:MultistageAuxiliariesViewModel}">
+ <UserControl.Resources>
+ <Style TargetType="customControls:MultiStageParameter">
+ <Setter Property="NameLookUpResourceManager" Value="{x:Static properties:BusStrings.ResourceManager}"/>
+ <Setter Property="Validation.ErrorTemplate" Value="{StaticResource multistageParameterControlErrorTemplate}"/>
+ </Style>
+ </UserControl.Resources>
<Grid>
<ScrollViewer>
<DockPanel>
<StackPanel DockPanel.Dock="Top">
- <Label Background="{DynamicResource ButtonHighlightColor}" FontSize="15" HorizontalAlignment="Stretch">AUXILIARIES</Label>
+ <Label Style="{DynamicResource LabelStyle1}" FontSize="15" HorizontalAlignment="Stretch">AUXILIARIES</Label>
+ <Label Style="{DynamicResource LabelStyle1}">LED Lights</Label>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.ElectricConsumers.InteriorLightsLED}"
- Content="{Binding InteriorLightsLED}"
+ Content="{Binding InteriorLightsLED, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[InteriorLightsLED]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.ElectricConsumers.DayrunninglightsLED}"
- Content="{Binding DayrunninglightsLED}"
+ Content="{Binding DayrunninglightsLED,ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[DayrunninglightsLED]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.ElectricConsumers.PositionlightsLED}"
- Content="{Binding PositionlightsLED}"
- EditingEnabled="{Binding EditingEnabledDictionary[PositionLightsLED]}"/>
+ Content="{Binding PositionlightsLED,ValidatesOnDataErrors=True}"
+ EditingEnabled="{Binding EditingEnabledDictionary[PositionlightsLED]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.ElectricConsumers.BrakelightsLED}"
- Content="{Binding BrakelightsLED}"
- EditingEnabled="{Binding EditingEnabledDictionary[PositionLightsLED]}"/>
+ Content="{Binding BrakelightsLED,ValidatesOnDataErrors=True}"
+ EditingEnabled="{Binding EditingEnabledDictionary[BrakelightsLED]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.ElectricConsumers.HeadlightsLED}"
- Content="{Binding HeadlightsLED}"
- EditingEnabled="{Binding EditingEnabledDictionary[HeadLightsLED]}"/>
+ Content="{Binding HeadlightsLED,ValidatesOnDataErrors=True}"
+ EditingEnabled="{Binding EditingEnabledDictionary[HeadlightsLED]}"/>
- <Separator/>
+ <!--<Separator/>-->
+ <Label Style="{DynamicResource LabelStyle1}">Heating, Ventilation and Air Conditioning</Label>
<customControls:MultiStageParameter Mode="COMBOBOX"
EditingEnabled="{Binding HeatPumpGroupEditingEnabled, Mode=TwoWay}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.SystemConfiguration}"
- Content="{Binding HVACAux.SystemConfiguration}"/>
+ Content="{Binding SystemConfiguration, ValidatesOnDataErrors=True}"/>
<customControls:MultiStageParameter Mode="COMBOBOX"
EditingEnabled="{Binding HeatPumpGroupEditingEnabled, Mode=TwoWay}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.HeatPumpTypeDriverCompartment}"
- Content="{Binding HeatPumpTypeDriverCompartment}"
+ Content="{Binding HeatPumpTypeDriverCompartment, ValidatesOnDataErrors=True}"
ShowCheckBox="False"/>
<customControls:MultiStageParameter Mode="COMBOBOX"
EditingEnabled="{Binding HeatPumpGroupEditingEnabled, Mode=TwoWay}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.HeatPumpModeDriverCompartment}"
- Content="{Binding HeatPumpModeDriverCompartment}"
+ Content="{Binding HeatPumpModeDriverCompartment, ValidatesOnDataErrors=True}"
ListItems="{Binding HeatPumpModeDriverCompartmentAllowedValues}"
ShowCheckBox="False"/>
<customControls:MultiStageParameter Mode="COMBOBOX"
EditingEnabled="{Binding HeatPumpGroupEditingEnabled, Mode=TwoWay}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.HeatPumpTypePassengerCompartment}"
- Content="{Binding HeatPumpTypePassengerCompartment}"
+ Content="{Binding HeatPumpTypePassengerCompartment,ValidatesOnDataErrors=True}"
ShowCheckBox="False"/>
<customControls:MultiStageParameter Mode="COMBOBOX"
EditingEnabled="{Binding HeatPumpGroupEditingEnabled, Mode=TwoWay}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.HeatPumpModePassengerCompartment}"
- Content="{Binding HeatPumpModePassengerCompartment}"
+ Content="{Binding HeatPumpModePassengerCompartment,ValidatesOnDataErrors=True}"
ListItems="{Binding HeatPumpModePassengerCompartmentAllowedValues}"
ShowCheckBox="False"/>
<Separator/>
@@ -71,36 +80,36 @@
<customControls:MultiStageParameter Mode="TEXTBOX"
Validation.ErrorTemplate="{DynamicResource multistageParameterControlErrorTemplate}"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.AuxHeaterPower}"
- Content="{Binding AuxHeaterPower}"
+ Content="{Binding AuxHeaterPower,ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[AuxHeaterPower]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.DoubleGlazing}"
- Content="{Binding DoubleGlazing}"
+ Content="{Binding DoubleGlazing,ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[DoubleGlazing]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.AdjustableAuxiliaryHeater}"
EditingEnabled="{Binding EditingEnabledDictionary[AdjustableAuxiliaryHeater]}"
- Content="{Binding AdjustableAuxiliaryHeater}"/>
+ Content="{Binding AdjustableAuxiliaryHeater,ValidatesOnDataErrors=True}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.SeparateAirDistributionDucts}"
EditingEnabled="{Binding EditingEnabledDictionary[SeparateAirDistributionDucts]}"
- Content="{Binding SeparateAirDistributionDucts}"/>
+ Content="{Binding SeparateAirDistributionDucts,ValidatesOnDataErrors=True}"/>
<StackPanel Visibility="{Binding PrimaryVehicleHybridElectric, Converter={StaticResource BooleanToVisibilityConverter}}">
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.WaterElectricHeater}"
- Content="{Binding WaterElectricHeater}"
+ Content="{Binding WaterElectricHeater,ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[WaterElectricHeater]}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.AirElectricHeater}"
EditingEnabled="{Binding AirElectricHeater}"
- Content="{Binding AirElectricHeater}"/>
+ Content="{Binding AirElectricHeater,ValidatesOnDataErrors=True}"/>
<customControls:MultiStageParameter Mode="CHECKBOX"
PreviousContent="{Binding ConsolidatedInputData.HVACAux.OtherHeatingTechnology}"
EditingEnabled="{Binding OtherHeatingTechnology}"
- Content="{Binding OtherHeatingTechnology}"/>
+ Content="{Binding OtherHeatingTechnology,ValidatesOnDataErrors=True}"/>
</StackPanel>
<Separator/>
</StackPanel>
diff --git a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
index b685d0e93706bbd56ae3e742dac5ef652f26e7b7..6614ba66c2aaef540306fde172836b4e93e7fdc2 100644
--- a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
+++ b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
@@ -13,6 +13,7 @@
<UserControl.Resources>
<Style TargetType="custom:MultiStageParameter">
<Setter Property="NameLookUpResourceManager" Value="{x:Static properties:BusStrings.ResourceManager}"/>
+ <Setter Property="Validation.ErrorTemplate" Value="{StaticResource multistageParameterControlErrorTemplate}"/>
</Style>
</UserControl.Resources>
@@ -41,32 +42,28 @@
<custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.Model}"
- Content="{Binding Model}"
- Tag="{Binding RelativeSource={RelativeSource Self}, Path=Content}"
+ Content="{Binding Model, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[Model]}"/>
<custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.LegislativeClass}"
EditingEnabled="{Binding EditingEnabledDictionary[LegislativeClass]}"
- Content="{Binding LegislativeClass}"
+ Content="{Binding LegislativeClass, ValidatesOnDataErrors=True}"
Mode="COMBOBOX" />
<custom:MultiStageParameter
- Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
PreviousContent="{Binding ConsolidatedVehicleData.CurbMassChassis}"
EditingEnabled="{Binding EditingEnabledDictionary[CurbMassChassis]}"
- Content="{Binding CurbMassChassis}"/>
+ Content="{Binding CurbMassChassis, ValidatesOnDataErrors=True}"/>
<custom:MultiStageParameter
- Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
PreviousContent="{Binding ConsolidatedVehicleData.GrossVehicleMassRating}"
EditingEnabled="{Binding EditingEnabledDictionary[GrossVehicleMassRating]}"
- Content="{Binding GrossVehicleMassRating}"/>
+ Content="{Binding GrossVehicleMassRating, ValidatesOnDataErrors=True}"/>
<custom:MultiStageParameter
Label="Airdrag modified"
- Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
EditingEnabled="{Binding AirdragModifiedMultistageEditingEnabled}"
PreviousContent="{Binding ConsolidatedAirdragmodified}"
Content="{Binding AirdragModifiedEnum, ValidatesOnDataErrors=True}"
@@ -74,38 +71,38 @@
<custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.TankSystem}"
- Content="{Binding TankSystem}"
+ Content="{Binding TankSystem, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[TankSystem]}"
Mode="COMBOBOX">
</custom:MultiStageParameter>
- <custom:MultiStageParameter
+ <custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.RegisteredClass}"
- Content="{Binding RegisteredClass}"
+ Content="{Binding RegisteredClass, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[RegisteredClass]}"
Mode="COMBOBOX" />
<Separator/>
<custom:MultiStageParameter
EditingEnabled="{Binding NumberOfPassengersEditingEnabled}"
- PreviousContent="{Binding ConsolidatedVehicleData.NumberOfPassengersUpperDeck}"
+ PreviousContent="{Binding ConsolidatedVehicleData.NumberOfPassengersUpperDeck, ValidatesOnDataErrors=True}"
Content="{Binding NumberOfPassengersUpperDeck}"/>
<custom:MultiStageParameter
EditingEnabled="{Binding NumberOfPassengersEditingEnabled}"
- PreviousContent="{Binding ConsolidatedVehicleData.NumberOfPassengersLowerDeck}"
+ PreviousContent="{Binding ConsolidatedVehicleData.NumberOfPassengersLowerDeck, ValidatesOnDataErrors=True}"
Content="{Binding NumberOfPassengersLowerDeck}"
ShowCheckBox="False"/>
<Separator/>
<custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.VehicleCode}"
ListItems="{Binding VehicleCodeAllowedValues}"
- Content="{Binding VehicleCode}"
+ Content="{Binding VehicleCode, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[VehicleCode]}"
Mode="COMBOBOX"
/>
<custom:MultiStageParameter
PreviousContent="{Binding ConsolidatedVehicleData.LowEntry}"
- Content="{Binding LowEntry}"
+ Content="{Binding LowEntry, ValidatesOnDataErrors=True}"
EditingEnabled="{Binding EditingEnabledDictionary[LowEntry]}"
Mode="CHECKBOX"
/>
@@ -120,20 +117,20 @@
<custom:MultiStageParameter Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
EditingEnabled="{Binding MeasurementsGroupEditingEnabled}"
PreviousContent="{Binding ConsolidatedWidthInMm}"
- Content="{Binding WidthInMm}"
+ Content="{Binding WidthInMm, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
DummyContent="{Binding Source={StaticResource milimeterDummy}}"/>
<custom:MultiStageParameter Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
EditingEnabled="{Binding MeasurementsGroupEditingEnabled}"
PreviousContent="{Binding ConsolidatedLengthInMm}"
- Content="{Binding LengthInMm}"
+ Content="{Binding LengthInMm, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
DummyContent="{Binding Source={StaticResource milimeterDummy}}"/>
<custom:MultiStageParameter Validation.ErrorTemplate="{StaticResource multistageParameterControlErrorTemplate}"
EditingEnabled="{Binding MeasurementsGroupEditingEnabled}"
PreviousContent="{Binding ConsolidatedEntranceHeightInMm}"
- Content="{Binding EntranceHeightInMm}"
+ Content="{Binding EntranceHeightInMm, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
DummyContent="{Binding Source={StaticResource milimeterDummy}}"/>
@@ -144,37 +141,37 @@
x:Name="DoorDriveTechnology"
PreviousContent="{Binding ConsolidatedVehicleData.DoorDriveTechnology}"
EditingEnabled="{Binding EditingEnabledDictionary[DoorDriveTechnology]}"
- Content="{Binding DoorDriveTechnology}" Mode="COMBOBOX" />
+ Content="{Binding DoorDriveTechnology, ValidatesOnDataErrors=True}" Mode="COMBOBOX" />
<custom:MultiStageParameter
EditingEnabled="True"
ShowCheckBox="False"
PreviousContent="{Binding ConsolidatedVehicleData.VehicleDeclarationType}"
- Content="{Binding VehicleDeclarationType}" Mode="COMBOBOX" />
+ Content="{Binding VehicleDeclarationType, ValidatesOnDataErrors=True}" Mode="COMBOBOX" />
<Label Content="ADAS" Style="{DynamicResource LabelStyle1}"/>
<custom:MultiStageParameter
EditingEnabled="{Binding AdasEditingEnabled}"
PreviousContent="{Binding ConsolidatedVehicleData.ADAS.EngineStopStart}"
- Content="{Binding EngineStopStartNullable}"
+ Content="{Binding EngineStopStartNullable, ValidatesOnDataErrors=True}"
Mode="CHECKBOX"/>
<custom:MultiStageParameter
EditingEnabled="{Binding AdasEditingEnabled}"
PreviousContent="{Binding ConsolidatedVehicleData.ADAS.EcoRoll}"
- Content="{Binding EcoRollTypeNullable}"
+ Content="{Binding EcoRollTypeNullable, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
Mode="COMBOBOX"/>
<custom:MultiStageParameter
EditingEnabled="{Binding AdasEditingEnabled}"
PreviousContent="{Binding ConsolidatedVehicleData.ADAS.PredictiveCruiseControl}"
- Content="{Binding PredictiveCruiseControlNullable}"
+ Content="{Binding PredictiveCruiseControlNullable, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
Mode="COMBOBOX"/>
<custom:MultiStageParameter
EditingEnabled="{Binding AdasEditingEnabled}"
PreviousContent="{Binding ConsolidatedVehicleData.ADAS.ATEcoRollReleaseLockupClutch}"
- Content="{Binding ATEcoRollReleaseLockupClutch}"
+ Content="{Binding ATEcoRollReleaseLockupClutch, ValidatesOnDataErrors=True}"
ShowCheckBox="False"
Mode="CHECKBOX"/>
</StackPanel>
diff --git a/VECTO3GUI2020/Views/OutputView.xaml b/VECTO3GUI2020/Views/OutputView.xaml
new file mode 100644
index 0000000000000000000000000000000000000000..03784a8b05949d55c1fc1fe9811e1a66d349eb84
--- /dev/null
+++ b/VECTO3GUI2020/Views/OutputView.xaml
@@ -0,0 +1,62 @@
+<UserControl x:Class="VECTO3GUI2020.Views.OutputView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:local="clr-namespace:VECTO3GUI2020.Views"
+ xmlns:impl="clr-namespace:VECTO3GUI2020.ViewModel.Implementation"
+ mc:Ignorable="d"
+ d:DesignHeight="450" d:DesignWidth="800">
+ <Grid>
+ <DockPanel>
+ <ProgressBar DockPanel.Dock="Top" Minimum="0" Maximum="100" Value="{Binding Progress}"></ProgressBar>
+ <DataGrid DockPanel.Dock="Top" ItemsSource="{Binding Messages}" BorderThickness="1" CanUserAddRows="False" AutoGenerateColumns="False" SelectionUnit="FullRow"
+ IsReadOnly="True" HeadersVisibility="All" RowHeaderWidth="5" Name="MessageList">
+
+ <DataGrid.Columns>
+ <DataGridTextColumn Header="Message" Binding="{Binding Message}" Width="*" />
+ <DataGridTextColumn Header="Time" Binding="{Binding Time}" Width="130" />
+ </DataGrid.Columns>
+ <DataGrid.RowStyle>
+ <Style TargetType="DataGridRow">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.StatusMessage}">
+ <Setter Property="Background" Value="AliceBlue"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.InfoMessage}">
+ <Setter Property="Background" Value="LemonChiffon"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.ErrorMessage}">
+ <Setter Property="Background" Value="Red"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.WarningMessage}">
+ <Setter Property="Background" Value="Gold"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </DataGrid.RowStyle>
+ <DataGrid.CellStyle>
+ <Style TargetType="DataGridCell">
+ <Setter Property="FontFamily" Value="Courier New"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.StatusMessage}">
+ <Setter Property="Foreground" Value="Black"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.InfoMessage}">
+ <Setter Property="Foreground" Value="DimGray"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.ErrorMessage}">
+ <Setter Property="Foreground" Value="White"/>
+ <Setter Property="FontWeight" Value="Bold"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Type}" Value="{x:Static impl:MessageType.WarningMessage}">
+ <Setter Property="Foreground" Value="Black"/>
+ <Setter Property="FontWeight" Value="Bold"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </DataGrid.CellStyle>
+ </DataGrid>
+ </DockPanel>
+ </Grid>
+</UserControl>
diff --git a/VECTO3GUI2020/Views/OutputView.xaml.cs b/VECTO3GUI2020/Views/OutputView.xaml.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c9eab7dc568a76159f596d5818f783f5ba58ec51
--- /dev/null
+++ b/VECTO3GUI2020/Views/OutputView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace VECTO3GUI2020.Views
+{
+ /// <summary>
+ /// Interaction logic for OutputView.xaml
+ /// </summary>
+ public partial class OutputView : UserControl
+ {
+ public OutputView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/VectoCommon/VectoCommon/Models/RegistrationClass.cs b/VectoCommon/VectoCommon/Models/RegistrationClass.cs
index 4e283443ba8fbfb8c328a3415fcbcc512793a7c9..939ca52e9eef97ef9d3bc42c6cfadc1a77682b9d 100644
--- a/VectoCommon/VectoCommon/Models/RegistrationClass.cs
+++ b/VectoCommon/VectoCommon/Models/RegistrationClass.cs
@@ -3,18 +3,34 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.Models
{
public enum RegistrationClass
{
+
+ [GuiLabel("unknown")]
unknown,
+ [GuiLabel("I")]
I,
+
+ [GuiLabel("I & II")]
I_II,
+
+ [GuiLabel("II")]
II,
+
+ [GuiLabel("II & III")]
II_III,
+
+ [GuiLabel("III")]
III,
+
+ [GuiLabel("A")]
A,
+
+ [GuiLabel("B")]
B,
}
diff --git a/VectoCommon/VectoCommon/Models/VehicleCode.cs b/VectoCommon/VectoCommon/Models/VehicleCode.cs
index 8df981cb9e1266a2b0a2f0fdda9a88e993e0b8f6..8329d0407d2153949afddd5e4fa1ab1ae2d6f970 100644
--- a/VectoCommon/VectoCommon/Models/VehicleCode.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleCode.cs
@@ -1,20 +1,31 @@
using TUGraz.VectoCommon.BusAuxiliaries;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.Models {
public enum VehicleCode
{
+ [GuiLabel("not applicable")]
NOT_APPLICABLE,
+ [GuiLabel("CA")]
CA,
- CB,
+ [GuiLabel("CB")]
+ CB,
+ [GuiLabel("CC")]
CC,
+ [GuiLabel("CD")]
CD,
+ [GuiLabel("CE")]
CE,
+ [GuiLabel("CF")]
CF,
+ [GuiLabel("CG")]
CG,
+ [GuiLabel("CH")]
CH,
+ [GuiLabel("CI")]
CI,
+ [GuiLabel("CJ")]
CJ
-
}
public static class VehicleCodeHelper
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 2563f1fad92a9057b563c3f4e9f0c5eeecf7fd70..4360fca3bd65040cab9671a635d5dd21d2145446 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -51,7 +51,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public PEVAMTShiftStrategy(IVehicleContainer dataBus)
{
- MaxStartGear = GearList.Reverse().First();
var runData = dataBus.RunData;
if (runData.VehicleData == null) {
return;
@@ -59,6 +58,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
GearboxModelData = dataBus.RunData.GearboxData;
GearshiftParams = dataBus.RunData.GearshiftParameters;
GearList = GearboxModelData.GearList;
+ MaxStartGear = GearList.Reverse().First();
PowerMap = dataBus.RunData.ElectricMachinesData
.FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.EfficiencyMap;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
index f00d8a092505990d6c6952c3050898193f661904..56ff12176d4561f0facfaee38baf4a3d26b186e6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/VelocitySpeedGearshiftPreprocessor.cs
@@ -211,16 +211,23 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override PerSecond GetMotorTargetSpeed(VectoRunData runData)
{
- return 0.5 * runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.FullLoadCurve
- .MaxSpeed;
+ var em = runData.ElectricMachinesData
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ if (em == null) {
+ throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
+ }
+ return 0.5 * em.Item2.FullLoadCurve
+ .MaxSpeed / em.Item2.RatioADC;
}
protected override PerSecond GetMaxMotorspeed(VectoRunData runData)
{
- return runData.ElectricMachinesData
- .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2)?.Item2.FullLoadCurve
- .MaxSpeed;
+ var em = runData.ElectricMachinesData
+ .FirstOrDefault(x => x.Item1 == PowertrainPosition.BatteryElectricE2);
+ if (em == null) {
+ throw new VectoException("E2 EM required for PEV E2 GearshiftPreprocessing");
+ }
+ return em.Item2.FullLoadCurve.MaxSpeed / em.Item2.RatioADC;
}
}
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 76c40c06b22ca87517885f8c7450ef9fa7c0fb1c..87b044d7fecc42820ee263367be0b9c315b6538f 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -201,10 +201,15 @@
<xs:element name="Capacitor" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="CapacitorTechnology" type="xs:string">
+ <xs:element name="CapacitorTechnology">
<xs:annotation>
<xs:documentation>P300 - [-]</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="with DCDC converter"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
<xs:element name="RatedCapacitance" type="xs:integer">
<xs:annotation>
@@ -225,22 +230,6 @@
<xs:documentation>P303 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:sequence minOccurs="0">
- <xs:element name="MaxAlternatorPower">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="ElectricStorageCapacity">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
</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 c6e16750bf98bdc8a43265ec28d441aa044bf62c..e321102350a1968d758597ed7a698d1e4a149a78 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -120,96 +120,94 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
- <xs:element name="SmartAlternator" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="RatedCurrent" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P295 - [A]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedVoltage">
- <xs:annotation>
- <xs:documentation>P296 - [V]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:enumeration value="12"/>
- <xs:enumeration value="24"/>
- <xs:enumeration value="48"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="BatteryTechnology">
- <xs:annotation>
- <xs:documentation>P296 - enum</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="lead-acid battery – conventional"/>
- <xs:enumeration value="lead-acid battery – AGM"/>
- <xs:enumeration value="lead-acid battery – gel"/>
- <xs:enumeration value="li-ion battery - high power"/>
- <xs:enumeration value="li-ion battery - high energy"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="BatteryNominalVoltage">
- <xs:annotation>
- <xs:documentation>P298 - [V]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:enumeration value="12"/>
- <xs:enumeration value="24"/>
- <xs:enumeration value="48"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="BatteryRatedCapacity" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P299 - [Ah]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CapacitorTechnology" type="xs:string">
- <xs:annotation>
- <xs:documentation>P300 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CapacitorRatedCapacitance" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P301 - [F]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CapacitorRatedVoltage" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P302 - [V]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:sequence minOccurs="0">
+ <xs:element name="SmartAlternator">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="RatedCurrent" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P295 - [A]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedVoltage">
+ <xs:annotation>
+ <xs:documentation>P296 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Battery" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="BatteryTechnology">
+ <xs:annotation>
+ <xs:documentation>P296 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="lead-acid battery – conventional"/>
+ <xs:enumeration value="lead-acid battery – AGM"/>
+ <xs:enumeration value="lead-acid battery – gel"/>
+ <xs:enumeration value="li-ion battery - high power"/>
+ <xs:enumeration value="li-ion battery - high energy"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedCapacity" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P299 - [Ah]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="NominalVoltage">
+ <xs:annotation>
+ <xs:documentation>P298 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Capacitor" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CapacitorTechnology" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>P300 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedCapacitance" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P301 - [F]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedVoltage" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P302 - [V]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
<xs:element name="SupplyFromHEVPossible" type="xs:boolean">
<xs:annotation>
<xs:documentation>P303 - bool</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:sequence minOccurs="0">
- <xs:element name="MaxAlternatorPower">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="ElectricStorageCapacity">
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/123.VIF_Report_5.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/123.VIF_Report_5.xml
index a73cb24e4ace7203954022ec67ebe52d6ed7a3f2..f71765c7101534f550f29c6348bfe943e5a75390 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/123.VIF_Report_5.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/123.VIF_Report_5.xml
@@ -1,5 +1,5 @@
<?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">
+<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">
@@ -9,7 +9,7 @@
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
- <VehicleCategory>Bus</VehicleCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>8x2</AxleConfiguration>
<Articulated>true</Articulated>
<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
@@ -263,8 +263,8 @@
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
- <SmartElectrics>true</SmartElectrics>
+ <AlternatorTechnology>conventional</AlternatorTechnology>
+ <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
<MaxAlternatorPower>15000</MaxAlternatorPower>
<ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
@@ -276,7 +276,7 @@
<SmartCompressionSystem>true</SmartCompressionSystem>
<SmartRegenerationSystem>false</SmartRegenerationSystem>
<AirsuspensionControl>electronically</AirsuspensionControl>
- <SCRReagentDosing>true</SCRReagentDosing>
+ <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
</PneumaticSystem>
<HVAC>
<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -660,6 +660,30 @@
<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:AirDrag>
+ <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E1000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2018-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y.z</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.36</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX24h">
+ <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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </v2.8:AirDrag>
+ </v2.8:Components>
</Vehicle>
<ApplicationInformation>
<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -695,6 +719,7 @@
<v2.8:VIN>VEH-2234567890</v2.8:VIN>
<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>
+ <v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>
<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
@@ -763,6 +788,7 @@
<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>
<v2.8:ClassBus>B</v2.8:ClassBus>
<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
@@ -809,7 +835,7 @@
</Signature>
</ManufacturingStage>
<ManufacturingStage stageCount="5">
- <Data xsi:type="BusManufacturingStageDataType" id="MST-076becd8299f4cd6b7ed">
+ <Data xsi:type="BusManufacturingStageDataType" id="MST-4da6983187dd418892e2">
<HashPreviousStage>
<di:Reference URI="#RESULT-8f30c7fe665a47938f7b">
<di:Transforms>
@@ -820,26 +846,55 @@
<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</HashPreviousStage>
- <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-d76d03c792dc4a258381">
- <v2.8:Manufacturer>Manufq</v2.8:Manufacturer>
- <v2.8:ManufacturerAddress>asdflköj</v2.8:ManufacturerAddress>
- <v2.8:VIN>sadsadf</v2.8:VIN>
- <v2.8:Date>2021-05-16T22:00:00Z</v2.8:Date>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-6835a68771164787a4e1">
+ <v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Infinite Loop</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-1234567891</v2.8:VIN>
+ <v2.8:Date>2021-05-19T22:00:00Z</v2.8:Date>
+ <v2.8:Model>Sample Bus Model 2</v2.8:Model>
+ <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
+ <v2.8:CorrectedActualMass>7000</v2.8:CorrectedActualMass>
+ <v2.8:TechnicalPermissibleMaximumLadenMass>10000</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
+ <v2.8:ClassBus>A</v2.8:ClassBus>
+ <v2.8:NumberPassengersLowerDeck>10</v2.8:NumberPassengersLowerDeck>
+ <v2.8:NumberPassengersUpperDeck>20</v2.8:NumberPassengersUpperDeck>
+ <v2.8:BodyworkCode>CC</v2.8:BodyworkCode>
+ <v2.8:LowEntry>true</v2.8:LowEntry>
+ <v2.8:HeightIntegratedBody>2500</v2.8:HeightIntegratedBody>
+ <v2.8:DoorDriveTechnology>unknown</v2.8:DoorDriveTechnology>
<v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <v2.3:EngineStopStart>false</v2.3:EngineStopStart>
+ <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
+ <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
+ <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:AirDrag>
+ <v2.0:Data xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.8:AirDragModifiedUseStandardValueType" id="AD-4e740f2451ba4e99b0d2" />
+ <v2.0:Signature>
+ <di:Reference>
+ <di:DigestMethod Algorithm="null" />
+ <di:DigestValue>NOT AVAILABLE</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </v2.8:AirDrag>
+ </v2.8:Components>
</Vehicle>
<ApplicationInformation>
- <SimulationToolVersion>0.7.3.2171-DEV</SimulationToolVersion>
- <Date>2021-05-17T07:22:26.5083903Z</Date>
+ <SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
+ <Date>2021-05-20T07:27:20.0220853Z</Date>
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#MST-076becd8299f4cd6b7ed">
+ <di:Reference URI="#MST-4da6983187dd418892e2">
<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>OuOo05XjBzDuVaiSHqbLWrQbHy5xdFaDCzNQnCLymYE=</di:DigestValue>
+ <di:DigestValue>XB7ZK6AYseDU3sMIqJFxUmDwJHkvcvsPRDwMGjKY6eA=</di:DigestValue>
</di:Reference>
</Signature>
</ManufacturingStage>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
index 9e20d2cd2d4e3791611918ac7b389c79169f1984..b6069da5a5049db6e1487e69ca57609b1e78efc3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>A</ClassBus>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>A</ClassBus>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 760dc95f4322428fb6ec82cbdab6d6269e20fcdd..33194bccad2511a878f79d682f1605f4bd1f7dff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>false</LowEntry>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 6404f3d41e9b2c384697e1762cc46bf9a919d79a..a580db7446d77a5ac44a28e6284b220ebfc0e9f9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 89d0e3a818a2bde6ebfc8e6eb48203b84edd29ca..c50959a82842f6e9e89e2aaf10e7288f5ac989db 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
index 47166faa269e2e2d2fd313e9bce63a0dd4b14fa7..bdba3c8d058526554b2389f6e8ae86b54ea47a28 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
@@ -5,7 +5,7 @@ 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:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+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>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index b3026591ed53048a8944edba0570ffc82d1e7085..39c10eb8662376c5f7480fbb5e9d09c46e70eee2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
<Manufacturer>Some Manufacturer 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>5000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>A</ClassBus>
<BodyworkCode>CG</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>10000</VehicleLength>
<VehicleWidth>2600</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
<WaterElectricHeater>true</WaterElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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: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 1</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>5000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>A</ClassBus>
<BodyworkCode>CG</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>10000</VehicleLength>
<VehicleWidth>2600</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
<WaterElectricHeater>true</WaterElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index cad329802b1ffae72c19223bc767d985b729eb48..49093e77c8f55585c0f0182d00a831f27acff660 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<AirDrag>
<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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: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 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<AirDrag>
<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
<v2.0:Model>Generic Model</v2.0:Model>
<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
</v2.0:Data>
<v2.0:Signature>
<di:Reference URI="#CabinX23h">
<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</v2.0:Signature>
</AirDrag>
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
index ec1d438284847d84a0bf12aa02ec27c59667390f..748413a19a57bb637e4d58bb0efce563385932bf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
<Manufacturer>Some Manufacturer 4</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
<VIN>VEH-1234567894</VIN>
<Date>2022-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<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>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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: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 4</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
<VIN>VEH-1234567894</VIN>
<Date>2022-01-09T11:00:00Z</Date>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<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>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
</LEDLights>
</ElectricSystem>
<HVAC>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
index a86a6460eeb1f924f7612fcd8fd89f49505b6e8c..1cff68c80913319b26652b815e25c1eee43d42eb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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.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:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>final</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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.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-1234567890" xsi:type="InterimStageInputType" >
<Manufacturer>Some Manufacturer 3</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<VehicleDeclarationType>final</VehicleDeclarationType>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
index 79df6b5f74ea9180fde89bd78042b0e17691e9b3..d1e5b1621b2b0ae9ffff017987dd8513b6d57bfd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<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:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle xsi:type="InterimStageInputType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<NgTankSystem>Liquefied</NgTankSystem>
<ClassBus>B</ClassBus>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<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</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>true</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<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: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 xsi:type="InterimStageInputType" id="MSTG-3-Vehicle">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
<VIN>VEH-2234567866</VIN>
<Date>2021-02-13T07:20:08.0187663Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
<NgTankSystem>Liquefied</NgTankSystem>
<ClassBus>B</ClassBus>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS>
<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</v2.3:PredictiveCruiseControl>
<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="CompletedVehicleComponentsDeclarationType">
<Auxiliaries>
<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
<ElectricSystem>
<LEDLights>
<Positionlights>false</Positionlights>
<Brakelights>false</Brakelights>
<Headlights>true</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>true</OtherHeatingTechnology>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
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 18f35e7a477dcb28441ff35d5042049ec435ffe4..d9b86d094aeeb11cfab0a47cdf8227562101b416 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 d545658cf8bf874cad37f5d93067f8a64f5aab89..b5a218ea1bb05b7f9cf73b479bc8abb0bee9e034 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
@@ -274,8 +274,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 361b9948987401786b0ac5721c8e31f7015eef28..7793910a73b51dd92a520946a77d82bb7e3a0a74 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 e3b3dabf98a8496f7ddb83c82524568d20af9473..b250b5f8c5e80585f31c9058ecc7c9ae4fbd6fc9 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 129c8154a1a3b14971dbef400a69a74562e6ed15..be8c21b0c208e4b2a4432d990d3de3f89f232491 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 9c5437d5798030b9c2381ecf975e43a13e2448fc..18fb3b9e618d6aeb6e339f358bee9882a5372299 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 c22deb2185a35a96ca63ab3a41b24f52d39bed61..fb2e80fe11d5fc899f937767d1e5af4f0225a403 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 3869a5acb8b39eebf8960a16a90df0b27c40577e..0dc6cccc440ca3f5a4378f4fa54a07ed7435e951 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 36fdc33ca1e7ae9b1a455d0e8b2ebd1b04c3770a..e7c8c66e624966c33f067f9cefec6ee4143526fc 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 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
+<?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>
</SmartAlternator>
<Battery>
<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
<RatedCapacity>50</RatedCapacity>
<NominalVoltage>12</NominalVoltage>
</Battery>
<Capacitor>
<CapacitorTechnology></CapacitorTechnology>
<RatedCapacitance>30</RatedCapacitance>
<RatedVoltage>3</RatedVoltage>
</Capacitor>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</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_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 92403a01db57e8ef18d08e365de439cbf7422bc8..f0f066339b43de5d3a864f4febd9f54cda2edc02 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
@@ -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">
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
<LegislativeCategory>M3</LegislativeCategory>
- <VehicleCategory>Bus</VehicleCategory>
+ <ChassisConfiguration>Bus</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
@@ -193,10 +193,19 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
</SteeringPump>
<ElectricSystem>
- <AlternatorTechnology>default</AlternatorTechnology>
- <SmartElectrics>true</SmartElectrics>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
+ <AlternatorTechnology>smart</AlternatorTechnology>
+ <SmartAlternator>
+ <RatedCurrent>310</RatedCurrent>
+ <RatedVoltage>48</RatedVoltage>
+ </SmartAlternator>
+ <Battery>
+ <BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+ <RatedCapacity>1</RatedCapacity>
+ <NominalVoltage>48</NominalVoltage>
+ </Battery>
+<!-- <MaxAlternatorPower>15000</MaxAlternatorPower>
<ElectricStorageCapacity>50</ElectricStorageCapacity>
+--> <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 670ffa2900957743b4956bae6ab1f8ea07b72435..1c1f2902e14cba92110223b6f8516024dd0fbd32 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
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 277747f03176ab21422b7342bf5db5f336926ecf..42bfe04f38b711a00cba4f9ad37a77005e22a25b 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
@@ -273,8 +273,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<ElectricSystem>
<AlternatorTechnology>conventional</AlternatorTechnology>
<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
- <MaxAlternatorPower>15000</MaxAlternatorPower>
- <ElectricStorageCapacity>50</ElectricStorageCapacity>
</ElectricSystem>
<PneumaticSystem>
<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/finaltest.VIF_Report_5.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/finaltest.VIF_Report_5.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7964c02d2a04815df80ec97e7e7496c448df0619
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/finaltest.VIF_Report_5.xml
@@ -0,0 +1,915 @@
+<?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.1</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.1</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>conventional</AlternatorTechnology>
+ <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>
+ <ManufacturingStage stageCount="2">
+ <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
+ <HashPreviousStage>
+ <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>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-1234567890</v2.8:VIN>
+ <v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
+ <v2.8:Model>Intermediate Model 1</v2.8:Model>
+ <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
+ <v2.8:NumberPassengersLowerDeck>10</v2.8:NumberPassengersLowerDeck>
+ <v2.8:NumberPassengersUpperDeck>30</v2.8:NumberPassengersUpperDeck>
+ <v2.8:LowEntry>true</v2.8:LowEntry>
+ <v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
+ <v2.8:VehicleLength>12000</v2.8:VehicleLength>
+ <v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
+ <v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-01-12T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
+ <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>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="3">
+ <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
+ <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>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-2234567890</v2.8:VIN>
+ <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
+ <v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>
+ <v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
+ <v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <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</v2.3:PredictiveCruiseControl>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Interiorlights>true</v2.8:Interiorlights>
+ <v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
+ <v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
+ <v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
+ <v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
+ <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
+ <v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
+ <v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
+ <v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
+ <v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-02-13T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
+ <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>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="4">
+ <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
+ <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>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-2234567866</v2.8:VIN>
+ <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
+ <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
+ <v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>
+ <v2.8:ClassBus>B</v2.8:ClassBus>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <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</v2.3:PredictiveCruiseControl>
+ <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Positionlights>false</v2.8:Positionlights>
+ <v2.8:Brakelights>false</v2.8:Brakelights>
+ <v2.8:Headlights>true</v2.8:Headlights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
+ <v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
+ <v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-03-13T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f7b">
+ <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>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="5">
+ <Data xsi:type="BusManufacturingStageDataType" id="MST-a4df212f14dc48259e7a">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f7b">
+ <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>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-216b27744bb04bc2a18f">
+ <v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Some Manufacturer Address</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-1234567890</v2.8:VIN>
+ <v2.8:Date>2021-05-19T22:00:00Z</v2.8:Date>
+ <v2.8:Model>Generic Model</v2.8:Model>
+ <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
+ <v2.8:CorrectedActualMass>500</v2.8:CorrectedActualMass>
+ <v2.8:TechnicalPermissibleMaximumLadenMass>3500</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:NumberPassengersLowerDeck>0</v2.8:NumberPassengersLowerDeck>
+ <v2.8:NumberPassengersUpperDeck>10</v2.8:NumberPassengersUpperDeck>
+ <v2.8:HeightIntegratedBody>2500</v2.8:HeightIntegratedBody>
+ <v2.8:VehicleLength>9500</v2.8:VehicleLength>
+ <v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
+ <v2.8:EntranceHeight>2000</v2.8:EntranceHeight>
+ <v2.8:DoorDriveTechnology>electric</v2.8:DoorDriveTechnology>
+ <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <v2.3:EngineStopStart>true</v2.3:EngineStopStart>
+ <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
+ <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
+ <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
+ <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <di:Reference URI="#CabinX23h" 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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </v2.8:AirDrag>
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Interiorlights>false</v2.8:Interiorlights>
+ <v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
+ <v2.8:Positionlights>true</v2.8:Positionlights>
+ <v2.8:Brakelights>true</v2.8:Brakelights>
+ <v2.8:Headlights>false</v2.8:Headlights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:SystemConfiguration>0</v2.8:SystemConfiguration>
+ <v2.8:HeatPumpTypeDriverCompartment>none</v2.8:HeatPumpTypeDriverCompartment>
+ <v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
+ <v2.8:HeatPumpTypePassengerCompartment>non R-744 2-stage</v2.8:HeatPumpTypePassengerCompartment>
+ <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
+ <v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
+ <v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
+ <v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
+ <v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
+ <v2.8:WaterElectricHeater>true</v2.8:WaterElectricHeater>
+ <v2.8:AirElectricHeater>true</v2.8:AirElectricHeater>
+ <v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
+ <Date>2021-05-20T10:18:20.7716606Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#MST-a4df212f14dc48259e7a">
+ <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>gvpLDc7FEX4vxVKyEybIYvKCRFx8PJ33eUfuT9Bl4EM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+</VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c65198500a8218a2ff42d0c63f361941033086a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 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="TODO_ADDIDENTIFIER" xsi:type="InterimStageInputType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2021-05-19T22:00:00Z</Date>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>500</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+ <AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+ <NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
+ <NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ <VehicleLength>9500</VehicleLength>
+ <VehicleWidth>2500</VehicleWidth>
+ <EntranceHeight>2000</EntranceHeight>
+ <DoorDriveTechnology>electric</DoorDriveTechnology>
+ <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <ADAS>
+ <v2.3:EngineStopStart>true</v2.3:EngineStopStart>
+ <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
+ <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
+ <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
+ </ADAS>
+ <Components xsi:type="CompletedVehicleComponentsDeclarationType">
+ <AirDrag>
+ <v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature>
+ <di:Reference URI="#CabinX23h">
+ <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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <ElectricSystem>
+ <LEDLights>
+ <Interiorlights>false</Interiorlights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Headlights>false</Headlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>0</SystemConfiguration>
+ <HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
+ <HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
+ <HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+ <HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+ <AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+ <DoubleGlazing>false</DoubleGlazing>
+ <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+ <WaterElectricHeater>true</WaterElectricHeater>
+ <AirElectricHeater>true</AirElectricHeater>
+ <OtherHeatingTechnology>true</OtherHeatingTechnology>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/testcompleted.VIF_Report_5.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/testcompleted.VIF_Report_5.xml
new file mode 100644
index 0000000000000000000000000000000000000000..50668838128df92225248e5821b306a38dfdb234
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/testcompleted.VIF_Report_5.xml
@@ -0,0 +1,917 @@
+<?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.1</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.1</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>conventional</AlternatorTechnology>
+ <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>
+ <ManufacturingStage stageCount="2">
+ <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
+ <HashPreviousStage>
+ <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>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-1234567890</v2.8:VIN>
+ <v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
+ <v2.8:Model>Intermediate Model 1</v2.8:Model>
+ <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
+ <v2.8:NumberPassengersLowerDeck>10</v2.8:NumberPassengersLowerDeck>
+ <v2.8:NumberPassengersUpperDeck>30</v2.8:NumberPassengersUpperDeck>
+ <v2.8:LowEntry>true</v2.8:LowEntry>
+ <v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
+ <v2.8:VehicleLength>12000</v2.8:VehicleLength>
+ <v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
+ <v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-01-12T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
+ <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>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="3">
+ <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
+ <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>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-2234567890</v2.8:VIN>
+ <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
+ <v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>
+ <v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
+ <v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <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</v2.3:PredictiveCruiseControl>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Interiorlights>true</v2.8:Interiorlights>
+ <v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
+ <v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
+ <v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
+ <v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
+ <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
+ <v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
+ <v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
+ <v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
+ <v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-02-13T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
+ <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>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="4">
+ <Data xsi:type="BusManufacturingStageDataType" id="MST-3">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
+ <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>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
+ <v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-2234567866</v2.8:VIN>
+ <v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
+ <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
+ <v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>
+ <v2.8:ClassBus>B</v2.8:ClassBus>
+ <v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <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</v2.3:PredictiveCruiseControl>
+ <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Positionlights>false</v2.8:Positionlights>
+ <v2.8:Brakelights>false</v2.8:Brakelights>
+ <v2.8:Headlights>true</v2.8:Headlights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
+ <v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
+ <v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2021-03-13T07:20:08.0187663Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f7b">
+ <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>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+ <ManufacturingStage stageCount="5">
+ <Data xsi:type="BusManufacturingStageDataType" id="MST-84eab2145359424cac96">
+ <HashPreviousStage>
+ <di:Reference URI="#RESULT-8f30c7fe665a47938f7b">
+ <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>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
+ </di:Reference>
+ </HashPreviousStage>
+ <Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-1aea65a0eeac49b3ae31">
+ <v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
+ <v2.8:ManufacturerAddress>Some Manufacturer Address</v2.8:ManufacturerAddress>
+ <v2.8:VIN>VEH-1234567890</v2.8:VIN>
+ <v2.8:Date>2021-05-19T22:00:00Z</v2.8:Date>
+ <v2.8:Model>Sample Bus Model</v2.8:Model>
+ <v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
+ <v2.8:CorrectedActualMass>500</v2.8:CorrectedActualMass>
+ <v2.8:TechnicalPermissibleMaximumLadenMass>3500</v2.8:TechnicalPermissibleMaximumLadenMass>
+ <v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
+ <v2.8:ClassBus>II+III</v2.8:ClassBus>
+ <v2.8:NumberPassengersLowerDeck>0</v2.8:NumberPassengersLowerDeck>
+ <v2.8:NumberPassengersUpperDeck>10</v2.8:NumberPassengersUpperDeck>
+ <v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
+ <v2.8:LowEntry>false</v2.8:LowEntry>
+ <v2.8:HeightIntegratedBody>2500</v2.8:HeightIntegratedBody>
+ <v2.8:VehicleLength>9500</v2.8:VehicleLength>
+ <v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
+ <v2.8:EntranceHeight>2000</v2.8:EntranceHeight>
+ <v2.8:DoorDriveTechnology>electric</v2.8:DoorDriveTechnology>
+ <v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
+ <v2.8:ADAS>
+ <v2.3:EngineStopStart>true</v2.3:EngineStopStart>
+ <v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
+ <v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
+ <v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
+ <v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
+ </v2.8:ADAS>
+ <v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
+ <v2.8:AirDrag>
+ <v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+ <v2.0:Model>Generic Model</v2.0:Model>
+ <v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+ <v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+ <v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+ <v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+ <v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+ <v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+ </v2.0:Data>
+ <v2.0:Signature xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <di:Reference URI="#CabinX23h" 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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </v2.0:Signature>
+ </v2.8:AirDrag>
+ <v2.8:Auxiliaries>
+ <v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
+ <v2.8:ElectricSystem>
+ <v2.8:LEDLights>
+ <v2.8:Interiorlights>false</v2.8:Interiorlights>
+ <v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
+ <v2.8:Positionlights>true</v2.8:Positionlights>
+ <v2.8:Brakelights>true</v2.8:Brakelights>
+ <v2.8:Headlights>false</v2.8:Headlights>
+ </v2.8:LEDLights>
+ </v2.8:ElectricSystem>
+ <v2.8:HVAC>
+ <v2.8:SystemConfiguration>0</v2.8:SystemConfiguration>
+ <v2.8:HeatPumpTypeDriverCompartment>none</v2.8:HeatPumpTypeDriverCompartment>
+ <v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
+ <v2.8:HeatPumpTypePassengerCompartment>non R-744 2-stage</v2.8:HeatPumpTypePassengerCompartment>
+ <v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
+ <v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
+ <v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
+ <v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
+ <v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
+ <v2.8:WaterElectricHeater>true</v2.8:WaterElectricHeater>
+ </v2.8:HVAC>
+ </v2.8:Data>
+ </v2.8:Auxiliaries>
+ </v2.8:Components>
+ </Vehicle>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.7.3.2247-DEV</SimulationToolVersion>
+ <Date>2021-05-20T10:21:50.9468128Z</Date>
+ </ApplicationInformation>
+ </Data>
+ <Signature>
+ <di:Reference URI="#MST-84eab2145359424cac96">
+ <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>nzi/gaDHz6UkMgGJqbKjjN1p6lUiLf959S6CRFGcNss=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </ManufacturingStage>
+</VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 198f2bad9dcf6df9a5848b57752179792771c797..c880ccd45edd9e308e95801abd3720943154b445 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -19,6 +19,7 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-completed_heavyBus-sample.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorryFWD-sample.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml" HomeFolder="Yes"/>
+ <File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBusSmartES-sample.xml" HomeFolder="Yes"/>
</Folder>
<Folder FolderName="Examples 1.0">
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_axlegear-sample_ref.xml" HomeFolder="Yes"/>