diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 3e8b3885c638e061c39182469323b23ae91a5b22..679881a4625d3dd42031c2433c7d7ac0bb914b3d 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -656,6 +656,8 @@ Public Class DummyVehicle
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingUpperDeck
Public ReadOnly Property CargoVolume As CubicMeter Implements IVehicleDeclarationInputData.CargoVolume
Public ReadOnly Property VehicleCode As VehicleCode? Implements IVehicleDeclarationInputData.VehicleCode
Public Property CurbMassExtra As Kilogram Implements IVehicleEngineeringInputData.CurbMassExtra
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 1132b4f76cf5b437365b4007fc5daf681ba5e43f..83c21b861b6a79595320ee2aa40dff649f20281f 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -842,6 +842,8 @@ Public Class MockEngineeringVehicle
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingUpperDeck
Public ReadOnly Property CargoVolume As CubicMeter Implements IVehicleDeclarationInputData.CargoVolume
Public ReadOnly Property VehicleCode As VehicleCode? Implements IVehicleDeclarationInputData.VehicleCode
Public ReadOnly Property LowEntry As Boolean? Implements IVehicleDeclarationInputData.LowEntry
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index 1f7a3f1295683574ba845fb9d97eb31516f93980..b2eea0f6e17419969899ddaab8cb17bd84b5dc14 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -44,6 +44,8 @@ Public Class MockVehicleInputData
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingUpperDeck
Public ReadOnly Property CargoVolume As CubicMeter Implements IVehicleDeclarationInputData.CargoVolume
Public ReadOnly Property VehicleCode As VehicleCode? Implements IVehicleDeclarationInputData.VehicleCode
Public ReadOnly Property LowEntry As Boolean? Implements IVehicleDeclarationInputData.LowEntry
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 368170fc496d23427c9f9f0845bc9d98fd50a3cc..68a60941db283f8fd70672a32f3d49808a17003b 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -859,6 +859,8 @@ end Property
Public ReadOnly Property RegisteredClass As RegistrationClass? Implements IVehicleDeclarationInputData.RegisteredClass
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingLowerDeck
+ Public ReadOnly Property NumberOfPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberOfPassengersStandingUpperDeck
Public ReadOnly Property CargoVolume As CubicMeter Implements IVehicleDeclarationInputData.CargoVolume
Public ReadOnly Property VehicleCode As VehicleCode? Implements IVehicleDeclarationInputData.VehicleCode
Public ReadOnly Property LowEntry As Boolean? Implements IVehicleDeclarationInputData.LowEntry
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 9d35cd05d90a21a0313885155db7fdd0531a6ee2..8e11b241c0a9c758613c49f7ba0a50382a9bd2f6 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -175,6 +175,10 @@ namespace TUGraz.VectoCommon.InputData
int? NumberOfPassengersLowerDeck { get; }
+ int? NumberOfPassengersStandingLowerDeck { get; }
+
+ int? NumberOfPassengersStandingUpperDeck { get; }
+
// only used for medium lorries type VAN
CubicMeter CargoVolume { get; }
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 8dc7401d439359d3eba97bd625ccb896aab271ab..796ce51d7b2c044255c565f821aabdb8d746f1d8 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -780,6 +780,24 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to NumberPassengerSeatsLowerDeck.
+ /// </summary>
+ public static string Bus_NumberPassengerSeatsLowerDeck {
+ get {
+ return ResourceManager.GetString("Bus_NumberPassengerSeatsLowerDeck", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to NumberPassengerSeatsUpperDeck.
+ /// </summary>
+ public static string Bus_NumberPassengerSeatsUpperDeck {
+ get {
+ return ResourceManager.GetString("Bus_NumberPassengerSeatsUpperDeck", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to NumberPassengersLowerDeck.
/// </summary>
@@ -789,6 +807,24 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to NumberPassengersStandingLowerDeck.
+ /// </summary>
+ public static string Bus_NumberPassengersStandingLowerDeck {
+ get {
+ return ResourceManager.GetString("Bus_NumberPassengersStandingLowerDeck", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to NumberPassengersStandingUpperDeck.
+ /// </summary>
+ public static string Bus_NumberPassengersStandingUpperDeck {
+ get {
+ return ResourceManager.GetString("Bus_NumberPassengersStandingUpperDeck", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to NumberPassengersUpperDeck.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 17b740e0859d86e3140ccd00d1c33152dba033e4..d795c59690f28677a4c01c748b1cd935fce7bb08 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1515,4 +1515,16 @@
<data name="Bus_ChassisConfiguration" xml:space="preserve">
<value>ChassisConfiguration</value>
</data>
+ <data name="Bus_NumberPassengerSeatsLowerDeck" xml:space="preserve">
+ <value>NumberPassengerSeatsLowerDeck</value>
+ </data>
+ <data name="Bus_NumberPassengerSeatsUpperDeck" xml:space="preserve">
+ <value>NumberPassengerSeatsUpperDeck</value>
+ </data>
+ <data name="Bus_NumberPassengersStandingLowerDeck" xml:space="preserve">
+ <value>NumberPassengersStandingLowerDeck</value>
+ </data>
+ <data name="Bus_NumberPassengersStandingUpperDeck" xml:space="preserve">
+ <value>NumberPassengersStandingUpperDeck</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 843fd572704799102f05dba42638a2a16f50ea53..e8624bbb9c597155c747de8317f31c0440814253 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -577,6 +577,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return 0; }
}
+ public int? NumberOfPassengersStandingLowerDeck
+ {
+ get { return 0; }
+ }
+ public int? NumberOfPassengersStandingUpperDeck
+ {
+ get { return 0; }
+ }
+
public CubicMeter CargoVolume
{
get { return VehicleData.CargoVolume; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 9454ee1416c97690e0d6ff050d8a6bdfa9bf2728..efc04acf7865f34eed0bf95000892ccb1118ce3a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -662,6 +662,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return 0; }
}
+ public int? NumberOfPassengersStandingLowerDeck
+ {
+ get { return 0; }
+ }
+ public int? NumberOfPassengersStandingUpperDeck
+ {
+ get { return 0; }
+ }
+
public virtual CubicMeter CargoVolume {
get { return 0.SI<CubicMeter>(); }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index ffcb82c7496d14fe033ea7980c48f49598679d15..cf6fbc6dfbd1c79272d020910aca2e66f3ba106d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -293,6 +293,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return 0; }
}
+ public virtual int? NumberOfPassengersStandingLowerDeck
+ {
+ get { return 0; }
+ }
+ public virtual int? NumberOfPassengersStandingUpperDeck
+ {
+ get { return 0; }
+ }
+
public virtual CubicMeter CargoVolume
{
get { return 0.SI<CubicMeter>(); }
@@ -1064,6 +1073,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public LegislativeClass? LegislativeClass { get; }
public int? NumberOfPassengersUpperDeck { get; }
public int? NumberOfPassengersLowerDeck { get; }
+ public int? NumberOfPassengersStandingLowerDeck { get; }
+ public int? NumberOfPassengersStandingUpperDeck { get; }
+
public CubicMeter CargoVolume
{
get { return 0.SI<CubicMeter>(); }
@@ -1221,9 +1233,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
get
{
- if (!ElementExists(XMLNames.Bus_NumberPassengersLowerDeck))
+ if (!ElementExists(XMLNames.Bus_NumberPassengerSeatsLowerDeck))
return null;
- var node = GetNode(XMLNames.Bus_NumberPassengersLowerDeck);
+ var node = GetNode(XMLNames.Bus_NumberPassengerSeatsLowerDeck);
return XmlConvert.ToInt32(node.InnerText);
}
}
@@ -1232,13 +1244,37 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
get
{
- if (!ElementExists(XMLNames.Bus_NumberPassengersUpperDeck))
+ if (!ElementExists(XMLNames.Bus_NumberPassengerSeatsUpperDeck))
return null;
- var node = GetNode(XMLNames.Bus_NumberPassengersUpperDeck);
+ var node = GetNode(XMLNames.Bus_NumberPassengerSeatsUpperDeck);
+ return XmlConvert.ToInt32(node.InnerText);
+ }
+ }
+
+ public override int? NumberOfPassengersStandingLowerDeck
+ {
+ get
+ {
+ if (!ElementExists(XMLNames.Bus_NumberPassengersStandingLowerDeck))
+ return null;
+ var node = GetNode(XMLNames.Bus_NumberPassengersStandingLowerDeck);
return XmlConvert.ToInt32(node.InnerText);
}
}
+ public override int? NumberOfPassengersStandingUpperDeck
+ {
+ get
+ {
+ if (!ElementExists(XMLNames.Bus_NumberPassengersStandingUpperDeck))
+ return null;
+ var node = GetNode(XMLNames.Bus_NumberPassengersStandingUpperDeck);
+ return XmlConvert.ToInt32(node.InnerText);
+ }
+ }
+
+
+
public override VehicleCode? VehicleCode
{
get
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 412aada4f1daa0a46fa2b89329f2f3925e207ded..ca94ebd37184b39e85ec1d185738d73e068c5fd8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -517,18 +517,22 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public int? NumberOfPassengersUpperDeck
{
- get
- {
- return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersUpperDeck));
- }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersUpperDeck)); }
}
public int? NumberOfPassengersLowerDeck
{
- get
- {
- return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersLowerDeck));
- }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersLowerDeck)); }
+ }
+
+ public int? NumberOfPassengersStandingLowerDeck
+ {
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersStandingLowerDeck)); }
+ }
+
+ public int? NumberOfPassengersStandingUpperDeck
+ {
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersStandingUpperDeck)); }
}
public VehicleCode? VehicleCode
@@ -695,6 +699,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
&& InputComplete(RegisteredClass, nameof(RegisteredClass))
&& InputComplete(NumberOfPassengersLowerDeck, nameof(NumberOfPassengersLowerDeck))
&& InputComplete(NumberOfPassengersUpperDeck, nameof(NumberOfPassengersUpperDeck))
+ && InputComplete(NumberOfPassengersStandingLowerDeck, nameof(NumberOfPassengersStandingLowerDeck))
+ && InputComplete(NumberOfPassengersStandingUpperDeck, nameof(NumberOfPassengersStandingUpperDeck))
&& InputComplete(VehicleCode, nameof(VehicleCode))
&& InputComplete(LowEntry, nameof(LowEntry)) && InputComplete(Height, nameof(Height))
&& InputComplete(Length, nameof(Length)) && InputComplete(Width, nameof(Width))
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 7c20bc07e13eaef484383e2225c029f8de707c77..3aee373c8cc1b0c8b7fe6dfbd6046129b13e283e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -209,6 +209,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public virtual RegistrationClass? RegisteredClass { get { return RegistrationClass.unknown;} }
public virtual int? NumberOfPassengersUpperDeck { get { return 0; } }
public virtual int? NumberOfPassengersLowerDeck { get { return 0; } }
+ public int? NumberOfPassengersStandingLowerDeck { get { return 0; } }
+ public int? NumberOfPassengersStandingUpperDeck { get { return 0; } }
public CubicMeter CargoVolume { get; }
public virtual VehicleCode? VehicleCode { get { return VectoCommon.Models.VehicleCode.NOT_APPLICABLE; } }
public virtual bool? LowEntry { get { return false; } }
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
index 0c07eb3f3ddf3d98fd2e04360f1df67d815d80d4..90ff95329fa446768c9bac3534fef96b669ecc77 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
@@ -223,9 +223,13 @@ namespace TUGraz.VectoCore.OutputData.XML
_vehicleInputData.RegisteredClass != null
? new XElement(v28 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
_vehicleInputData.NumberOfPassengersLowerDeck != null
- ? new XElement(v28 + XMLNames.Bus_NumberPassengersLowerDeck, _vehicleInputData.NumberOfPassengersLowerDeck) : null,
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberOfPassengersLowerDeck) : null,
+ _vehicleInputData.NumberOfPassengersStandingLowerDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberOfPassengersStandingLowerDeck) : null,
_vehicleInputData.NumberOfPassengersUpperDeck != null
- ? new XElement(v28 + XMLNames.Bus_NumberPassengersUpperDeck, _vehicleInputData.NumberOfPassengersUpperDeck) : null,
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberOfPassengersUpperDeck) : null,
+ _vehicleInputData.NumberOfPassengersStandingUpperDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberOfPassengersStandingUpperDeck) : null,
_vehicleInputData.VehicleCode != null
? new XElement(v28 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
_vehicleInputData.LowEntry != null
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
index 701142d954d1db19e5faedd515ff1c5bb3be99ec..49ee9ef7852834f924e8f6e1324e980a8541968d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus-sample.xml
@@ -12,7 +12,7 @@
<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
-
+ <RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<v2.6:ADAS xsi:type="v2.1:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
index 8e75aaa503aa0704aec5add457c381ce00e2803f..aa01f826f3343f45922fe4717646f37d704188f6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
@@ -18,10 +18,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
- <NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
+ <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
- <NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
- <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+ <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
<BodyworkCode>CB</BodyworkCode>
<LowEntry>false</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample_group41.xml
index 8db17d3e2dd72669113803a63500cc3c932560a2..7f2549432b7cd109b1d30db6ebb5cbf56e106a3e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample_group41.xml
@@ -18,8 +18,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto
<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
<NgTankSystem>Compressed</NgTankSystem>
<ClassBus>II+III</ClassBus>
- <NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
- <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+ <NumberPassengerSeatsLowerDeck>2</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>11</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>12</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>3</NumberPassengersStandingUpperDeck>
<BodyworkCode>CA</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>3000</HeightIntegratedBody>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index c4b5ae105e41bcb89040586a7cb1e75e4fc30a00..0f1a6b00a4c12c975d46159a5c7af810d97a7105 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -658,10 +658,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
<v2.8:Model>Intermediate Model 1</v2.8:Model>
<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
- <v2.8:NumberPassengerSeatsLowerDeck>10</v2.8:NumberPassengerSeatsLowerDeck>
+ <v2.8:NumberPassengerSeatsLowerDeck>11</v2.8:NumberPassengerSeatsLowerDeck>
<v2.8:NumberPassengersStandingLowerDeck>3</v2.8:NumberPassengersStandingLowerDeck>
- <v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
- <v2.8:NumberPassengersStandingUpperDeck>0</v2.8:NumberPassengersStandingUpperDeck>
+ <v2.8:NumberPassengerSeatsUpperDeck>31</v2.8:NumberPassengerSeatsUpperDeck>
+ <v2.8:NumberPassengersStandingUpperDeck>1</v2.8:NumberPassengersStandingUpperDeck>
<v2.8:LowEntry>true</v2.8:LowEntry>
<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
<v2.8:VehicleLength>12000</v2.8:VehicleLength>
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index aba904f0e8e318877f4da92dc1aad2c168ccf031..e9da5f3d54302dd25be94983a574dbcad538fd49 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -51,6 +51,8 @@ namespace TUGraz.VectoCore.Tests.Utils {
public RegistrationClass? RegisteredClass { get; set; }
public int? NumberOfPassengersUpperDeck { get; set; }
public int? NumberOfPassengersLowerDeck { get; set; }
+ public int? NumberOfPassengersStandingLowerDeck { get; set; }
+ public int? NumberOfPassengersStandingUpperDeck { get; set; }
public CubicMeter CargoVolume { get; }
public VehicleCode? VehicleCode { get; set; }
public bool? LowEntry { get; }
@@ -122,6 +124,8 @@ namespace TUGraz.VectoCore.Tests.Utils {
public RegistrationClass? RegisteredClass { get; set; }
public int? NumberOfPassengersUpperDeck { get; set; }
public int? NumberOfPassengersLowerDeck { get; set; }
+ public int? NumberOfPassengersStandingLowerDeck { get; set; }
+ public int? NumberOfPassengersStandingUpperDeck { get; set; }
public CubicMeter CargoVolume { get; }
public VehicleCode? VehicleCode { get; set; }
public bool? LowEntry { get; }
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index d2a62c1c66ebc06162604df63d5508a71d9a4567..29cace4f5b60d1d236b7d5190e9b2611c628ff09 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -61,8 +61,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Liquefied, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(RegistrationClass.B, vehicle.RegisteredClass);//ClassBus
- Assert.AreEqual(10, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(30, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(11, vehicle.NumberOfPassengersLowerDeck);
+ Assert.AreEqual(31, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(3, vehicle.NumberOfPassengersStandingLowerDeck);
+ Assert.AreEqual(1, vehicle.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(3, vehicle.Height.Value());//HeightIntegratedBody
@@ -134,6 +136,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus
Assert.AreEqual(null, vehicle.NumberOfPassengersLowerDeck);
Assert.AreEqual(null, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(null, vehicle.NumberOfPassengersStandingLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(null, vehicle.VehicleCode);
Assert.AreEqual(null, vehicle.LowEntry);
Assert.AreEqual(null, vehicle.Height);//HeightIntegratedBody
@@ -167,8 +171,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus
- Assert.AreEqual(10, vehicle.NumberOfPassengersLowerDeck);
+ Assert.AreEqual(12, vehicle.NumberOfPassengersLowerDeck);
+ Assert.AreEqual(5, vehicle.NumberOfPassengersStandingLowerDeck);
Assert.AreEqual(30, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(4, vehicle.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(3, vehicle.Height.Value());//HeightIntegratedBody
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 3664a684f9a39b5b6b62e93fade955e3e362ff51..6495c59d2b076a603f04190ac3febc73cbf61d72 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -707,8 +707,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Liquefied, vehicleData.TankSystem);
Assert.AreEqual(RegistrationClass.B, vehicleData.RegisteredClass);
- Assert.AreEqual(30, vehicleData.NumberOfPassengersLowerDeck);
- Assert.AreEqual(24, vehicleData.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(24, vehicleData.NumberOfPassengersLowerDeck);
+ Assert.AreEqual(30, vehicleData.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(7, vehicleData.NumberOfPassengersStandingLowerDeck);
+ Assert.AreEqual(4, vehicleData.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CA, vehicleData.VehicleCode);
Assert.AreEqual(true, vehicleData.LowEntry);
Assert.AreEqual(2.5.SI<Meter>(), vehicleData.Height);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 414a3f058c3c9f59790c078f8ad8b3af96c6d583..ca7808896650f2e80096d013722e63917bc3c495 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -51,8 +51,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(false, vehicle.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(RegistrationClass.II_III, vehicle.RegisteredClass);//ClassBus
- Assert.AreEqual(0, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(10, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(1, vehicle.NumberOfPassengersLowerDeck);
+ Assert.AreEqual(10, vehicle.NumberOfPassengersStandingLowerDeck);
+ Assert.AreEqual(11, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(2, vehicle.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(false, vehicle.LowEntry);
Assert.AreEqual(2.5, vehicle.Height.Value());//HeightIntegratedBody
@@ -194,6 +196,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.RegisteredClass);
Assert.AreEqual(null, vehicle.NumberOfPassengersLowerDeck);
Assert.AreEqual(null, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(null, vehicle.NumberOfPassengersStandingLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberOfPassengersStandingUpperDeck);
Assert.AreEqual(null, vehicle.VehicleCode);
Assert.AreEqual(null, vehicle.LowEntry);
Assert.AreEqual(null, vehicle.Height);