diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
index 48bd32742be321ad1dd4e3785f264c168c1a91e3..c88deda649d1852ed85e5b649e02b3bdc59c5087 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
@@ -93,26 +93,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
auxNode, vehicle) { }
}
- // =============================
-
- public class XMLAuxiliaryDeclarationDataProviderV23 : XMLAuxiliaryDeclarationDataProviderV10
- {
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
-
- public new const string XSD_TYPE = "AuxiliariesComponentDeclarationType";
-
- public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
- public XMLAuxiliaryDeclarationDataProviderV23(XmlNode auxNode, IXMLDeclarationVehicleData vehicle) : base(
- auxNode, vehicle)
- { }
- }
-
+
// =============================
public class XMLAuxiliaryDeclarationDataProviderV210_Lorry : XMLAuxiliaryDeclarationDataProviderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "AUX_Component_Conventional_Lorry_Type";
public const string XSD_HEV_P_TYPE = "AUX_Component_HEV-P_Lorry_Type";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
index b566c12172cd063a6ec6ca66a811befedccad8b3..efc1c9e5a2b8a8e9792e059ddea7543738093665 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationADASDataProvider.cs
@@ -100,57 +100,23 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
- public class XMLDeclarationADASDataProviderV23 : XMLDeclarationADASDataProviderV21
- {
- /*
- * new field added in version 2.3
- */
-
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
-
- public new const string XSD_TYPE = "AdvancedDriverAssistantSystemsType";
-
- public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
- public XMLDeclarationADASDataProviderV23(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
- : base(vehicle, componentNode, sourceFile) { }
-
- #region Overrides of XMLDeclarationADASDataProviderV10
-
- public override bool? ATEcoRollReleaseLockupClutch
- {
- get {
- var node = GetNode(XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, required:false);
- var busNode = GetNode(XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, required: false);
- if (node == null && busNode == null) {
- return null;
- }
-
- var innerText = node == null ? busNode.InnerText : node.InnerText;
- return XmlConvert.ToBoolean(innerText);
- }
- }
-
- #endregion
-
- protected override XNamespace SchemaNamespace => NAMESPACE_URI;
- }
-
- // ---------------------------------------------------------------------------------------
-
public class XMLDeclarationADASDataProviderV210 : XMLDeclarationADASDataProviderV21
{
/*
* new field added in version 2.3
*/
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "ADAS_Conventional_Type";
- public const string XSD_IEPC_TYPE = "ADAS_IEPC_Type";
+ public const string XSD_TYPE_HEV = "ADAS_HEV_Type";
+ public const string XSD_TYPE_PEV = "ADAS_PEV_Type";
+ public const string XSD_TYPE_IEPC = "ADAS_IEPC_Type";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
- public static readonly string QUALIFIED_XSD_IEPC_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_IEPC_TYPE);
+ public static readonly string QUALIFIED_XSD_HEV_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE_HEV);
+ public static readonly string QUALIFIED_XSD_PEV_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE_PEV);
+ public static readonly string QUALIFIED_XSD_IEPC_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE_IEPC);
public XMLDeclarationADASDataProviderV210(IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile)
: base(vehicle, componentNode, sourceFile) { }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
index a9ace9b83d9c092ef20bb32f4461a2572e0fe61e..96114eabf633b694cf8cd02a7fef0a47bec810f8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAirdragDataProvider.cs
@@ -108,7 +108,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationAirdragDataProviderV210 : XMLDeclarationAirdragDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "AirDragModifiedUseStandardValueType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
index e20c4e8645eb878cf26a7339aa651e111cd5998b..2ec10d5e5391e17090c2d0bc5f156e19e8b2c746 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
@@ -106,28 +106,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
vehicle, componentNode, sourceFile) { }
}
- // ---------------------------------------------------------------------------------------
-
- public class XMLDeclarationAuxiliariesDataProviderV23 : XMLDeclarationAuxiliariesDataProviderV10
- {
- public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
-
- public new const string XSD_TYPE = "AuxiliariesDataDeclarationType";
-
- public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
- public XMLDeclarationAuxiliariesDataProviderV23(
- IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
- vehicle, componentNode, sourceFile)
- { }
- }
-
+
// ---------------------------------------------------------------------------------------
public class XMLDeclarationAuxiliariesDataProviderV210_Lorry: XMLDeclarationAuxiliariesDataProviderV20
{
- public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "AUX_Conventional_LorryDataType";
public const string XSD_HEV_P_TYPE = "AUX_HEV-P_LorryDataType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index 7c818b1bc497a68b354471ebcee092ea95117346..1f64449ec819b49ddab54d6e9c11df2ddc9f8f0b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
IElectricSupplyDeclarationData, IPneumaticConsumersDeclarationData,
IPneumaticSupplyDeclarationData, IHVACBusAuxiliariesDeclarationData
{
- public static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "AUX_Conventional_PrimaryBusType";
public const string XSD_HEV_P_TYPE = "AUX_HEV-P_PrimaryBusType";
@@ -243,7 +243,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationCompletedBusAuxiliariesDataProviderV210 : XMLDeclarationPrimaryBusAuxiliariesDataProviderV210, IElectricConsumersDeclarationData
{
- public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE_CONVENTIONAL = "AUX_Conventional_CompletedBusType";
public const string XSD_TYPE_xEV = "AUX_xEV_CompletedBusType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index e99ce9a2df040ac96edcc0fa0ebcebce66b2e9bd..e8bd25765b08bdc817e68d0e6e75c6ac5fcef951 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -141,7 +141,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationComponentsDataProviderV210_Lorry : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_Conventional_LorryType";
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10, IXMLVehicleComponentsDeclaration
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_Conventional_PrimaryBusType";
@@ -249,7 +249,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationCompletedBusComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10,
IXMLVehicleComponentsDeclaration
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE_CONVENTIONAL = "Components_Conventional_CompletedBusType";
public const string XSD_TYPE_xEV = "Components_xEV_CompletedBusType";
@@ -323,7 +323,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHEVPxLorryComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-Px_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -349,7 +349,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHEVS2LorryComponentsDataProviderV210 : XMLDeclarationHEVPxLorryComponentsDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S2_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -367,7 +367,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHEVSXLorryComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_HEV_S3_TYPE = "Components_HEV-S3_LorryType";
public const string XSD_HEV_S4_TYPE = "Components_HEV-S4_LorryType";
@@ -394,7 +394,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusHEVPxComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-Px_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -426,7 +426,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusHEVS2ComponentDataProviderV210 : XMLDeclarationPrimaryBusHEVPxComponentsDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S2_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLDeclarationPrimaryBusHEVS2ComponentDataProviderV210(IXMLDeclarationVehicleData vehicle,
@@ -437,7 +437,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusHEVSxComponentDataProviderV210 : XMLDeclarationPrimaryBusHEVS2ComponentDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_HEV_S3_TYPE = "Components_HEV-S3_PrimaryBusType";
public const string XSD_HEV_S4_TYPE = "Components_HEV-S4_PrimaryBusType";
public static readonly string QUALIFIED_HEV_S3_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_HEV_S3_TYPE);
@@ -451,7 +451,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHeavyLorryHEVIEPCSComponentDataV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-IEPC-S_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -476,7 +476,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusHEVIEPCSComponentDataV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-IEPC-S_PrimaryBus";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -505,7 +505,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHeavyLorryPEVE2ComponentDataV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E2_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -531,7 +531,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationHeavyLorryPEVExComponentDataV210 : XMLDeclarationHeavyLorryPEVE2ComponentDataV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E3_LorryType";
public const string XSD_PEV_E4_TYPE = "Components_PEV-E4_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -544,7 +544,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusPEVE2ComponentDataV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E2_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -575,7 +575,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPrimaryBusPEVExComponentDataV210 : XMLDeclarationPrimaryBusPEVE2ComponentDataV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E3_PrimaryBusType";
public const string XSD_PEV_E4_TYPE = "Components_PEV-E4_PrimaryBusType";
@@ -590,7 +590,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationIEPCHeavyLorryComponentDataV210 : XMLDeclarationComponentsDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_IEPC_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -615,7 +615,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationIEPCPrimaryBusComponentDataV210 : XMLDeclarationPrimaryBusComponentsDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_IEPC_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
index d533a51f31e98dcae6bd2bdb603084fdb30cb4f0..dc82ee409b97258e438862f3770c5f3a06b3748f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationGearboxDataProviderV2101 : XMLDeclarationGearboxDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public new const string XSD_TYPE = "GearboxDataDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
index a45e3eab2e6909452ffbcb67f08824e41b98994a..065edf1337bcbf98e2ae56fe96bb4418095f5914 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPTODataProvider.cs
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationPTODataProviderV210 : XMLDeclarationPTODataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "PTOType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
index f02cc722c86efd6e4c66493cdaf04b6197b3188d..7b2dfa10639d032fbf52ba1bf731bff6b92c2252 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationTyreDataProvider.cs
@@ -116,7 +116,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLDeclarationTyreDataProviderV23 : XMLDeclarationTyreDataProviderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
//public new const string XSD_TYPE = "TyreComponentDeclarationType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
index 6514386a43bdad87a2b98cbece607c5a0a7fe2cb..bf65fa1d07885f4f348c02620b56d877eded4972 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMachinesDeclarationInputDataProvider.cs
@@ -12,7 +12,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
public class XMLElectricMachinesDeclarationInputDataProvider : AbstractCommonComponentType, IXMLElectricMachinesDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "ElectricMachineType";
public const string XSD_GEN_TYPE = "ElectricMachineGENType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLADCDeclarationInputDataV2101 : AbstractCommonComponentType, IXMLADCDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public const string XSD_TYPE = "ADCDataDeclarationType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
index 52ce5f690021ff82a91a663cd43a94f17198297b..c868699191711035fbff8cc27eaefc9c9e199e16 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
@@ -160,7 +160,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricMotorDeclarationInputDataProviderV2101 : XMLCommonElectricMotorDeclarationInputData,
IXMLElectricMotorDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public const string XSD_TYPE = "ElectricMachineSystemMeasuredDataDeclarationType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -204,7 +204,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricMotorSystemStandardDeclarationInputDataProviderV2101 :
XMLElectricMotorDeclarationInputDataProviderV2101
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public new const string XSD_TYPE = "ElectricMachineSystemStandardValuesDataDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLElectricMotorSystemStandardDeclarationInputDataProviderV2101(XmlNode componentNode, string sourceFile)
@@ -222,7 +222,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricMotorIHPCDeclarationInputDataProviderV2101 : XMLElectricMotorDeclarationInputDataProviderV2101
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public new const string XSD_TYPE = "ElectricMachineSystemIHPCMeasuredDataDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -234,7 +234,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricMotorIEPCIInputDataProviderV2101 : XMLCommonElectricMotorDeclarationInputData, IXMLIEPCInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public const string XSD_TYPE = "IEPCMeasuredDataDeclarationType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -447,7 +447,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricMotorIEPCIStandardInputDataProviderV2101 : XMLElectricMotorIEPCIInputDataProviderV2101
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public new const string XSD_TYPE = "IEPCStandardValuesDataDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
index 30109777186a2dc5a2af2f4790f0d087a528b1e5..745d4549541d54165c5fa1edbb724bf901432023 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLElectricStorageSystemDeclarationInputData : AbstractCommonComponentType,
IXMLElectricStorageSystemDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "ElectricEnergyStorageType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -87,7 +87,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLBatteryPackDeclarationDeclarationInputData : AbstractCommonComponentType,
IXMLBatteryPackDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "REESSBatteryType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -156,7 +156,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public class XMLSuperCapDeclarationInputData : AbstractCommonComponentType, IXMLSuperCapDeclarationInputData
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "REESSCapacitorType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationCompletedBusVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationCompletedBusVehicleDataProvider.cs
index 2bd9499db5d564b2d3f9ab3db1e9de083930a9ff..05ff1b9fa9e6038bffec71aea860da0f4ed69ee3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationCompletedBusVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationCompletedBusVehicleDataProvider.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public abstract class AbstractXMLDeclarationCompletedBusDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
private IAdvancedDriverAssistantSystemDeclarationInputData _adas;
@@ -194,7 +194,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationConventionalCompletedBusDataProviderV210 : AbstractXMLDeclarationCompletedBusDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Conventional_CompletedBusDeclarationType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationExemptedVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationExemptedVehicleDataProvider.cs
index 73458f3a7e7c5fcd87eb608572bde35c0896a70a..bf99bc444f7e4289394ac0881e3be4d380b35ce4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationExemptedVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationExemptedVehicleDataProvider.cs
@@ -13,7 +13,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
{
public abstract class AbtractXMLDeclarationExemptedVehicleDataProviderV210 : XMLDeclarationVehicleDataProviderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public AbtractXMLDeclarationExemptedVehicleDataProviderV210(
IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) : base(jobData, xmlNode, sourceFile)
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
// ---------------------------------------------------------------------------------------
public class XMLDeclarationExemptedHeavyLorryDataProviderV210 : AbtractXMLDeclarationExemptedVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Exempted_HeavyLorryDeclarationType";
@@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationExemptedMediumLorryDataProviderV210 : AbtractXMLDeclarationExemptedVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Exempted_MediumLorryDeclarationType";
@@ -111,7 +111,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationExemptedPrimaryBusDataProviderV210 : AbtractXMLDeclarationExemptedVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Exempted_PrimaryBusDeclarationType";
@@ -125,7 +125,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationExemptedCompletedBusDataProviderV210 : AbtractXMLDeclarationExemptedVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Exempted_CompletedBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationHeavyLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationHeavyLorryVehicleDataProvider.cs
index 4f27cbdbc70cad3f7c090bc271759623e6cf5b20..afcea312c4ef9dbeb8ae94157e27f39964c1da34 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationHeavyLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationHeavyLorryVehicleDataProvider.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationConventionalHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Conventional_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVPxHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Px_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVSxHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Sx_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationPEVHeavyLorryE2DataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_PEV_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -152,7 +152,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationIEPCHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_IEPC_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -178,7 +178,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVIEPCSHeavyLorryDataProviderV210 : AbstractXMLVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationMediumLorryVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationMediumLorryVehicleDataProvider.cs
index 359c8680e6ce897b35a1e03c30459cfbcdaa24e8..e0592f31d947948fc14bf3fcc75e2f8765db6800 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationMediumLorryVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationMediumLorryVehicleDataProvider.cs
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationConventionalMediumLorryVehicleDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
public new static readonly XNamespace NAMESPACE_URI =
- XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Conventional_MediumLorryDeclarationType";
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVPxMediumLorryDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Px_MediumLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE =
XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVSxMediumLorryDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Sx_MediumLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationPEVMediumLorryExDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_PEV_MediumLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -164,7 +164,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationIEPCMediumLorryDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_IEPC_MediumLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVIEPCSMediumLorryDataProviderV210 : AbstractXMLDeclarationMediumLorryVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_MediumLorryDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationPrimaryBusVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationPrimaryBusVehicleDataProvider.cs
index 23fef8f053130334ccbcf7b69934949439cc85b5..aa3094c6159cb2729458c41636ea271ded45d0d1 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationPrimaryBusVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v210/XMLDeclarationPrimaryBusVehicleDataProvider.cs
@@ -67,7 +67,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationConventionalPrimaryBusVehicleDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_Conventional_PrimaryBusDeclarationType";
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVPxPrimaryBusDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Px_PrimaryBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVSxPrimaryBusDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-Sx_PrimaryBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationPEVPrimaryBusDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_PEV_PrimaryBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -151,7 +151,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationIEPCPrimaryBusDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_IEPC_PrimaryBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v210
public class XMLDeclarationHEVIEPCSPrimaryBusDataProviderV210 : AbstractXMLDeclarationPrimaryBusVehicleDataProviderV210
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Vehicle_HEV-IEPC-S_PrimaryBusDeclarationType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
index cb2a0ea8e8a234d9708d9b6e2799350edef399e9..4d1588090d318178cbbd38e09a368e984871bf88 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
@@ -250,7 +250,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
.To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_TYPE);
-
+ Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
+ .To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_HEV_TYPE);
+ Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
+ .To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_PEV_TYPE);
Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
.To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_IEPC_TYPE);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
index 6cb9cdd4999937ff45c6f6aa42df029f0bf42da0..957369b9ee4eaca146424c12610b1fd1d48fd565 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
@@ -15,22 +15,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLEngineDeclarationInputData>().To<XMLDeclarationEngineDataProviderV23>()
.Named(XMLDeclarationEngineDataProviderV23.QUALIFIED_XSD_TYPE);
- Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
- .To<XMLDeclarationADASDataProviderV23>().Named(XMLDeclarationADASDataProviderV23.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLADASReader>()
- .To<XMLADASReaderV23>().Named(XMLADASReaderV23.QUALIFIED_XSD_TYPE);
-
-
- Bind<IXMLAuxiliariesDeclarationInputData>().To<XMLDeclarationAuxiliariesDataProviderV23>()
- .Named(XMLDeclarationAuxiliariesDataProviderV23.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLAuxiliaryDeclarationInputData>().To<XMLAuxiliaryDeclarationDataProviderV23>()
- .Named(XMLAuxiliaryDeclarationDataProviderV23.QUALIFIED_XSD_TYPE);
-
- Bind<IXMLAuxiliaryReader>().To<XMLAuxiliaryReaderV23>().Named(XMLAuxiliaryReaderV23.QUALIFIED_XSD_TYPE);
-
-
Bind<IXMLTyreDeclarationInputData>().To<XMLDeclarationTyreDataProviderV23>().Named(
XMLDeclarationTyreDataProviderV23.QUALIFIED_XSD_TYPE);
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
index 4ca9724bcbf55c76d2e36fa83d8abd1df2d28eac..65dc1818cec5035abd8da17464e7359cfc3e5018 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLADASReader.cs
@@ -116,24 +116,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
// ---------------------------------------------------------------------------------------
- public class XMLADASReaderV23 : XMLADASReaderV21
- {
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
-
- public new const string XSD_TYPE = "AdvancedDriverAssistantSystemsType";
-
- public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
- public XMLADASReaderV23(IXMLDeclarationVehicleData vehicle, XmlNode vehicleNode) : base(
- vehicle, vehicleNode)
- { }
-
- public override XNamespace SchemaNamespace => NAMESPACE_URI;
- }
-
public class XMLADASReaderV210 : XMLADASReaderV21
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE_CONVENTIONAL = "ADAS_Conventional_Type";
public const string XSD_TYPE_HEV = "ADAS_HEV_Type";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
index 71675fe8bfeb0d64f9839b52eefa479c4a061d21..719956d129330a6ee4bf91c34826e5379f98f4e5 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -366,7 +366,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLComponentReaderV210_Lorry : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
//public new const string AXLE_READER_TYPE = "AxleDataDeclarationType";
public new const string AUX_READER_TYPE = "AUX_Conventional_LorryDataType";
@@ -388,37 +388,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
vehicle, componentsNode)
{ }
}
- // ---------------------------------------------------------------------------------------
-
- public class XMLAuxiliaryReaderV23 : XMLComponentReaderV20
- {
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
-
- public new const string AUX_READER_TYPE = "AuxiliariesDataDeclarationType";
-
- public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, AUX_READER_TYPE);
-
- private IBusAuxiliariesDeclarationData _busAuxInputData;
-
-
- public XMLAuxiliaryReaderV23(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(
- vehicle, componentsNode)
- { }
-
- public override IBusAuxiliariesDeclarationData BusAuxiliariesInputData => _busAuxInputData ?? (_busAuxInputData = CreateComponent(XMLNames.Component_Auxiliaries, BusAuxCreator));
-
- protected virtual IBusAuxiliariesDeclarationData BusAuxCreator(string version, XmlNode componentNode, string sourceFile)
- {
- return Factory.CreateBusAuxiliaires(version, Vehicle, componentNode, sourceFile);
- }
- }
// ---------------------------------------------------------------------------------------
public class XMLComponentReaderV210_PrimaryBus : XMLComponentReaderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_Conventional_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -459,7 +435,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLComponentReaderV210_CompletedBus : XMLComponentReaderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE_CONVENTIONAL = "Components_Conventional_CompletedBusType";
public const string XSD_TYPE_xEV = "Components_xEV_CompletedBusType";
@@ -514,7 +490,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLComponentReaderV210_HEV_PxHeavyLorry : XMLComponentReaderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_Conventional_LorryType";
public const string XSD_HEV_Px_TYPE = "Components_HEV-Px_LorryType";
@@ -534,7 +510,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLElectricMachineSystemReaderV210 : AbstractComponentReader, IXMLElectricMachineSystemReader
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "ElectricMachineType";
public const string XSD_GEN_TYPE = "ElectricMachineGENType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -584,7 +560,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLREESSReaderV210 : AbstractComponentReader, IXMLREESSReader
{
- public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public const string XSD_TYPE = "ElectricEnergyStorageType";
public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -666,7 +642,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPrimaryBusHEVPxDeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-Px_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -691,7 +667,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPrimaryBusHEVS2DeclarationComponentReaderV201 : XMLPrimaryBusHEVPxDeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S2_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -703,7 +679,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPrimaryBusHEVS3DeclarationComponentReaderV201 : XMLPrimaryBusHEVPxDeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S3_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -723,7 +699,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPrimaryBusHEVS4DeclarationComponentReaderV201 : XMLPrimaryBusHEVS3DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S4_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -742,7 +718,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLHeavyLorryHEVS2DeclartionComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S2_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -754,7 +730,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLHeavyLorryHEVS3DeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S3_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -774,7 +750,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLHeavyLorryHEVS4DeclarationComponentReaderV201 : XMLHeavyLorryHEVS3DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-S4_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -793,7 +769,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLHeavyLorryHEVIEPCSDeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-IEPC-S_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -818,7 +794,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPrimaryBusHEVIEPCSDeclarationComponentReaderV201 : XMLHeavyLorryHEVIEPCSDeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_HEV-IEPC-S_PrimaryBus";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -842,7 +818,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVHeavyLorryE2DeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E2_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -865,7 +841,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVHeavyLorryE3DeclarationComponentReaderV201 : XMLPEVHeavyLorryE2DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E3_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -885,7 +861,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVHeavyLorryE4DeclarationComponentReaderV201 : XMLPEVHeavyLorryE3DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E4_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -903,7 +879,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVPrimaryBusE2DeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E2_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -932,7 +908,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVPrimaryBusE3DeclarationComponentReaderV201 : XMLPEVPrimaryBusE2DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E3_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLPEVPrimaryBusE3DeclarationComponentReaderV201(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
@@ -953,7 +929,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPEVPrimaryBusE4DeclarationComponentReaderV201 : XMLPEVPrimaryBusE3DeclarationComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_PEV-E4_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
public XMLPEVPrimaryBusE4DeclarationComponentReaderV201(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode)
@@ -971,7 +947,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLIEPCHeavyLorryComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_IEPC_LorryType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -993,7 +969,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLIEPCPrimaryBusComponentReaderV201 : XMLIEPCHeavyLorryComponentReaderV201
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string XSD_TYPE = "Components_IEPC_PrimaryBusType";
public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
@@ -1027,7 +1003,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLGearboxDeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
public new const string GEARBOX_READER_TYPE = "GearboxDataDeclarationType";
public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
@@ -1039,7 +1015,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLAuxiliaryDeclarationComponentReaderV201 : XMLComponentReaderV10
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
public new const string AUX_READER_TYPE = "AUX_IEPC_LorryDataType";
public const string AUX_IEPC_READER_TYPE = "AUX_IEPC_PrimaryBusType";
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
index 762e416a2cad2b9027bb89755548fea275706187..f38e08aeedf15c7d2806db168f1b04c4b7627d4c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLPTOReader.cs
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public class XMLPTOReaderV210 : XMLPTOReaderV20
{
- public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
//public new const string XSD_TYPE = "PTOType";
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
index 4d5f123ef363ab9f8c7ee63f73d7619f18f4b060..a2882b7a4367511435d51782312effc9de893846 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/AbstractXMLManufacturerReport.cs
@@ -259,8 +259,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
protected virtual XElement CreateADAS(VehicleData.ADASData adasData)
{
- var ns = XMLADASReaderV23.NAMESPACE_URI;
- var type = XMLADASReaderV23.XSD_TYPE;
+ var ns = XMLADASReaderV21.NAMESPACE_URI;
+ var type = XMLADASReaderV21.XSD_TYPE;
const string adasPrefix = "adas";
return new XElement(
@@ -270,8 +270,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
new XElement(ns + XMLNames.Vehicle_ADAS_EngineStopStart, adasData.EngineStopStart),
new XElement(ns + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adasData.EcoRoll.WithoutEngineStop()),
new XElement(ns + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
- new XElement(ns + XMLNames.Vehicle_ADAS_PCC, adasData.PredictiveCruiseControl.ToXMLFormat()),
- new XElement(ns + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, adasData.InputData.ATEcoRollReleaseLockupClutch ?? false)
+ new XElement(ns + XMLNames.Vehicle_ADAS_PCC, adasData.PredictiveCruiseControl.ToXMLFormat())
+ //new XElement(ns + XMLNames.Vehicle_ADAS_ATEcoRollReleaseLockupClutch, adasData.InputData.ATEcoRollReleaseLockupClutch ?? false)
);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 9a5b81a463a83766a3ad25e576784836c76bc6b0..f74591f3cb16a6b20d0fb5891a4fa63203bb716c 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -26,38 +26,38 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
protected override XElement GetVehicleElement(string vehicleId)
{
return new XElement(tns + XMLNames.Tag_Vehicle,
- new XAttribute("xmlns", v210),
+ new XAttribute("xmlns", v24),
new XAttribute(xsi + XMLNames.Attr_Type, "Vehicle_Exempted_CompletedBusType"),
new XAttribute(XMLNames.Component_ID_Attr, vehicleId),
- new XElement(v210 + XMLNames.Component_Manufacturer, _vehicleInputData.Manufacturer),
- new XElement(v210 + XMLNames.Component_ManufacturerAddress, _vehicleInputData.ManufacturerAddress),
- new XElement(v210 + XMLNames.Vehicle_VIN, _vehicleInputData.VIN),
- new XElement(v210 + XMLNames.Component_Date,
+ new XElement(v24 + XMLNames.Component_Manufacturer, _vehicleInputData.Manufacturer),
+ new XElement(v24 + XMLNames.Component_ManufacturerAddress, _vehicleInputData.ManufacturerAddress),
+ new XElement(v24 + XMLNames.Vehicle_VIN, _vehicleInputData.VIN),
+ new XElement(v24 + XMLNames.Component_Date,
XmlConvert.ToString(_vehicleInputData.Date, XmlDateTimeSerializationMode.Utc)),
_vehicleInputData.Model != null
- ? new XElement(v210 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
+ ? new XElement(v24 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
_vehicleInputData.LegislativeClass != null
- ? new XElement(v210 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
_vehicleInputData.CurbMassChassis != null
- ? new XElement(v210 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
_vehicleInputData.GrossVehicleMassRating != null
- ? new XElement(v210 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
_vehicleInputData.RegisteredClass != null
- ? new XElement(v210 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
_vehicleInputData.NumberPassengerSeatsLowerDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberPassengerSeatsLowerDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberPassengerSeatsLowerDeck) : null,
_vehicleInputData.NumberPassengersStandingLowerDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberPassengersStandingLowerDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberPassengersStandingLowerDeck) : null,
_vehicleInputData.NumberPassengerSeatsUpperDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberPassengerSeatsUpperDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberPassengerSeatsUpperDeck) : null,
_vehicleInputData.NumberPassengersStandingUpperDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberPassengersStandingUpperDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberPassengersStandingUpperDeck) : null,
_vehicleInputData.VehicleCode != null
- ? new XElement(v210 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
_vehicleInputData.LowEntry != null
- ? new XElement(v210 + XMLNames.Bus_LowEntry, _vehicleInputData.LowEntry) : null,
+ ? new XElement(v24 + XMLNames.Bus_LowEntry, _vehicleInputData.LowEntry) : null,
_vehicleInputData.Height != null
- ? new XElement(v210 + XMLNames.Bus_HeighIntegratedBody, _vehicleInputData.Height.ConvertToMilliMeter().ToXMLFormat(0)) : null
+ ? new XElement(v24 + XMLNames.Bus_HeighIntegratedBody, _vehicleInputData.Height.ConvertToMilliMeter().ToXMLFormat(0)) : null
);
}
}
@@ -69,8 +69,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
protected XNamespace v20 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0";
- protected XNamespace v23 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3";
- protected XNamespace v210 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2";
+ protected XNamespace v23 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3";
+ protected XNamespace v24 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4";
protected XNamespace v10 = "urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0";
private XElement _primaryVehicle;
@@ -220,7 +220,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
var stage = new XElement(tns + XMLNames.ManufacturingStep,
new XAttribute(XMLNames.ManufacturingStep_StepCount, GetStageNumber()),
new XElement(tns + XMLNames.Report_DataWrap,
- new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStageDataType"),
+ new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStepDataType"),
new XAttribute(XMLNames.Component_ID_Attr, multistageId),
GetHashPreviousStageElement(),
GetVehicleElement(vehicleId),
@@ -256,50 +256,50 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
protected virtual XElement GetVehicleElement(string vehicleId)
{
return new XElement(tns + XMLNames.Tag_Vehicle,
- new XAttribute("xmlns", v210),
+ new XAttribute("xmlns", v24),
new XAttribute(xsi + XMLNames.Attr_Type, "Vehicle_Conventional_CompletedBusDeclarationType"),
new XAttribute(XMLNames.Component_ID_Attr, vehicleId),
- new XElement(v210 + XMLNames.Component_Manufacturer, _vehicleInputData.Manufacturer),
- new XElement(v210 + XMLNames.Component_ManufacturerAddress, _vehicleInputData.ManufacturerAddress),
- new XElement(v210 + XMLNames.Vehicle_VIN, _vehicleInputData.VIN),
- new XElement(v210 + XMLNames.Component_Date,
+ new XElement(v24 + XMLNames.Component_Manufacturer, _vehicleInputData.Manufacturer),
+ new XElement(v24 + XMLNames.Component_ManufacturerAddress, _vehicleInputData.ManufacturerAddress),
+ new XElement(v24 + XMLNames.Vehicle_VIN, _vehicleInputData.VIN),
+ new XElement(v24 + XMLNames.Component_Date,
XmlConvert.ToString(_vehicleInputData.Date, XmlDateTimeSerializationMode.Utc)),
_vehicleInputData.Model != null
- ? new XElement(v210 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
+ ? new XElement(v24 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
_vehicleInputData.LegislativeClass != null
- ? new XElement(v210 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
_vehicleInputData.CurbMassChassis != null
- ? new XElement(v210 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
_vehicleInputData.GrossVehicleMassRating != null
- ? new XElement(v210 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
GetAirdragModifiedMultistageEntry(),
_vehicleInputData.TankSystem != null
- ? new XElement(v210 + XMLNames.Vehicle_NgTankSystem, _vehicleInputData.TankSystem.ToString()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_NgTankSystem, _vehicleInputData.TankSystem.ToString()) : null,
_vehicleInputData.RegisteredClass != null
- ? new XElement(v210 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
_vehicleInputData.NumberPassengerSeatsLowerDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberPassengerSeatsLowerDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberPassengerSeatsLowerDeck) : null,
_vehicleInputData.NumberPassengersStandingLowerDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberPassengersStandingLowerDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberPassengersStandingLowerDeck) : null,
_vehicleInputData.NumberPassengerSeatsUpperDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberPassengerSeatsUpperDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberPassengerSeatsUpperDeck) : null,
_vehicleInputData.NumberPassengersStandingUpperDeck != null
- ? new XElement(v210 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberPassengersStandingUpperDeck) : null,
+ ? new XElement(v24 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberPassengersStandingUpperDeck) : null,
_vehicleInputData.VehicleCode != null
- ? new XElement(v210 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
+ ? new XElement(v24 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
_vehicleInputData.LowEntry != null
- ? new XElement(v210 + XMLNames.Bus_LowEntry, _vehicleInputData.LowEntry) : null,
+ ? new XElement(v24 + XMLNames.Bus_LowEntry, _vehicleInputData.LowEntry) : null,
_vehicleInputData.Height != null
- ? new XElement(v210 + XMLNames.Bus_HeighIntegratedBody, _vehicleInputData.Height.ConvertToMilliMeter().ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.Bus_HeighIntegratedBody, _vehicleInputData.Height.ConvertToMilliMeter().ToXMLFormat(0)) : null,
_vehicleInputData.Length != null
- ? new XElement(v210 + XMLNames.Bus_VehicleLength, _vehicleInputData.Length.ConvertToMilliMeter().ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.Bus_VehicleLength, _vehicleInputData.Length.ConvertToMilliMeter().ToXMLFormat(0)) : null,
_vehicleInputData.Width != null
- ? new XElement(v210 + XMLNames.Bus_VehicleWidth, _vehicleInputData.Width.ConvertToMilliMeter().ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.Bus_VehicleWidth, _vehicleInputData.Width.ConvertToMilliMeter().ToXMLFormat(0)) : null,
_vehicleInputData.EntranceHeight != null
- ? new XElement(v210 + XMLNames.Bus_EntranceHeight, _vehicleInputData.EntranceHeight.ConvertToMilliMeter().ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.Bus_EntranceHeight, _vehicleInputData.EntranceHeight.ConvertToMilliMeter().ToXMLFormat(0)) : null,
_vehicleInputData.DoorDriveTechnology != null
- ? new XElement(v210 + XMLNames.Bus_DoorDriveTechnology, _vehicleInputData.DoorDriveTechnology.ToXMLFormat()) : null,
- new XElement(v210 + XMLNames.Bus_VehicleDeclarationType, _vehicleInputData.VehicleDeclarationType.GetLabel()),
+ ? new XElement(v24 + XMLNames.Bus_DoorDriveTechnology, _vehicleInputData.DoorDriveTechnology.ToXMLFormat()) : null,
+ new XElement(v24 + XMLNames.Bus_VehicleDeclarationType, _vehicleInputData.VehicleDeclarationType.GetLabel()),
GetADAS(_vehicleInputData.ADAS),
GetBusVehicleComponents(_vehicleInputData.Components)
);
@@ -314,7 +314,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
case null:
throw new VectoException("AirdragModifiedMultistage must be set if an airdrag component has been set in previous stages.");
default:
- return new XElement(v210 + XMLNames.Bus_AirdragModifiedMultistage, _vehicleInputData.AirdragModifiedMultistage);
+ return new XElement(v24 + XMLNames.Bus_AirdragModifiedMultistage, _vehicleInputData.AirdragModifiedMultistage);
}
}
@@ -324,14 +324,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
return null;
return new XElement(
- v210 + XMLNames.Vehicle_ADAS,
+ v24 + XMLNames.Vehicle_ADAS,
new XAttribute(xsi + "type", "ADAS_Conventional_Type"),
- new XElement(v210 + XMLNames.Vehicle_ADAS_EngineStopStart, adasData.EngineStopStart),
- new XElement(v210 + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adasData.EcoRoll.WithoutEngineStop()),
- new XElement(v210 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
- new XElement(v210 + XMLNames.Vehicle_ADAS_PCC, adasData.PredictiveCruiseControl.ToXMLFormat()),
+ new XElement(v24 + XMLNames.Vehicle_ADAS_EngineStopStart, adasData.EngineStopStart),
+ new XElement(v24 + XMLNames.Vehicle_ADAS_EcoRollWithoutEngineStop, adasData.EcoRoll.WithoutEngineStop()),
+ new XElement(v24 + XMLNames.Vehicle_ADAS_EcoRollWithEngineStopStart, adasData.EcoRoll.WithEngineStop()),
+ new XElement(v24 + XMLNames.Vehicle_ADAS_PCC, adasData.PredictiveCruiseControl.ToXMLFormat()),
adasData.ATEcoRollReleaseLockupClutch != null
- ? new XElement(v210 + XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, adasData.ATEcoRollReleaseLockupClutch)
+ ? new XElement(v24 + XMLNames.Bus_ADAS_APTEcoRollReleaseLockupClutch, adasData.ATEcoRollReleaseLockupClutch)
: null
);
}
@@ -344,7 +344,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
if (busAirdrag == null && busAux == null)
return null;
- return new XElement(v210 + XMLNames.Vehicle_Components,
+ return new XElement(v24 + XMLNames.Vehicle_Components,
new XAttribute(xsi + XMLNames.Attr_Type, "Components_Conventional_CompletedBusType"),
busAirdrag,
busAux
@@ -394,7 +394,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
private XElement GetAirdragXMLElementV1(XmlNode dataNode, XmlNode signatureNode)
{
- return new XElement(v210 + XMLNames.Component_AirDrag,
+ return new XElement(v24 + XMLNames.Component_AirDrag,
new XElement(v20 + XMLNames.Report_DataWrap,
new XAttribute(xsi + XMLNames.Component_Type_Attr, XMLNames.AirDrag_Data_Type_Attr),
//new XAttribute("xmlns", v10.NamespaceName),
@@ -415,7 +415,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
var signatureElement = XElement.Parse(signatureNode.OuterXml);
dataElement.Attribute(XNamespace.Xmlns + "xsi")?.Remove();
- return new XElement(v210 + XMLNames.Component_AirDrag,
+ return new XElement(v24 + XMLNames.Component_AirDrag,
dataElement,
signatureElement);
}
@@ -437,7 +437,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
{
var id = $"{VectoComponents.Airdrag.HashIdPrefix()}{GetGUID()}";
- return new XElement(v210 + XMLNames.Component_AirDrag,
+ return new XElement(v24 + XMLNames.Component_AirDrag,
new XElement(v20 + XMLNames.ComponentDataWrapper,
new XAttribute(xsi + XMLNames.Attr_Type, "AirDragModifiedUseStandardValueType"),
new XAttribute(XMLNames.Component_ID_Attr, id)
@@ -457,8 +457,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
if (electricSystemEntry == null && hvacEntry == null)
return null;
- return new XElement(v210 + XMLNames.Component_Auxiliaries,
- new XElement(v210 + XMLNames.ComponentDataWrapper,
+ return new XElement(v24 + XMLNames.Component_Auxiliaries,
+ new XElement(v24 + XMLNames.ComponentDataWrapper,
new XAttribute(xsi + XMLNames.Attr_Type, "AUX_Conventional_CompletedBusType"),
electricSystemEntry != null
? GetElectricSystem(busAux.ElectricConsumers) : null,
@@ -478,18 +478,18 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
electricConsumer.HeadlightsLED == null)
return null;
- return new XElement(v210 + XMLNames.BusAux_ElectricSystem,
- new XElement(v210 + XMLNames.BusAux_LEDLights,
+ return new XElement(v24 + XMLNames.BusAux_ElectricSystem,
+ new XElement(v24 + XMLNames.BusAux_LEDLights,
electricConsumer.InteriorLightsLED != null
- ? new XElement(v210 + XMLNames.Bus_Interiorlights, electricConsumer.InteriorLightsLED) : null,
+ ? new XElement(v24 + XMLNames.Bus_Interiorlights, electricConsumer.InteriorLightsLED) : null,
electricConsumer.DayrunninglightsLED != null
- ? new XElement(v210 + XMLNames.Bus_Dayrunninglights, electricConsumer.DayrunninglightsLED) : null,
+ ? new XElement(v24 + XMLNames.Bus_Dayrunninglights, electricConsumer.DayrunninglightsLED) : null,
electricConsumer.PositionlightsLED != null
- ? new XElement(v210 + XMLNames.Bus_Positionlights, electricConsumer.PositionlightsLED) : null,
+ ? new XElement(v24 + XMLNames.Bus_Positionlights, electricConsumer.PositionlightsLED) : null,
electricConsumer.BrakelightsLED != null
- ? new XElement(v210 + XMLNames.Bus_Brakelights, electricConsumer.BrakelightsLED) : null,
+ ? new XElement(v24 + XMLNames.Bus_Brakelights, electricConsumer.BrakelightsLED) : null,
electricConsumer.HeadlightsLED != null
- ? new XElement(v210 + XMLNames.Bus_Headlights, electricConsumer.HeadlightsLED) : null
+ ? new XElement(v24 + XMLNames.Bus_Headlights, electricConsumer.HeadlightsLED) : null
));
}
@@ -506,31 +506,31 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
hvac.WaterElectricHeater == null && hvac.AirElectricHeater == null && hvac.OtherHeatingTechnology == null)
return null;
- return new XElement(v210 + XMLNames.BusAux_HVAC,
+ return new XElement(v24 + XMLNames.BusAux_HVAC,
hvac.SystemConfiguration != null
- ? new XElement(v210 + XMLNames.Bus_SystemConfiguration, hvac.SystemConfiguration.GetXmlFormat()) : null,
+ ? new XElement(v24 + XMLNames.Bus_SystemConfiguration, hvac.SystemConfiguration.GetXmlFormat()) : null,
hvac.HeatPumpTypeCoolingDriverCompartment != null && hvac.HeatPumpTypeHeatingDriverCompartment != null
- ? new XElement(v210 + XMLNames.Bus_HeatPumpTypeDriver,
- new XElement(v210 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingDriverCompartment.GetLabel()),
- new XElement(v210 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingDriverCompartment.GetLabel())) : null,
+ ? new XElement(v24 + XMLNames.Bus_HeatPumpTypeDriver,
+ new XElement(v24 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingDriverCompartment.GetLabel()),
+ new XElement(v24 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingDriverCompartment.GetLabel())) : null,
hvac.HeatPumpTypeCoolingPassengerCompartment != null && hvac.HeatPumpTypeHeatingPassengerCompartment != null
- ? new XElement(v210 + XMLNames.Bus_HeatPumpTypePassenger,
- new XElement(v210 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingPassengerCompartment.GetLabel()),
- new XElement(v210 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingPassengerCompartment.GetLabel())) : null,
+ ? new XElement(v24 + XMLNames.Bus_HeatPumpTypePassenger,
+ new XElement(v24 + XMLNames.BusHVACHeatPumpCooling, hvac.HeatPumpTypeCoolingPassengerCompartment.GetLabel()),
+ new XElement(v24 + XMLNames.BusHVACHeatPumpHeating, hvac.HeatPumpTypeHeatingPassengerCompartment.GetLabel())) : null,
hvac.AuxHeaterPower != null
- ? new XElement(v210 + XMLNames.Bus_AuxiliaryHeaterPower, hvac.AuxHeaterPower.ToXMLFormat(0)) : null,
+ ? new XElement(v24 + XMLNames.Bus_AuxiliaryHeaterPower, hvac.AuxHeaterPower.ToXMLFormat(0)) : null,
hvac.DoubleGlazing != null
- ? new XElement(v210 + XMLNames.Bus_DoubleGlazing, hvac.DoubleGlazing) : null,
+ ? new XElement(v24 + XMLNames.Bus_DoubleGlazing, hvac.DoubleGlazing) : null,
hvac.AdjustableAuxiliaryHeater != null
- ? new XElement(v210 + XMLNames.Bus_AdjustableAuxiliaryHeater, hvac.AdjustableAuxiliaryHeater) : null,
+ ? new XElement(v24 + XMLNames.Bus_AdjustableAuxiliaryHeater, hvac.AdjustableAuxiliaryHeater) : null,
hvac.SeparateAirDistributionDucts != null
- ? new XElement(v210 + XMLNames.Bus_SeparateAirDistributionDucts, hvac.SeparateAirDistributionDucts) : null,
+ ? new XElement(v24 + XMLNames.Bus_SeparateAirDistributionDucts, hvac.SeparateAirDistributionDucts) : null,
hvac.WaterElectricHeater != null
- ? new XElement(v210 + XMLNames.Bus_WaterElectricHeater, hvac.WaterElectricHeater) : null,
+ ? new XElement(v24 + XMLNames.Bus_WaterElectricHeater, hvac.WaterElectricHeater) : null,
hvac.AirElectricHeater != null
- ? new XElement(v210 + XMLNames.Bus_AirElectricHeater, hvac.AirElectricHeater) : null,
+ ? new XElement(v24 + XMLNames.Bus_AirElectricHeater, hvac.AirElectricHeater) : null,
hvac.OtherHeatingTechnology != null
- ? new XElement(v210 + XMLNames.Bus_OtherHeatingTechnology, hvac.OtherHeatingTechnology) : null
+ ? new XElement(v24 + XMLNames.Bus_OtherHeatingTechnology, hvac.OtherHeatingTechnology) : null
);
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd
deleted file mode 100644
index 5d4f0b83499b4303ff83441944960aa26f2e7774..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DEV.xsd
+++ /dev/null
@@ -1,621 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
- <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
- <xs:complexType name="AdvancedDriverAssistantSystemsType">
- <xs:complexContent>
- <xs:extension base="v2.1:AbstractAdvancedDriverAssistantSystemsType">
- <xs:annotation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Vehicle/ADAS">333</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="EngineStopStart" type="v2.1:EngineStopStartType">
- <xs:annotation>
- <xs:documentation>P271 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EcoRollWithoutEngineStop" type="v2.1:EcoRollWithoutEngineStopType">
- <xs:annotation>
- <xs:documentation>P272 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EcoRollWithEngineStop" type="v2.1:EcoRollWithEngineStopType">
- <xs:annotation>
- <xs:documentation>P273 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="PredictiveCruiseControl" type="v2.1:PredictiveCruiseControlType">
- <xs:annotation>
- <xs:documentation>P274 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="APTEcoRollReleaseLockupClutch" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P272 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AuxiliariesDataDeclarationType">
- <xs:complexContent>
- <xs:extension base="v2.0:AbstractAuxiliaryDataDeclarationType">
- <xs:sequence>
- <xs:element name="Fan">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v1.0:AuxFanTechnologyType">
- <xs:annotation>
- <xs:documentation>P181 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="SteeringPump">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v2.3:AuxSPTechnologyType" maxOccurs="4">
- <xs:annotation>
- <xs:documentation>P182 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="ElectricSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v1.0:AuxESTechnologyType">
- <xs:annotation>
- <xs:documentation>P183 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="PneumaticSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v1.0:AuxPSTechnologyType">
- <xs:annotation>
- <xs:documentation>P184 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology" type="v1.0:AuxHVACTechnologyType">
- <xs:annotation>
- <xs:documentation>P185 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="EngineDataDeclarationType">
- <xs:complexContent>
- <xs:extension base="v1.0:AbstractCombustionEngineDataDeclarationType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P200 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P201 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P261 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P203 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P204 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
- <xs:annotation>
- <xs:documentation>P061 - [cm³]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P249 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
- <xs:annotation>
- <xs:documentation>P250 - [W]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
- <xs:annotation>
- <xs:documentation>P259 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHRType" type="v2.3:WHRTypeType"/>
- <xs:element name="Mode" type="v2.3:EngineFuelModeType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="EngineFuelModeType">
- <xs:sequence>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P063 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FullLoadAndDragCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Fuel" type="v2.3:EngineFuelType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="EngineFuelType">
- <xs:sequence>
- <xs:element name="WHTCUrban" type="v1.0:EngineWHTCType">
- <xs:annotation>
- <xs:documentation>P109 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHTCRural" type="v1.0:EngineWHTCType">
- <xs:annotation>
- <xs:documentation>P110 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType">
- <xs:annotation>
- <xs:documentation>P111 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType">
- <xs:annotation>
- <xs:documentation>P159 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType">
- <xs:annotation>
- <xs:documentation>P192 [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CFNCV" type="v1.0:EngineNCVCFType">
- <xs:annotation>
- <xs:documentation>P260 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHRCorrectionFactors" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Electrical" type="v2.3:WHRElectricalCorrectionFactorsType" minOccurs="0"/>
- <xs:element name="Mechanical" type="v2.3:WHRMechanicalCorrectionFactorsType" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="FuelConsumptionMap">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v2.3:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="v1.0:FuelTypeType" use="required">
- <xs:annotation>
- <xs:documentation>P193 [enum]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="FuelConsumptionEntryType">
- <xs:attribute name="engineSpeed" type="v1.0:EngineSpeedType" use="required">
- <xs:annotation>
- <xs:documentation>P072 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="torque" type="v1.0:EngineFuelConsumptionMapTorqueType" use="required">
- <xs:annotation>
- <xs:documentation>P073 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="fuelConsumption" type="v1.0:EngineFuelConsumptionMapFuelConsumptionType" use="required">
- <xs:annotation>
- <xs:documentation>P074 - [g/h]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="electricPower" type="v1.0:Double2">
- <xs:annotation>
- <xs:documentation>P348 - [W]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="mechanicalPower" type="v1.0:Double2">
- <xs:annotation>
- <xs:documentation>P349 - [W]</xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- <xs:complexType name="TyreDataDeclarationType">
- <xs:complexContent>
- <xs:extension base="v1.0:AbstractTyreDataDeclarationType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P230 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P231 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P267 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P233 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P234 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Dimension" type="v2.3:TyreDimensionType">
- <xs:annotation>
- <xs:documentation>P108 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TyreClass">
- <xs:annotation>
- <xs:documentation>P370 - enum</xs:documentation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Tyre">370</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- <xs:enumeration value="C1"/>
- <xs:enumeration value="C2"/>
- <xs:enumeration value="C3"/>
- <xs:enumeration value="N/A"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="FuelEfficiencyClass">
- <xs:annotation>
- <xs:documentation>P371 - enum</xs:documentation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Tyre">371</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="A"/>
- <xs:enumeration value="B"/>
- <xs:enumeration value="C"/>
- <xs:enumeration value="D"/>
- <xs:enumeration value="E"/>
- <xs:enumeration value="F"/>
- <xs:enumeration value="G"/>
- <xs:enumeration value="N/A"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="RRCDeclared" type="v1.0:TyreRRCISOType">
- <xs:annotation>
- <xs:documentation>P046 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="FzISO" type="v1.0:TyreFzISOType">
- <xs:annotation>
- <xs:documentation>P047 - [N]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="WHRElectricalCorrectionFactorsType">
- <xs:sequence>
- <xs:element name="Urban">
- <xs:annotation>
- <xs:documentation>P338 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Rural">
- <xs:annotation>
- <xs:documentation>P339 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Motorway">
- <xs:annotation>
- <xs:documentation>P340 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="BFColdHot">
- <xs:annotation>
- <xs:documentation>P341 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CFRegPer">
- <xs:annotation>
- <xs:documentation>P342 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="WHRMechanicalCorrectionFactorsType">
- <xs:sequence>
- <xs:element name="Urban">
- <xs:annotation>
- <xs:documentation>P343 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Rural">
- <xs:annotation>
- <xs:documentation>P344 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Motorway">
- <xs:annotation>
- <xs:documentation>P345 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="BFColdHot">
- <xs:annotation>
- <xs:documentation>P346 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CFRegPer">
- <xs:annotation>
- <xs:documentation>P347 - [-]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="v1.0:Double4">
- <xs:minExclusive value="0.0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="WHRTypeType">
- <xs:sequence>
- <xs:element name="MechanicalOutputICE" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P335 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MechanicalOutputDrivetrain" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P336 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ElectricalOutput" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P337 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:simpleType name="AuxSPTechnologyType">
- <xs:annotation>
- <xs:documentation>P182</xs:documentation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Vehicle/Auxiliaries">182</vectoParam:parameterId>
- <vectoParam:comment>Multiple entires allowed, one per steered axle</vectoParam:comment>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Fixed displacement"/>
- <xs:enumeration value="Fixed displacement with elec. control"/>
- <xs:enumeration value="Dual displacement with mech. control"/>
- <xs:enumeration value="Dual displacement with elec. control"/>
- <xs:enumeration value="Variable displacement mech. controlled"/>
- <xs:enumeration value="Variable displacement elec. controlled"/>
- <xs:enumeration value="Electric driven pump"/>
- <xs:enumeration value="Full electric steering gear"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="TyreDimensionType">
- <xs:annotation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Tyre">108</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- <xs:documentation>P108 - enum</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="9 R22.5"/>
- <xs:enumeration value="9.00 R20"/>
- <xs:enumeration value="9.5 R17.5"/>
- <xs:enumeration value="10 R17.5"/>
- <xs:enumeration value="10 R22.5"/>
- <xs:enumeration value="10.00 R20"/>
- <xs:enumeration value="11 R22.5"/>
- <xs:enumeration value="11.00 R20"/>
- <xs:enumeration value="12 R22.5"/>
- <xs:enumeration value="12.00 R20"/>
- <xs:enumeration value="12.00 R24"/>
- <xs:enumeration value="12.5 R20"/>
- <xs:enumeration value="13 R22.5"/>
- <xs:enumeration value="14.00 R20"/>
- <xs:enumeration value="14.5 R20"/>
- <xs:enumeration value="16.00 R20"/>
- <xs:enumeration value="205/75 R17.5"/>
- <xs:enumeration value="215/75 R17.5"/>
- <xs:enumeration value="225/70 R17.5"/>
- <xs:enumeration value="225/75 R17.5"/>
- <xs:enumeration value="235/75 R17.5"/>
- <xs:enumeration value="245/70 R17.5"/>
- <xs:enumeration value="245/70 R19.5"/>
- <xs:enumeration value="255/70 R22.5"/>
- <xs:enumeration value="265/70 R17.5"/>
- <xs:enumeration value="265/70 R19.5"/>
- <xs:enumeration value="275/70 R22.5"/>
- <xs:enumeration value="275/80 R22.5"/>
- <xs:enumeration value="285/60 R22.5"/>
- <xs:enumeration value="285/70 R19.5"/>
- <xs:enumeration value="295/55 R22.5"/>
- <xs:enumeration value="295/60 R22.5"/>
- <xs:enumeration value="295/80 R22.5"/>
- <xs:enumeration value="305/60 R22.5"/>
- <xs:enumeration value="305/70 R19.5"/>
- <xs:enumeration value="305/70 R22.5"/>
- <xs:enumeration value="305/75 R24.5"/>
- <xs:enumeration value="315/45 R22.5"/>
- <xs:enumeration value="315/60 R22.5"/>
- <xs:enumeration value="315/70 R22.5"/>
- <xs:enumeration value="315/80 R22.5"/>
- <xs:enumeration value="325/95 R24"/>
- <xs:enumeration value="335/80 R20"/>
- <xs:enumeration value="355/50 R22.5"/>
- <xs:enumeration value="365/70 R22.5"/>
- <xs:enumeration value="365/80 R20"/>
- <xs:enumeration value="365/85 R20"/>
- <xs:enumeration value="375/45 R22.5"/>
- <xs:enumeration value="375/50 R22.5"/>
- <xs:enumeration value="375/90 R22.5"/>
- <xs:enumeration value="385/55 R22.5"/>
- <xs:enumeration value="385/65 R22.5"/>
- <xs:enumeration value="395/85 R20"/>
- <xs:enumeration value="425/65 R22.5"/>
- <xs:enumeration value="495/45 R22.5"/>
- <xs:enumeration value="525/65 R20.5"/>
- <xs:enumeration value="11.00 R16"/>
- <xs:enumeration value="6.00 R9"/>
- <xs:enumeration value="205/65 R17.5"/>
- <xs:enumeration value="225/75 R16C"/>
- <xs:enumeration value="255/100 R16"/>
- <xs:enumeration value="255/60 R19.5"/>
- <xs:enumeration value="265/55 R19.5"/>
- <xs:enumeration value="275/60 R19.5"/>
- <xs:enumeration value="275/80 R20"/>
- <xs:enumeration value="285/65 R16C"/>
- <xs:enumeration value="295/75 R22.5"/>
- <xs:enumeration value="325/85 R16"/>
- <xs:enumeration value="435/50 R19.5"/>
- <xs:enumeration value="435/50 R22.5"/>
- <xs:enumeration value="445/40 R22.5"/>
- <xs:enumeration value="445/45 R19.5"/>
- <xs:enumeration value="445/65 R22.5"/>
- <xs:enumeration value="445/75 R22.5"/>
- <xs:enumeration value="455/40 R22.5"/>
- <xs:enumeration value="455/45 R22.5"/>
- <xs:enumeration value="475/80 R20"/>
- <xs:enumeration value="7.00 R16C"/>
- <xs:enumeration value="7.50 R15"/>
- <xs:enumeration value="7.50 R16"/>
- <xs:enumeration value="7.50 R16C"/>
- <xs:enumeration value="8.25 R15"/>
- <xs:enumeration value="8.25 R16C"/>
- <xs:enumeration value="8.5 R17.5"/>
- <xs:enumeration value="8 R17.5"/>
- <xs:enumeration value="LT265/75 R16"/>
- <xs:enumeration value="385/55 R19.5"/>
- <xs:enumeration value="24 R21"/>
- <xs:enumeration value="205/70 R15C"/>
- <xs:enumeration value="215/70 R15C"/>
- <xs:enumeration value="225/70 R15C"/>
- <xs:enumeration value="185/75 R16C"/>
- <xs:enumeration value="195/65 R16C"/>
- <xs:enumeration value="195/75 R16C"/>
- <xs:enumeration value="205/65 R16C"/>
- <xs:enumeration value="205/75 R16C"/>
- <xs:enumeration value="215/65 R16C"/>
- <xs:enumeration value="215/75 R16C"/>
- <xs:enumeration value="225/65 R16C"/>
- <xs:enumeration value="235/65 R16C"/>
- <xs:enumeration value="215/60 R17C"/>
- <xs:enumeration value="235/60 R17C"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
deleted file mode 100644
index cd3ff1b79fcba880420809855d0a7678992b8652..0000000000000000000000000000000000000000
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
+++ /dev/null
@@ -1,694 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Kober (Technische Universität Graz) -->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
- <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/>
- <xs:complexType name="AbstractAngledriveDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractAxlegearDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractTorqueConverterDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractTransmissionDataPIFType" abstract="true"/>
- <xs:complexType name="AbstractTransmissionGearsPIFType" abstract="true"/>
- <xs:complexType name="AbstractVehicleComponentsPIFType" abstract="true"/>
- <xs:complexType name="AbstractPrimaryVehicleType" abstract="true"/>
- <xs:complexType name="AngledriveDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractAngledriveDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P220</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P221</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P258 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P265</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P223</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P224</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Ratio"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AngledrivePIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractAngledriveDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ApplicationInformationPIFType">
- <xs:sequence>
- <xs:element name="SimulationToolVersion" type="xs:string">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>II.2.5</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AuxiliariesPIFType">
- <xs:sequence>
- <xs:element name="Data" type="v2.6:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AxlegearDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractAxlegearDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P215</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P216</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationMethod" type="v1.0:AxlegearCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P256 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P264</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P218</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P219</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LineType"/>
- <xs:element name="Ratio"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="AxlegearPIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractAxlegearDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="CO2Type">
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="CO2UnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="EngineComponentPIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractEngineDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="EngineDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractEngineDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P200</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P201</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
- <xs:annotation>
- <xs:documentation>P261</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P203</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P204</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
- <xs:annotation>
- <xs:documentation>P061 - [cm³]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
- <xs:annotation>
- <xs:documentation>P249 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedPower" type="v1.0:EngineRatedPower">
- <xs:annotation>
- <xs:documentation>P250 - [W]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
- <xs:annotation>
- <xs:documentation>P259 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WHRType" type="v2.3:WHRTypeType"/>
- <xs:element name="Mode" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="FullLoadAndDragCurve">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Fuels">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="FuelType" type="v1.0:FuelTypeType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="EngineSpeedDrivingType">
- <xs:sequence>
- <xs:element name="Min">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Average">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Max">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="FuelConsumptionType">
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="EnergyConsumptionUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="PrimaryVehicleDataType">
- <xs:complexContent>
- <xs:extension base="out:AbstractPrimaryVehicleDataPIFType">
- <xs:sequence>
- <xs:element name="Vehicle" type="AbstractPrimaryVehicleType"/>
- <xs:element name="InputDataSignature" type="v1.0:SignatureType"/>
- <xs:element name="ManufacturerRecordSignature" type="v1.0:SignatureType"/>
- <xs:element name="Results" type="ResultsPrimaryVehicleType"/>
- <xs:element name="ApplicationInformation" type="ApplicationInformationPIFType"/>
- </xs:sequence>
- <xs:attribute name="id" use="required"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="ResultPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="VehicleGroup">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Mission" type="MissionTypeType">
- <xs:annotation>
- <xs:documentation>I.2.1.1 / #56</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SimulationParameters" type="SimulationParametersType"/>
- <xs:choice>
- <xs:sequence>
- <xs:element name="Fuel" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EnergyConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:sequence>
- <xs:element name="Error" type="xs:string"/>
- <xs:element name="ErrorDetails" type="xs:string"/>
- </xs:sequence>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="status" use="required"/>
- </xs:complexType>
- <xs:complexType name="ResultsPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="Status"/>
- <xs:element name="Result" type="ResultPrimaryVehicleType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="SimulationParametersType">
- <xs:sequence>
- <xs:element name="TotalVehicleMass">
- <xs:annotation>
- <xs:documentation>I.2.1.4 / #59</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="Payload">
- <xs:annotation>
- <xs:documentation>I.2.1.2 / #57</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="MassUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="PassengerCount">
- <xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minExclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="FuelMode">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="dual fuel mode"/>
- <xs:enumeration value="single fuel mode"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TorqueConverterDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractTorqueConverterDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P205</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P206</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationMethod" type="v1.0:TorqueConverterCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P262</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P208</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P209</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Characteristics">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Entry" type="v1.0:TorqueConverterCharacteristicsEntryType" minOccurs="2" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TorqueConverterPIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractTorqueConverterDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransmissionComponentPIFType">
- <xs:sequence>
- <xs:element name="Data" type="AbstractTransmissionDataPIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="TransmissionDataPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractTransmissionDataPIFType">
- <xs:sequence>
- <xs:element name="Manufacturer" type="v1.0:ManufacturerType">
- <xs:annotation>
- <xs:documentation>P205</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Model" type="v1.0:ModelType">
- <xs:annotation>
- <xs:documentation>P206</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
- <xs:annotation>
- <xs:documentation>P254 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="CertificationNumber" type="v1.0:CertificationNumberType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P262</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone">
- <xs:annotation>
- <xs:documentation>P208</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AppVersion" type="v1.0:AppVersionType">
- <xs:annotation>
- <xs:documentation>P209</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="TransmissionType"/>
- <xs:element name="Gears" type="AbstractTransmissionGearsPIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="TransmissionGearPIFType">
- <xs:sequence>
- <xs:element name="Ratio"/>
- <xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P157 - [Nm]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="MaxSpeed" type="v1.0:GearboxGearMaxSpeedType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P194 - [1/min]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="number" use="required"/>
- </xs:complexType>
- <xs:complexType name="TransmissionGearsPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractTransmissionGearsPIFType">
- <xs:sequence>
- <xs:element name="Gear" type="TransmissionGearPIFType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="VehicleComponentsPIFType">
- <xs:complexContent>
- <xs:extension base="AbstractVehicleComponentsPIFType">
- <xs:sequence>
- <xs:element name="Engine" type="EngineComponentPIFType"/>
- <xs:element name="Transmission" type="TransmissionComponentPIFType"/>
- <xs:element name="TorqueConverter" type="TorqueConverterPIFType" minOccurs="0"/>
- <xs:element name="Angledrive" type="AngledrivePIFType" minOccurs="0"/>
- <xs:element name="Axlegear" type="AxlegearPIFType"/>
- <xs:element name="AxleWheels" type="v2.0:AbstractAxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries" type="AuxiliariesPIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="VehiclePerformanceType">
- <xs:sequence>
- <xs:element name="AverageSpeed">
- <xs:annotation>
- <xs:documentation>I.2.2.1 / #60</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="SpeedUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="AverageDrivingSpeed">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="SpeedUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="MinSpeed">
- <xs:annotation>
- <xs:documentation>I.2.2.2 / #61</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="SpeedUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="MaxSpeed">
- <xs:annotation>
- <xs:documentation>I.2.2.3 / #62</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="SpeedUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="MaxDeceleration">
- <xs:annotation>
- <xs:documentation>I.2.2.4 / #63</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="MaxAcceleration">
- <xs:annotation>
- <xs:documentation>I.2.2.5 / #64</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="FullLoadDrivingtimePercentage">
- <xs:annotation>
- <xs:documentation>I.2.2.6 / #65</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:double">
- <xs:minInclusive value="0"/>
- <xs:maxInclusive value="100"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="GearshiftCount" type="xs:int">
- <xs:annotation>
- <xs:documentation>I.2.2.7 / #66</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EngineSpeedDriving" type="EngineSpeedDrivingType"/>
- <xs:element name="AverageGearboxEfficiency">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="PercentType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="AverageAxlegearEfficiency">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:double">
- <xs:attribute name="unit" type="PercentType" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="VehiclePIFType">
- <xs:complexContent>
- <xs:extension base="AbstractPrimaryVehicleType">
- <xs:sequence>
- <xs:element name="ManufacturerPrimaryVehicle" type="v1.0:ManufacturerType"/>
- <xs:element name="ManufacturerAddressPrimaryVehicle" type="v1.0:ManufacturerAddressType"/>
- <xs:element name="Model" type="v1.0:ModelType"/>
- <xs:element name="VIN" type="v1.0:VINType"/>
- <xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
- <xs:element name="VehicleCategory" type="v2.6:VehicleCategoryDeclarationType"/>
- <xs:element name="AxleConfiguration" type="v2.6:VehicleAxleConfigurationDeclarationType"/>
- <xs:element name="Articulated" type="xs:boolean"/>
- <xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
- <xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
- <xs:element name="RetarderType" type="v1.0:RetarderTypeType"/>
- <xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P053 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
- <xs:annotation>
- <xs:documentation>P180 - enum</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
- <xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
- <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
- <xs:element name="Components" type="AbstractVehicleComponentsPIFType"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:simpleType name="AccelerationUnitType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="m/s²"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="AngularVelocityUnitType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="rpm"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="CO2UnitType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="g/km"/>
- <xs:enumeration value="g/t-km"/>
- <xs:enumeration value="g/p-km"/>
- <xs:enumeration value="g/m³-km"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="DistanceUnitType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="km"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="EnergyConsumptionUnitType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="MJ/km"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="MassUnitType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="kg"/>
- <xs:enumeration value="t"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="MissionTypeType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="Long Haul EMS"/>
- <xs:enumeration value="Long Haul"/>
- <xs:enumeration value="Regional Delivery EMS"/>
- <xs:enumeration value="Regional Delivery"/>
- <xs:enumeration value="Urban Delivery"/>
- <xs:enumeration value="Municipal Utility"/>
- <xs:enumeration value="Construction"/>
- <xs:enumeration value="Heavy Urban"/>
- <xs:enumeration value="Urban"/>
- <xs:enumeration value="Suburban"/>
- <xs:enumeration value="Interurban"/>
- <xs:enumeration value="Coach"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="PercentType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="%"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="SpeedUnitType">
- <xs:restriction base="xs:token">
- <xs:enumeration value="km/h"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
diff --git a/VectoCore/VectoCore/Utils/XMLDefinitions.cs b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
index df0d9efcdf7d54eee6e5a46a1d891f7af71bf271..8e9a9eb8ea478dcfec116bfb4a4215aef49920be 100644
--- a/VectoCore/VectoCore/Utils/XMLDefinitions.cs
+++ b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
@@ -83,15 +83,9 @@ namespace TUGraz.VectoCore.Utils
public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V22 = DECLARATION_NAMESPACE + ":v2.2";
- public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":DEV:v2.3";
+ public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":v2.3";
- //public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V26 = DECLARATION_NAMESPACE + ":DEV:v2.6";
-
- //public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V28 = DECLARATION_NAMESPACE + ":DEV:v2.8";
-
- public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS = DECLARATION_NAMESPACE + ":DEV:v2.10.2";
-
- public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_COMPONENTS = DECLARATION_NAMESPACE + ":DEV:v2.10.1";
+ public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V24 = DECLARATION_NAMESPACE + ":v2.4";
public const string DECLARATION_INPUT_NAMESPACE = "urn:tugraz:ivt:VectoAPI:DeclarationInput";
@@ -103,9 +97,6 @@ namespace TUGraz.VectoCore.Utils
public const string DECLARATION_PRIMARY_BUS_VEHICLE_NAMESPACE = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation";
- public const string DECLARATION_PRIMARY_BUS_VEHICLE_URI_V01 =
- DECLARATION_PRIMARY_BUS_VEHICLE_NAMESPACE + ":HeavyBus:v0.1";
-
public const string DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE =
"urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile";
@@ -113,13 +104,6 @@ namespace TUGraz.VectoCore.Utils
DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE + ":v0.1";
- public const string DECLARATION_MANUFACTURER_REPORT_V05 = "urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5";
-
- public const string DECLARATION_CUSTOMER_REPORT_V05 = "urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5";
-
- public const string DECLARATION_VTP_REPORT_V01 = "urn:tugraz:ivt:VectoAPI:VTPReport:v0.1";
-
-
public const string XML_SCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance";
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 6e5488a36bb00e5eb504be474f87d86cdfe6a704..2d4c384bf7efe8148c4e79674c531a21109c1f26 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -939,8 +939,6 @@
</EmbeddedResource>
<EmbeddedResource Include="Resources\Declaration\ADAS\ADAS_Combinations.csv" />
<EmbeddedResource Include="Resources\Declaration\VAUX\Fan-Tech-Medium.csv" />
- <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3_DEV.xsd">
- </EmbeddedResource>
<EmbeddedResource Include="Resources\Declaration\Buses\ElectricConsumers.csv" />
<EmbeddedResource Include="Resources\Declaration\Buses\SSMTechList.csv" />
<EmbeddedResource Include="Resources\Declaration\Buses\SSMDefaults.ahsm" />
@@ -958,9 +956,6 @@
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_1-Stage_650ccm.acmp" />
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_2-Stage_398ccm.acmp" />
<EmbeddedResource Include="Resources\Declaration\VAUXBus\DEFAULT_3-Cylinder_2-Stage_598ccm.acmp" />
- <EmbeddedResource Include="Resources\XSD\VectoOutputPrimaryBus.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="Resources\XSD\VectoVTPReport.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
@@ -981,16 +976,16 @@
<EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />
<EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_CI_normalized.vmap" />
<EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_PI_normalized.vmap" />
- <EmbeddedResource Include="Resources\XSD\VectoComponent.2.10.xsd">
+ <EmbeddedResource Include="Resources\XSD\VectoOutputMultistep.0.1.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd">
+ <EmbeddedResource Include="Resources\XSD\VectoComponent.2.1.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.10.2_JobInputData.xsd">
+ <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutputMultistep.0.1.xsd">
+ <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.4.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="Utils\VectoVersionCore.tt">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
index 52f8ab9efe348cbbeb6321ce60ddf7a0f25621c8..f077353554565f54c7656051d74e6e2466ad98ea 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
@@ -611,7 +611,7 @@
<HVAC>
<Technology>Default</Technology>
</HVAC>
- </v2.4:Data>
+ </Data>
</Auxiliaries>
<AirDrag>
<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
index f2188a6248ff6e19a63f222142e08274590d83e4..8e668fe88df09311314a0cd3542d12e3945c7351 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
@@ -11,6 +11,7 @@
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <CargoVolume>20.000</CargoVolume>
<RetarderType>Losses included in Gearbox</RetarderType>
<RetarderRatio>2.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
index a6c822362b5609b82c65ae46e8a1e6fc52777323..9bd1d71faa2817a7fe65617ab64701965d8915d2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
@@ -11,6 +11,7 @@
<AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>6000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
+ <CargoVolume>20.000</CargoVolume>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 8c6b5476a32c7ffe75529a44f2158af26cace7ab..2c9ef0a0eb6b92f8f247c5331db5988363d0c84c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -26,12 +26,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<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 xsi:type="v2.1:AdvancedDriverAssistantSystemsType">
+ <v2.1:EngineStopStart>true</v2.1:EngineStopStart>
+ <v2.1:EcoRollWithoutEngineStop>false</v2.1:EcoRollWithoutEngineStop>
+ <v2.1:EcoRollWithEngineStop>true</v2.1:EcoRollWithEngineStop>
+ <v2.1:PredictiveCruiseControl>1,2,3</v2.1:PredictiveCruiseControl>
+ <!--<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>-->
</ADAS>
<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
<tcl:Entry gear="6" maxTorque="1800"/>
@@ -651,12 +651,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
</HashPreviousStep>
- <Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
- <v2.10.2:Manufacturer>Intermediate Manufacturer 1</v2.10.2:Manufacturer>
- <v2.10.2:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.10.2:ManufacturerAddress>
- <v2.10.2:VIN>VEH-1234567890</v2.10.2:VIN>
- <v2.10.2:Date>2018-02-15T11:00:00Z</v2.10.2:Date>
- <v2.10.2:VehicleDeclarationType>interim</v2.10.2:VehicleDeclarationType>
+ <Vehicle xsi:type="v2.4:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
+ <v2.4:Manufacturer>Intermediate Manufacturer 1</v2.4:Manufacturer>
+ <v2.4:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.4:ManufacturerAddress>
+ <v2.4:VIN>VEH-1234567890</v2.4:VIN>
+ <v2.4:Date>2018-02-15T11:00:00Z</v2.4:Date>
+ <v2.4:VehicleDeclarationType>interim</v2.4:VehicleDeclarationType>
</Vehicle>
<ApplicationInformation>
<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -686,7 +686,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
</HashPreviousStep>
- <vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+ <vif0.1:Vehicle xsi:type="v2.4:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-2234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
index 14fa4aaa716a059300457753979ffa92b9420cce..d0aa1a9383d6e883df0d1f73d1238108bc66dcd6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
<Vehicle id="VEH-class5_Class-5_5t0">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-input_sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-input_sample.xml
index 4c6a16410c1742891139a896417a0bcedbde0433..77dd7eb3eee48835c80b330f743b460b11c422bc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-input_sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-input_sample.xml
@@ -4,9 +4,9 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
<tns:Engine>
- <Data id="">
+ <Data id="asdf">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-sample.xml
index 04885ccbac9f855aafb2dd61896859b4b761bd3f..f91932e4f17577f0fa2939aa9007470544c1f884 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_engine-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
<tns:Engine>
<Data id="ENG-gooZah3D">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_gearbox-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_gearbox-sample.xml
index 8b045a9bcade4bf31f3063d069f037d4459d9c91..1ea5304acb65eda2026f6a3016b2533beb2b489d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_gearbox-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_gearbox-sample.xml
@@ -4,7 +4,7 @@
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
<tns:Gearbox>
<Data id="gbx-vi2Oak2N">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
index c68f769354e58870c1c97c5f1d22e4038d46c3a5..bf28163e91325e459734a5da6fd098c3ce3917c2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
@@ -4,7 +4,7 @@ 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="Vehicle_Exempted_CompletedBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 8f1ad092fa2a6f56969f525e95725c2ced61c1dc..6ba5c9e7429f902b35966ee8f211f234956672fa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/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:v2.4"
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="Vehicle_Exempted_CompletedBusType">
<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:v2.4"
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="Vehicle_Exempted_CompletedBusDeclarationType">
<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/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index ce5dfa4a45f1cf9cdaef4e2c52bb4b6793d8e52e..5d41d4bdc57357c2a19d556f9ea81b94ebe7c456 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -4,7 +4,7 @@ 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="Vehicle_Exempted_CompletedBusType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 71c1adaf12c72c04e7f3af2ea5329d9d4f4914e4..3731a2593bfd5943be3efd5d8fd1b16f8343b709 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/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:v2.4"
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="Vehicle_Exempted_CompletedBusType" >
<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:v2.4"
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="Vehicle_Exempted_CompletedBusDeclarationType" >
<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/vecto_vehicle-new_parameters-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
index 8e11505a1864c7573a15b77d5ceb31a2b836c485..498242e718fd984e6e2cbcd924410fdb87114d67 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-new_parameters-sample.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
index 98ecc6a0e1dc43894389ab5d1f0dba3a1d4f0ade..48c6242e17c1335e61b94448eeeeb201946ae644 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
index 74fb70c4626c2a4e8c8f22f3fb60edc4c6b2da16..4423fe5d7865b0eb6afd370b27c8e519b3313ebf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL_updated.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
index 6cc98897c7daa5b4ea15cad83fa7bfd3237f348e..af6e9783f8b62d60ce628cc2be1b293fb5fdf101 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
index cd2eb30df69e9b7cb1b40183bfb5317f50538877..f4e5327fe4c834aa67a232849d473dc3b0407a75 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
@@ -3,7 +3,7 @@
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
- xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
xmlns:di="http://www.w3.org/2000/09/xmldsig#">
<Vehicle id="VEH-1234567890">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
index f04ac95f9bb71c2413292ac3411bdbda12c26fc4..590c6177a2d72fd3f0730b0675e80688973187cd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
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: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="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<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="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Positionlights>true</Positionlights>
<Brakelights>true</Brakelights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
</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:v2.4"
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: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="Vehicle_Conventional_CompletedBusDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<Model>Sample Bus Model</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>500</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
<ClassBus>II+III</ClassBus>
<NgTankSystem>Compressed</NgTankSystem>
<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<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="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Positionlights>true</Positionlights>
<Brakelights>true</Brakelights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
</HeatPumpTypePassengerCompartment>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index c792951449db21293dbfd84bbca3d8db0ff2830e..4b2686bc34d5acdf74cd4774d9534ef4735b2bcf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/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:v2.4"
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: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="Vehicle_Conventional_CompletedBusDeclarationType" >
<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 xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
</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:v2.4"
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: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="Vehicle_Conventional_CompletedBusDeclarationType" >
<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>
<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
<ClassBus>A</ClassBus>
<NgTankSystem>Compressed</NgTankSystem>
<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 xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
<LEDLights>
<Interiorlights>false</Interiorlights>
<Dayrunninglights>true</Dayrunninglights>
<Headlights>false</Headlights>
</LEDLights>
</ElectricSystem>
<HVAC>
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index 1fdead4acad3f22cc2390f910f4431a0d371e6e4..62ed4800347b74e5bf195afd5443980f4f13562e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/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:v2.4" 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: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="Vehicle_Conventional_CompletedBusDeclarationType">
<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>
<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<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="AUX_Conventional_CompletedBusType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>none</Cooling>
<Heating>non R-744 2-stage</Heating>
</HeatPumpTypePassengerCompartment>
</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:v2.4" 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: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="Vehicle_Conventional_CompletedBusDeclarationType">
<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>
<ClassBus>II+III</ClassBus>
<NgTankSystem>Compressed</NgTankSystem>
<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
<VehicleLength>9500</VehicleLength>
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<VehicleDeclarationType>interim</VehicleDeclarationType>
<ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>true</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
</ADAS>
<Components xsi:type="Components_Conventional_CompletedBusType">
<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="AUX_Conventional_CompletedBusType">
<HVAC>
<SystemConfiguration>0</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>none</Cooling>
<Heating>none</Heating>
</HeatPumpTypeDriverCompartment>
<HeatPumpTypePassengerCompartment>
<Cooling>none</Cooling>
<Heating>non R-744 2-stage</Heating>
</HeatPumpTypePassengerCompartment>
</HVAC>
</Data>
</Auxiliaries>
</Components>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 6742018bd43b9e72f4e62ca951dac0439a489f17..c4d4afe1e8883930a895bb673d2270d86e2a24b5 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -6182,9 +6182,6 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_tyre-sample.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_vehicle-fullElectricSP.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel_WHR.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index 2e660b0e412272c47320538a3ed54bbec69f1cc1..c968c50c9130d675e619a2fe028e614f9c0db7b5 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -1621,7 +1621,12 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
- Assert.IsNull(vehicle.CargoVolume);
+ if (vehicle.VehicleCategory == VehicleCategory.Van) {
+ Assert.AreEqual(20, vehicle.CargoVolume.Value());
+ } else {
+ Assert.IsNull(vehicle.CargoVolume);
+ }
+
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
@@ -1931,7 +1936,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AxleGearInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
- Assert.IsNull(vehicle.CargoVolume);
+ Assert.AreEqual(20, vehicle.CargoVolume.Value());
}
else
{
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs
index 44c955937991112f459412a51cced070a45d4b24..a2d5328e050765130292be2864bb4813733f699d 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs
@@ -96,7 +96,12 @@ namespace TUGraz.VectoCore.Tests.XML
private void TestMediumLorryParameterSequenceGroup2(IXMLDeclarationVehicleData vehicle)
{
- Assert.IsNull(vehicle.CargoVolume);
+ if (vehicle.VehicleCategory == VehicleCategory.Van) {
+ Assert.AreEqual(20, vehicle.CargoVolume.Value());
+ } else {
+ Assert.IsNull(vehicle.CargoVolume);
+ }
+
Assert.AreEqual(AngledriveType.None, vehicle.AngledriveType);
Assert.AreEqual(true, vehicle.ZeroEmissionVehicle);
Assert.IsNull(vehicle.TankSystem);
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 74cb618247601a6763304772318e1dbd8e956131..12bfb259408bfbbb086e9645b977c9ef9481ab30 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep 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.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep 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:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +46,9 @@
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
- <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
- <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+ <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+ <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>
@@ -585,7 +589,7 @@
<di:DigestValue/>
</di:Reference>
</HashPreviousStep>
- <vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+ <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
@@ -609,7 +613,7 @@
<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
<VehicleDeclarationType>final</VehicleDeclarationType>
<Components xsi:type="Components_Conventional_CompletedBusType">
- <v2.10.2:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <v2.4:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
<Manufacturer>Generic Manufacturer</Manufacturer>
<Model>Generic Model</Model>
@@ -630,7 +634,7 @@
<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
</di:Reference>
</Signature>
- </v2.10.2:AirDrag>
+ </v2.4:AirDrag>
<Auxiliaries>
<Data xsi:type="AUX_Conventional_CompletedBusType">
<ElectricSystem>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index f11e469ddd769363cead6d2afe02a69a8c3e3e4b..bff61ff9ed3f1b9152dfe45df7ea915c422481ae 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep 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" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep 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:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
<RatedPower>325032</RatedPower>
<MaxEngineTorque>2134</MaxEngineTorque>
<WHRType>
- <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
- <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
- <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+ <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+ <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
</WHRType>
<Mode>
<IdlingSpeed>600</IdlingSpeed>