diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 679881a4625d3dd42031c2433c7d7ac0bb914b3d..8d3fa15223a3f2ec11023195f1810c103e7066ae 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -654,10 +654,10 @@ Public Class DummyVehicle
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
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 NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
+ Public ReadOnly Property NumberPassengerSeatsLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck
+ Public ReadOnly Property NumberPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingLowerDeck
+ Public ReadOnly Property NumberPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingUpperDeck
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 83c21b861b6a79595320ee2aa40dff649f20281f..3f24eecc22bf20f68c58b07050e50057c4a612d0 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -840,10 +840,10 @@ Public Class MockEngineeringVehicle
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
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 NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
+ Public ReadOnly Property NumberPassengerSeatsLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck
+ Public ReadOnly Property NumberPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingLowerDeck
+ Public ReadOnly Property NumberPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingUpperDeck
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 b2eea0f6e17419969899ddaab8cb17bd84b5dc14..0ff5fff18194700bcd5118c54631dc26b275fbf9 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -42,10 +42,10 @@ Public Class MockVehicleInputData
Public Property MaxNetPower1 As Watt Implements IVehicleDeclarationInputData.MaxNetPower1
Public Property MaxNetPower2 As Watt Implements IVehicleDeclarationInputData.MaxNetPower2
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 NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
+ Public ReadOnly Property NumberPassengerSeatsLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck
+ Public ReadOnly Property NumberPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingLowerDeck
+ Public ReadOnly Property NumberPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingUpperDeck
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 68a60941db283f8fd70672a32f3d49808a17003b..0f7a5c17023195260d25c064d956b8677c4c7689 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -857,10 +857,10 @@ end Property
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 NumberPassengerSeatsUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck
+ Public ReadOnly Property NumberPassengerSeatsLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck
+ Public ReadOnly Property NumberPassengersStandingLowerDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingLowerDeck
+ Public ReadOnly Property NumberPassengersStandingUpperDeck As Integer? Implements IVehicleDeclarationInputData.NumberPassengersStandingUpperDeck
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/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs b/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
index a737e015259b0f74403dedfe49aad9955f06c68a..2d7d647616833dfbf98bc14aa5c54a90797095cb 100644
--- a/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
@@ -280,8 +280,8 @@ namespace VECTO3GUI.ViewModel.Impl
CurbMassChassis = vehicle.CurbMassChassis;
TechnicalPermissibleMaximumLadenMass = vehicle.GrossVehicleMassRating;
NgTankSystem = vehicle.TankSystem;
- NumberOfPassengersLowerDeck = vehicle.NumberOfPassengersLowerDeck;
- NumberOfPassengersUpperDeck = vehicle.NumberOfPassengersUpperDeck;
+ NumberOfPassengersLowerDeck = vehicle.NumberPassengerSeatsLowerDeck;
+ NumberOfPassengersUpperDeck = vehicle.NumberPassengerSeatsUpperDeck;
LowEntry = vehicle.LowEntry;
HeightIntegratedBody = vehicle.Height;
VehicleLength = vehicle.Length;
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index 1d637e51d3e180c088f7134b26b6528c92d6d130..df17728c991678b71d8fdbe8018ef36278cde452 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -238,8 +238,8 @@ namespace VECTO3GUI2020.Util.XML.Implementation
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_NgTankSystem, _inputData.TankSystem));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_RegisteredClass, _inputData.RegisteredClass.ToXMLFormat()));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_NumberPassengersLowerDeck, _inputData.NumberOfPassengersLowerDeck));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_NumberPassengersUpperDeck, _inputData.NumberOfPassengersUpperDeck));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_NumberPassengersLowerDeck, _inputData.NumberPassengerSeatsLowerDeck));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_NumberPassengersUpperDeck, _inputData.NumberPassengerSeatsUpperDeck));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_BodyworkCode, _inputData.VehicleCode.ToXMLFormat()));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_LowEntry, _inputData.LowEntry));
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
index acb4986d545aaceafcced71f60eef36ab701326c..f392cd0d80a25d21fe76338a339a4268707d987d 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
@@ -283,8 +283,8 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle
}
RegistrationClass? IVehicleDeclarationInputData.RegisteredClass { get; }
- int? IVehicleDeclarationInputData.NumberOfPassengersUpperDeck { get; }
- int? IVehicleDeclarationInputData.NumberOfPassengersLowerDeck { get; }
+ int? IVehicleDeclarationInputData.NumberPassengerSeatsUpperDeck { get; }
+ int? IVehicleDeclarationInputData.NumberPassengerSeatsLowerDeck { get; }
public virtual RegistrationClass RegisteredClass
{
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index a2c6a05b8ff99d2cb88ea17530a65a925484f656..43e1e09b55c8745cd93ce0aaea6157009198eb18 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -182,8 +182,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
nameof(TankSystem),
nameof(AirdragModifiedEnum),
nameof(RegisteredClass),
- nameof(NumberOfPassengersUpperDeck),
- nameof(NumberOfPassengersLowerDeck),
+ nameof(NumberPassengerSeatsUpperDeck),
+ nameof(NumberPassengerSeatsLowerDeck),
nameof(VehicleCode),
nameof(LowEntry),
nameof(HeightInMm),
@@ -252,9 +252,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
NumberOfPassengersEditingEnabled = param.EditingEnabled;
};
- _parameterViewModels[nameof(NumberOfPassengersUpperDeck)].EditingChangedCallback =
+ _parameterViewModels[nameof(NumberPassengerSeatsUpperDeck)].EditingChangedCallback =
PassengerGroupEditingCallback;
- _parameterViewModels[nameof(NumberOfPassengersLowerDeck)].EditingChangedCallback =
+ _parameterViewModels[nameof(NumberPassengerSeatsLowerDeck)].EditingChangedCallback =
PassengerGroupEditingCallback;
_parameterViewModels[nameof(AirdragModifiedEnum)].EditingChangedCallback = model => {
@@ -338,8 +338,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
AirdragModifiedMultistage = vehicleInputData.AirdragModifiedMultistage;
TankSystem = vehicleInputData.TankSystem;
RegisteredClass = vehicleInputData.RegisteredClass;
- NumberOfPassengersUpperDeck = vehicleInputData.NumberOfPassengersUpperDeck;
- NumberOfPassengersLowerDeck = vehicleInputData.NumberOfPassengersLowerDeck;
+ NumberPassengerSeatsUpperDeck = vehicleInputData.NumberPassengerSeatsUpperDeck;
+ NumberPassengerSeatsLowerDeck = vehicleInputData.NumberPassengerSeatsLowerDeck;
VehicleCode = vehicleInputData.VehicleCode;
LowEntry = vehicleInputData.LowEntry;
MeasurementsGroupEditingEnabled =
@@ -547,21 +547,21 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
if (SetProperty(ref _numberOfPassengersEditingEnabled, value)) {
- _parameterViewModels[nameof(NumberOfPassengersUpperDeck)].EditingEnabled = value;
- _parameterViewModels[nameof(NumberOfPassengersLowerDeck)].EditingEnabled = value;
+ _parameterViewModels[nameof(NumberPassengerSeatsUpperDeck)].EditingEnabled = value;
+ _parameterViewModels[nameof(NumberPassengerSeatsLowerDeck)].EditingEnabled = value;
}
}
}
- public int? NumberOfPassengersUpperDeck
+ public int? NumberPassengerSeatsUpperDeck
{
get { return _numberOfPassengersUpperDeck; }
set { SetProperty(ref _numberOfPassengersUpperDeck, value); }
}
- public int? NumberOfPassengersLowerDeck
+ public int? NumberPassengerSeatsLowerDeck
{
get { return _numberOfPassengersLowerDeck; }
set { SetProperty(ref _numberOfPassengersLowerDeck, value); }
diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
index ff2bb6a09b9c11fc5579c2335a97b184ac7cd076..5b6209ca4023763443532063103255ed826f3cb6 100644
--- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
@@ -268,8 +268,8 @@ namespace Vecto3GUI2020Test
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(0, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(10, vehicle.NumberPassengerSeatsUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(false, vehicle.LowEntry);
Assert.AreEqual(2.5, vehicle.Height.Value());//HeightIntegratedBody
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 031139211502c8391f7e3dfbb718984bb32407b8..88e5b85a4869d9badf6011951513bfe508be1b1e 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -171,13 +171,13 @@ namespace TUGraz.VectoCommon.InputData
RegistrationClass? RegisteredClass { get; }
- int? NumberOfPassengersUpperDeck { get; }
+ int? NumberPassengerSeatsUpperDeck { get; }
- int? NumberOfPassengersLowerDeck { get; }
+ int? NumberPassengerSeatsLowerDeck { get; }
- int? NumberOfPassengersStandingLowerDeck { get; }
+ int? NumberPassengersStandingLowerDeck { get; }
- int? NumberOfPassengersStandingUpperDeck { get; }
+ int? NumberPassengersStandingUpperDeck { get; }
// only used for medium lorries type VAN
CubicMeter CargoVolume { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index e8624bbb9c597155c747de8317f31c0440814253..aa0e5815a8293e7ae0035bcc8ef301f66b85d5f7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -567,21 +567,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return RegistrationClass.unknown; }
}
- public int? NumberOfPassengersUpperDeck
+ public int? NumberPassengerSeatsUpperDeck
{
get { return 0; }
}
- public int? NumberOfPassengersLowerDeck
+ public int? NumberPassengerSeatsLowerDeck
{
get { return 0; }
}
- public int? NumberOfPassengersStandingLowerDeck
+ public int? NumberPassengersStandingLowerDeck
{
get { return 0; }
}
- public int? NumberOfPassengersStandingUpperDeck
+ public int? NumberPassengersStandingUpperDeck
{
get { return 0; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index efc04acf7865f34eed0bf95000892ccb1118ce3a..cd231ad39666df421a3091944a5d571dde2b6170 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -652,21 +652,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return RegistrationClass.unknown; }
}
- public virtual int? NumberOfPassengersUpperDeck
+ public virtual int? NumberPassengerSeatsUpperDeck
{
get { return 0; }
}
- public virtual int? NumberOfPassengersLowerDeck
+ public virtual int? NumberPassengerSeatsLowerDeck
{
get { return 0; }
}
- public int? NumberOfPassengersStandingLowerDeck
+ public int? NumberPassengersStandingLowerDeck
{
get { return 0; }
}
- public int? NumberOfPassengersStandingUpperDeck
+ public int? NumberPassengersStandingUpperDeck
{
get { return 0; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index cf6fbc6dfbd1c79272d020910aca2e66f3ba106d..2beb3de6f8440587d4a33100a0564fcea3ad0a03 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -283,21 +283,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return RegistrationClass.unknown; }
}
- public virtual int? NumberOfPassengersUpperDeck
+ public virtual int? NumberPassengerSeatsUpperDeck
{
get { return 0; }
}
- public virtual int? NumberOfPassengersLowerDeck
+ public virtual int? NumberPassengerSeatsLowerDeck
{
get { return 0; }
}
- public virtual int? NumberOfPassengersStandingLowerDeck
+ public virtual int? NumberPassengersStandingLowerDeck
{
get { return 0; }
}
- public virtual int? NumberOfPassengersStandingUpperDeck
+ public virtual int? NumberPassengersStandingUpperDeck
{
get { return 0; }
}
@@ -855,7 +855,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersLowerDeck
+ public override int? NumberPassengerSeatsLowerDeck
{
get {
var node = GetNode(XMLNames.Bus_LowerDeck);
@@ -863,7 +863,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersUpperDeck
+ public override int? NumberPassengerSeatsUpperDeck
{
get {
var node = GetNode(XMLNames.Bus_UpperDeck);
@@ -1071,10 +1071,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public string Identifier { get; }
public bool ExemptedVehicle { get; }
public LegislativeClass? LegislativeClass { get; }
- public int? NumberOfPassengersUpperDeck { get; }
- public int? NumberOfPassengersLowerDeck { get; }
- public int? NumberOfPassengersStandingLowerDeck { get; }
- public int? NumberOfPassengersStandingUpperDeck { get; }
+ public int? NumberPassengerSeatsUpperDeck { get; }
+ public int? NumberPassengerSeatsLowerDeck { get; }
+ public int? NumberPassengersStandingLowerDeck { get; }
+ public int? NumberPassengersStandingUpperDeck { get; }
public CubicMeter CargoVolume
{
@@ -1229,7 +1229,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
- public override int? NumberOfPassengersLowerDeck
+ public override int? NumberPassengerSeatsLowerDeck
{
get
{
@@ -1240,7 +1240,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersUpperDeck
+ public override int? NumberPassengerSeatsUpperDeck
{
get
{
@@ -1251,7 +1251,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersStandingLowerDeck
+ public override int? NumberPassengersStandingLowerDeck
{
get
{
@@ -1262,7 +1262,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersStandingUpperDeck
+ public override int? NumberPassengersStandingUpperDeck
{
get
{
@@ -1488,7 +1488,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersLowerDeck
+ public override int? NumberPassengerSeatsLowerDeck
{
get
{
@@ -1499,7 +1499,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override int? NumberOfPassengersUpperDeck
+ public override int? NumberPassengerSeatsUpperDeck
{
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 14c51961456ec31c0329b6fdc3230a037ea12aab..4f2ddb0b82c680af33e500d257d7bc7827c957df 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -515,24 +515,24 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
}
- public int? NumberOfPassengersUpperDeck
+ public int? NumberPassengerSeatsUpperDeck
{
- get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersUpperDeck)); }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsUpperDeck)); }
}
- public int? NumberOfPassengersLowerDeck
+ public int? NumberPassengerSeatsLowerDeck
{
- get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersLowerDeck)); }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengerSeatsLowerDeck)); }
}
- public int? NumberOfPassengersStandingLowerDeck
+ public int? NumberPassengersStandingLowerDeck
{
- get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersStandingLowerDeck)); }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingLowerDeck)); }
}
- public int? NumberOfPassengersStandingUpperDeck
+ public int? NumberPassengersStandingUpperDeck
{
- get { return GetVehiclePropertyValue<int?>(nameof(NumberOfPassengersStandingUpperDeck)); }
+ get { return GetVehiclePropertyValue<int?>(nameof(NumberPassengersStandingUpperDeck)); }
}
public VehicleCode? VehicleCode
@@ -697,10 +697,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
&& InputComplete(IsAirdragEntriesValid(), nameof(IsAirdragEntriesValid))
&& InputComplete(IsTankSystemValid(), nameof(IsTankSystemValid))
&& InputComplete(RegisteredClass, nameof(RegisteredClass))
- && InputComplete(NumberOfPassengersLowerDeck, nameof(NumberOfPassengersLowerDeck))
- && InputComplete(NumberOfPassengersUpperDeck, nameof(NumberOfPassengersUpperDeck))
- && InputComplete(NumberOfPassengersStandingLowerDeck, nameof(NumberOfPassengersStandingLowerDeck))
- && InputComplete(NumberOfPassengersStandingUpperDeck, nameof(NumberOfPassengersStandingUpperDeck))
+ && InputComplete(NumberPassengerSeatsLowerDeck, nameof(NumberPassengerSeatsLowerDeck))
+ && InputComplete(NumberPassengerSeatsUpperDeck, nameof(NumberPassengerSeatsUpperDeck))
+ && InputComplete(NumberPassengersStandingLowerDeck, nameof(NumberPassengersStandingLowerDeck))
+ && InputComplete(NumberPassengersStandingUpperDeck, nameof(NumberPassengersStandingUpperDeck))
&& 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 3aee373c8cc1b0c8b7fe6dfbd6046129b13e283e..0856567215232a6ed62cf5190ef0a5f62c8a6a18 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -207,10 +207,10 @@ 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 virtual int? NumberPassengerSeatsUpperDeck { get { return 0; } }
+ public virtual int? NumberPassengerSeatsLowerDeck { get { return 0; } }
+ public int? NumberPassengersStandingLowerDeck { get { return 0; } }
+ public int? NumberPassengersStandingUpperDeck { 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/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index 18c5ab367bcb2ae860eede9e50b51675717b855a..6628bac04ff604b73748ffef679fb8c911374ea2 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -27,7 +27,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var passengers = GetNumberOfPassengers(
mission, completedVehicle.Length, completedVehicle.Width,
- (int)completedVehicle.NumberOfPassengersLowerDeck + (int)completedVehicle.NumberOfPassengersUpperDeck, loading.Key);
+ (int)completedVehicle.NumberPassengerSeatsLowerDeck + (int)completedVehicle.NumberPassengerSeatsUpperDeck, loading.Key);
var vehicleData = base.CreateVehicleData(primaryVehicle, segment, mission, loading, false);
vehicleData.InputData = completedVehicle;
@@ -201,10 +201,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
mission.BusParameter.BusGroup.GetClassNumber(), hvacConfiguration.GetName());
}
- if (completedVehicle.NumberOfPassengersLowerDeck == null) {
+ if (completedVehicle.NumberPassengerSeatsLowerDeck == null) {
throw new VectoException("NumberOfPassengersLowerDeck input parameter is required");
}
- if (completedVehicle.NumberOfPassengersUpperDeck == null) {
+ if (completedVehicle.NumberPassengerSeatsUpperDeck == null) {
throw new VectoException("NumberOfPassengersUpperDeck input parameter is required");
}
if (busAux.HeatPumpTypeDriverCompartment == null) {
@@ -237,7 +237,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
? 2 * Constants.BusParameters.DriverCompartmentLength // OK
: DeclarationData.BusAuxiliaries.CalculateInternalLength(
completedVehicle.Length, completedVehicle.VehicleCode,
- completedVehicle.NumberOfPassengersLowerDeck.Value);
+ completedVehicle.NumberPassengerSeatsLowerDeck.Value);
var correctionLengthDrivetrainVolume = DeclarationData.BusAuxiliaries.CorrectionLengthDrivetrainVolume(
completedVehicle.VehicleCode, completedVehicle.LowEntry, primaryVehicle.AxleConfiguration.NumAxles(),
primaryVehicle.Articulated);
@@ -264,7 +264,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
ssmInputs.UValue = DeclarationData.BusAuxiliaries.UValue(completedVehicle.VehicleCode.GetFloorType());
ssmInputs.NumberOfPassengers = GetNumberOfPassengers(
mission, internalLength, correctedBusWidth,
- completedVehicle.NumberOfPassengersLowerDeck.Value + completedVehicle.NumberOfPassengersUpperDeck.Value, loadingType) + 1; // add driver for 'heat input'
+ completedVehicle.NumberPassengerSeatsLowerDeck.Value + completedVehicle.NumberPassengerSeatsUpperDeck.Value, loadingType) + 1; // add driver for 'heat input'
ssmInputs.VentilationRate = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, false);
ssmInputs.VentilationRateHeating = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, true);
@@ -334,7 +334,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var pasengerCompartmentLength = DeclarationData.BusAuxiliaries.CalculateInternalLength(
completedVehicle.Length , completedVehicle.VehicleCode,
- (int)completedVehicle.NumberOfPassengersLowerDeck) - Constants.BusParameters.DriverCompartmentLength - correctionLengthDrivetrainVolume;
+ (int)completedVehicle.NumberPassengerSeatsLowerDeck) - Constants.BusParameters.DriverCompartmentLength - correctionLengthDrivetrainVolume;
var internalHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.Height);
var volume = pasengerCompartmentLength * internalHeight * completedVehicle.Width;
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
index 702b8f7c93503832359adfd70b196a3cd7664a01..dbfe126ca6db278b5688a2f9c9e6f58bb5d69257 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var passengerCountRef = busFloorArea * (loading.Key == LoadingType.LowLoading
? mission.BusParameter.PassengerDensityLow
: mission.BusParameter.PassengerDensityRef);
- var passengerCountDecl = CompletedVehicle.NumberOfPassengersUpperDeck + CompletedVehicle.NumberOfPassengersLowerDeck;
+ var passengerCountDecl = CompletedVehicle.NumberPassengerSeatsUpperDeck + CompletedVehicle.NumberPassengerSeatsLowerDeck;
//var refLoad = passengerCount * mission.MissionType.GetAveragePassengerMass();
if (loading.Key != LoadingType.ReferenceLoad && loading.Key != LoadingType.LowLoading) {
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index 505c5d9351aa735adcba286c88c2d45bf423da2c..dbf57e760315e9ff244ba97f13539cbfe691c971 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -221,13 +221,13 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
var segment = DeclarationData.CompletedBusSegments.Lookup(
- axleConfiguration.NumAxles(), vehicle.VehicleCode, vehicle.RegisteredClass, vehicle.NumberOfPassengersLowerDeck,
+ axleConfiguration.NumAxles(), vehicle.VehicleCode, vehicle.RegisteredClass, vehicle.NumberPassengerSeatsLowerDeck,
vehicle.Height, vehicle.LowEntry);
if (!segment.Found) {
throw new VectoException(
"no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowEntry: {7}. completed",
vehicle.VehicleCategory, axleConfiguration,
- vehicle.Articulated, vehicle.VehicleCode, vehicle.RegisteredClass.GetLabel(), vehicle.NumberOfPassengersLowerDeck,
+ vehicle.Articulated, vehicle.VehicleCode, vehicle.RegisteredClass.GetLabel(), vehicle.NumberPassengerSeatsLowerDeck,
vehicle.Height, vehicle.LowEntry);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 58d563a126d7a252df7b944c28236a4188cc9708..bf96069f51cffad6510f6cf89723d82a6ab14c9b 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -205,14 +205,14 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected virtual Segment GetCompletedSegment(IVehicleDeclarationInputData vehicle, AxleConfiguration axleConfiguration)
{
var segment = DeclarationData.CompletedBusSegments.Lookup(
- axleConfiguration.NumAxles(), vehicle.VehicleCode, vehicle.RegisteredClass, vehicle.NumberOfPassengersLowerDeck,
+ axleConfiguration.NumAxles(), vehicle.VehicleCode, vehicle.RegisteredClass, vehicle.NumberPassengerSeatsLowerDeck,
vehicle.Height, vehicle.LowEntry);
if (!segment.Found)
{
throw new VectoException(
"no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowEntry: {7}. completed",
vehicle.VehicleCategory, axleConfiguration,
- vehicle.Articulated, vehicle.VehicleCode, vehicle.RegisteredClass.GetLabel(), vehicle.NumberOfPassengersLowerDeck,
+ vehicle.Articulated, vehicle.VehicleCode, vehicle.RegisteredClass.GetLabel(), vehicle.NumberPassengerSeatsLowerDeck,
vehicle.Height, vehicle.LowEntry);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index 2f6c3507573f7866f29bcbf75bf3d478f93ea61c..bd665772cf6740688e677448df8f94f2f1a75d95 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -41,13 +41,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
var completedVehicle = _singleBusInputData.CompletedVehicle;
var segment = DeclarationData.CompletedBusSegments.Lookup(
- _singleBusInputData.PrimaryVehicle.AxleConfiguration.NumAxles(), completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.NumberOfPassengersLowerDeck,
+ _singleBusInputData.PrimaryVehicle.AxleConfiguration.NumAxles(), completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.NumberPassengerSeatsLowerDeck,
completedVehicle.Height, completedVehicle.LowEntry);
if (!segment.Found) {
throw new VectoException(
"no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowfloor: {7}. completed",
vehicle.VehicleCategory, _singleBusInputData.PrimaryVehicle.AxleConfiguration,
- vehicle.Articulated, completedVehicle.VehicleCode, completedVehicle.RegisteredClass.GetLabel(), completedVehicle.NumberOfPassengersLowerDeck,
+ vehicle.Articulated, completedVehicle.VehicleCode, completedVehicle.RegisteredClass.GetLabel(), completedVehicle.NumberPassengerSeatsLowerDeck,
completedVehicle.Height, completedVehicle.LowEntry);
}
foreach (var mission in segment.Missions) {
@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
protected override VectoRunData CreateVectoRunData(IVehicleDeclarationInputData vehicle, int modeIdx, Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading)
{
- var doubleDecker = _singleBusInputData.CompletedVehicle.NumberOfPassengersUpperDeck > 0;
+ var doubleDecker = _singleBusInputData.CompletedVehicle.NumberPassengerSeatsUpperDeck > 0;
if (mission.BusParameter.DoubleDecker != doubleDecker) {
return null;
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
index db78cf3f1ffa26bc7da69e006435a33fe285b8d3..c53f43e48c30f4c0edda372a091e6565e2d88afd 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
//new XElement(tns + XMLNames.Vehicle_VocationalVehicle, modelData.VehicleData.VocationalVehicle),
//new XElement(tns + XMLNames.Vehicle_SleeperCab, modelData.VehicleData.SleeperCab),
new XElement(
- tns + "RegisteredPassengers", modelData.VehicleData.InputData.NumberOfPassengersLowerDeck + modelData.VehicleData.InputData.NumberOfPassengersUpperDeck
+ tns + "RegisteredPassengers", modelData.VehicleData.InputData.NumberPassengerSeatsLowerDeck + modelData.VehicleData.InputData.NumberPassengerSeatsUpperDeck
),
new XElement(tns + XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.LowEntry),
new XElement(tns + XMLNames.Bus_HeighIntegratedBody, modelData.VehicleData.InputData.Height.ToXMLFormat(3)),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
index e3fe6e74ab6df6fa1c759485309522242764f436..cb166c50c44758fb2ae47b81f43b93ef549b4a77 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
@@ -51,8 +51,8 @@ namespace TUGraz.VectoCore.OutputData.XML {
new XElement(tns + XMLNames.Vehicle_SleeperCab, modelData.VehicleData.DualFuelVehicle),
new XElement(tns + "RegisteredPassengers",
- new XElement(tns + XMLNames.Bus_LowerDeck, modelData.VehicleData.InputData.NumberOfPassengersLowerDeck),
- new XElement(tns + XMLNames.Bus_UpperDeck, modelData.VehicleData.InputData.NumberOfPassengersUpperDeck)
+ new XElement(tns + XMLNames.Bus_LowerDeck, modelData.VehicleData.InputData.NumberPassengerSeatsLowerDeck),
+ new XElement(tns + XMLNames.Bus_UpperDeck, modelData.VehicleData.InputData.NumberPassengerSeatsUpperDeck)
),
new XElement(tns +XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.LowEntry),
new XElement(tns + XMLNames.Bus_HeighIntegratedBody, modelData.VehicleData.InputData.Height.ToXMLFormat(3)),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
index eb0cd3bed6d4184b14132763ee784cc45f1af96b..f56be26ea50bb31236162ebf5baf9a99661d3c4a 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLMultistageBusReport.cs
@@ -222,14 +222,14 @@ namespace TUGraz.VectoCore.OutputData.XML
? new XElement(v28 + XMLNames.Vehicle_NgTankSystem, _vehicleInputData.TankSystem.ToString()) : null,
_vehicleInputData.RegisteredClass != null
? new XElement(v28 + XMLNames.Vehicle_RegisteredClass, _vehicleInputData.RegisteredClass.ToXMLFormat()) : null,
- _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_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberOfPassengersUpperDeck) : null,
- _vehicleInputData.NumberOfPassengersStandingUpperDeck != null
- ? new XElement(v28 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberOfPassengersStandingUpperDeck) : null,
+ _vehicleInputData.NumberPassengerSeatsLowerDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengerSeatsLowerDeck, _vehicleInputData.NumberPassengerSeatsLowerDeck) : null,
+ _vehicleInputData.NumberPassengersStandingLowerDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengersStandingLowerDeck, _vehicleInputData.NumberPassengersStandingLowerDeck) : null,
+ _vehicleInputData.NumberPassengerSeatsUpperDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengerSeatsUpperDeck, _vehicleInputData.NumberPassengerSeatsUpperDeck) : null,
+ _vehicleInputData.NumberPassengersStandingUpperDeck != null
+ ? new XElement(v28 + XMLNames.Bus_NumberPassengersStandingUpperDeck, _vehicleInputData.NumberPassengersStandingUpperDeck) : null,
_vehicleInputData.VehicleCode != null
? new XElement(v28 + XMLNames.Vehicle_BodyworkCode, _vehicleInputData.VehicleCode.ToXMLFormat()) : null,
_vehicleInputData.LowEntry != null
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index e9da5f3d54302dd25be94983a574dbcad538fd49..aa367932f79de368166442fa0ad64adad3873a48 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -49,10 +49,10 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Watt MaxNetPower1 { get; }
public Watt MaxNetPower2 { get; }
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 int? NumberPassengerSeatsUpperDeck { get; set; }
+ public int? NumberPassengerSeatsLowerDeck { get; set; }
+ public int? NumberPassengersStandingLowerDeck { get; set; }
+ public int? NumberPassengersStandingUpperDeck { get; set; }
public CubicMeter CargoVolume { get; }
public VehicleCode? VehicleCode { get; set; }
public bool? LowEntry { get; }
@@ -122,10 +122,10 @@ namespace TUGraz.VectoCore.Tests.Utils {
public VehicleDeclarationType VehicleDeclarationType { get; }
public Watt MaxNetPower2 { get; }
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 int? NumberPassengerSeatsUpperDeck { get; set; }
+ public int? NumberPassengerSeatsLowerDeck { get; set; }
+ public int? NumberPassengersStandingLowerDeck { get; set; }
+ public int? NumberPassengersStandingUpperDeck { get; set; }
public CubicMeter CargoVolume { get; }
public VehicleCode? VehicleCode { get; set; }
public bool? LowEntry { get; }
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index 4146c848ab0cf0c2386ab18279548d1fd63a17aa..444bb17a9bd769843018af9518bb7eb097ac8b04 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -57,8 +57,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(15400, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass ?!?
//Assert.That(() => vehicle.TankSystem, Throws.InstanceOf<VectoException>());
Assert.IsNull(vehicle.TankSystem);
- Assert.AreEqual(50, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(0, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(50, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(0, vehicle.NumberPassengerSeatsUpperDeck);
Assert.IsTrue(vehicle.LowEntry);
Assert.AreEqual(2.700, vehicle.Height.Value());
Assert.AreEqual(11.830, vehicle.Length.Value());
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index 1783c6af9c34c79fde41f6844084f3fff7716e79..d03f757ed1c2c6a8df4062a92b8f54a48063ef54 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -61,10 +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(11, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(31, vehicle.NumberOfPassengersUpperDeck);
- Assert.AreEqual(3, vehicle.NumberOfPassengersStandingLowerDeck);
- Assert.AreEqual(1, vehicle.NumberOfPassengersStandingUpperDeck);
+ Assert.AreEqual(11, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(31, vehicle.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(3, vehicle.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(1, vehicle.NumberPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(3, vehicle.Height.Value());//HeightIntegratedBody
@@ -135,10 +135,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
Assert.AreEqual(null, vehicle.TankSystem);//NgTankSystem
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.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengersStandingUpperDeck);
Assert.AreEqual(null, vehicle.VehicleCode);
Assert.AreEqual(null, vehicle.LowEntry);
Assert.AreEqual(null, vehicle.Height);//HeightIntegratedBody
@@ -172,10 +172,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(12, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(5, vehicle.NumberOfPassengersStandingLowerDeck);
- Assert.AreEqual(30, vehicle.NumberOfPassengersUpperDeck);
- Assert.AreEqual(4, vehicle.NumberOfPassengersStandingUpperDeck);
+ Assert.AreEqual(12, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(5, vehicle.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(30, vehicle.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(4, vehicle.NumberPassengersStandingUpperDeck);
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 304fb15fdca990aa869f36e8c8f8f1ce1febe24c..9924e014fe1c3a4f21b39cafcad7027b2ed88313 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -578,8 +578,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
Assert.AreEqual(null, vehicleData.TankSystem);
Assert.AreEqual(null, vehicleData.RegisteredClass);
- Assert.AreEqual(null, vehicleData.NumberOfPassengersLowerDeck);
- Assert.AreEqual(null, vehicleData.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(null, vehicleData.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(null, vehicleData.NumberPassengerSeatsUpperDeck);
Assert.AreEqual(null, vehicleData.VehicleCode);
Assert.AreEqual(null, vehicleData.LowEntry);
Assert.AreEqual(null, vehicleData.Height);
@@ -708,10 +708,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(24, vehicleData.NumberOfPassengersLowerDeck);
- Assert.AreEqual(30, vehicleData.NumberOfPassengersUpperDeck);
- Assert.AreEqual(7, vehicleData.NumberOfPassengersStandingLowerDeck);
- Assert.AreEqual(4, vehicleData.NumberOfPassengersStandingUpperDeck);
+ Assert.AreEqual(24, vehicleData.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(30, vehicleData.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(7, vehicleData.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(4, vehicleData.NumberPassengersStandingUpperDeck);
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 cdfa32bbdda1a6afd11d6597d2cdc5256ce2e142..3837313f74ac108d6f61295178ce298bc91f5f41 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -51,10 +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(1, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(10, vehicle.NumberOfPassengersStandingLowerDeck);
- Assert.AreEqual(11, vehicle.NumberOfPassengersUpperDeck);
- Assert.AreEqual(2, vehicle.NumberOfPassengersStandingUpperDeck);
+ Assert.AreEqual(1, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(10, vehicle.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(11, vehicle.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(2, vehicle.NumberPassengersStandingUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(false, vehicle.LowEntry);
Assert.AreEqual(2.5, vehicle.Height.Value());//HeightIntegratedBody
@@ -144,8 +144,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(7000, vehicle.CurbMassChassis.Value());//CorrectedActualMass
Assert.AreEqual(10000, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
Assert.AreEqual(RegistrationClass.A, vehicle.RegisteredClass);//ClassBus
- Assert.AreEqual(10, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(20, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(10, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(20, vehicle.NumberPassengerSeatsUpperDeck);
Assert.AreEqual(VehicleCode.CC, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(2.5, vehicle.Height.Value());
@@ -169,8 +169,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.CurbMassChassis);
Assert.AreEqual(null, vehicle.GrossVehicleMassRating);
Assert.AreEqual(null, vehicle.RegisteredClass);
- Assert.AreEqual(null, vehicle.NumberOfPassengersLowerDeck);
- Assert.AreEqual(null, vehicle.NumberOfPassengersUpperDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengerSeatsUpperDeck);
Assert.AreEqual(null, vehicle.VehicleCode);
Assert.AreEqual(null, vehicle.LowEntry);
Assert.AreEqual(null, vehicle.Height);
@@ -197,10 +197,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(null, vehicle.CurbMassChassis);
Assert.AreEqual(null, vehicle.GrossVehicleMassRating);
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.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengerSeatsUpperDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengersStandingLowerDeck);
+ Assert.AreEqual(null, vehicle.NumberPassengersStandingUpperDeck);
Assert.AreEqual(null, vehicle.VehicleCode);
Assert.AreEqual(null, vehicle.LowEntry);
Assert.AreEqual(null, vehicle.Height);