diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index cf329f934f631be13551886d281d772db989792c..e77666415872ab32c46c7b7aeedc013904e1eb2a 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -3309,6 +3309,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Articulated.
+ /// </summary>
+ public static string Vehicle_Articulated {
+ get {
+ return ResourceManager.GetString("Vehicle_Articulated", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to AxleConfiguration.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index b5be7241f61adfabc16eda3b414046ad4de493bd..9f03a15cde555d8470e49e62754add96f2e5451d 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1359,4 +1359,7 @@
<data name="Bus_Smart_Electrics" xml:space="preserve">
<value>SmartElectrics</value>
</data>
+ <data name="Vehicle_Articulated" xml:space="preserve">
+ <value>Articulated</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 2d7ff65ec4add115173dd5acd14a52567c21a7cd..91c6397f5ca819b477bd676741ba15340990a274 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -682,6 +682,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return VehicleCategory.HeavyBusPrimaryVehicle; }
}
+ public override bool Articulated
+ {
+ get { return GetBool(XMLNames.Vehicle_Articulated); }
+ }
+
public override Kilogram CurbMassChassis
{
get { return null; }
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
index b6ed2f93d53c776adfe6a7cf6b8fd499e1ea2fac..795753f237cec86300f32b8e48472777060ce413 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
@@ -107,6 +107,7 @@ namespace TUGraz.VectoCore.OutputData.XML
tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
new XElement(tns + XMLNames.Vehicle_VehicleCategory, modelData.VehicleData.VehicleCategory.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
+ new XElement(tns + XMLNames.Vehicle_Articulated, modelData.VehicleData.InputData.Articulated),
new XElement(tns + XMLNames.TPMLM, modelData.VehicleData.GrossVehicleMass.ToXMLFormat(0)),
new XElement(tns + XMLNames.Vehicle_IdlingSpeed, modelData.EngineData.IdleSpeed.AsRPM.ToXMLFormat(0)),
new XElement(tns + XMLNames.Vehicle_RetarderType, modelData.Retarder.Type.ToXMLFormat()),
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index ac5b604ab3417af97a34272f0660bee6fc807204..eef939da1c41b93e2d11c1207f03724fd0dcf650 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -378,6 +378,7 @@
<xs:documentation>P037 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="Articulated" type="xs:boolean"/>
<xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
<xs:annotation>
<xs:documentation>P041 - [kg]</xs:documentation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
index 74a8d3fc106493a7b30c40c4dd7826bed0c0392d..311ca5a816dc1112c5c3f7c3c25d1b24c714846a 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryBus.xsd
@@ -556,6 +556,7 @@
<xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
<xs:element name="VehicleCategory" type="v2.6:VehicleCategoryDeclarationType"/>
<xs:element name="AxleConfiguration" type="v1.0: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"/>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index b5333ddd960f252213ce560529bd07184627fb11..7f78e455707996c7160923f46c9d67fff81112fc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index 0ba7996085b33943a421f4bbfc7d6309381626ad..e1ea508991fbf603715d7b57b02b5aebb4916ff1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index a9a9dc24166d15356ee73bcc780265e46eb932ad..88c69aa3a71e1b1eb4261ca045e169231450b1c6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index ae545f8ff491bab0e16a7f8035ccdd1811420292..8d44c2a09401282e221ac1d1f02c89348ec07dc2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index ae0ed133e57bebaa876d2ca299a0596839d73645..fb46bdf13dd540088665f3ee4b9120a012fdc5c4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
index ad35e340f86ffcdaeb1bb134d9303e58aeec10b3..ae29a1f7fba696c5237cd44e323536b32f3072bb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml
@@ -12,6 +12,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:PrimaryVehicleInformation E:\QUAM\Wo
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
index 871132ac549703d980e650af0325ad64d1dd2893..def5dda88f434cf5c5264d08cffabf944a0b130b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
@@ -8,6 +8,7 @@
<Date>2017-02-15T11:00:00Z</Date>
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>