diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 7ef5bced6cde9209bdae6baeb51763408fd8badb..95e4b7ee57153feb104b0e2fb016ca8901ea5545 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -666,7 +666,7 @@ Public Class DummyVehicle
Public ReadOnly Property Width As Meter Implements IVehicleDeclarationInputData.Width
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
- Public ReadOnly Property DeclarationType As DeclarationType Implements IVehicleDeclarationInputData.DeclarationType
+ Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
Public ReadOnly Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Get
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 4d654e65b6ab88ec5baa45785f37aadafa1b13b5..70a4c0d266761e0eb7387b828cdc2c41324e72d5 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -852,7 +852,7 @@ Public Class MockEngineeringVehicle
Public ReadOnly Property Width As Meter Implements IVehicleDeclarationInputData.Width
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
- Public ReadOnly Property DeclarationType As DeclarationType Implements IVehicleDeclarationInputData.DeclarationType
+ Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
Public Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Public ReadOnly Property XMLSource As XmlNode Implements IVehicleDeclarationInputData.XMLSource
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index 16f06e388e0f9ab02fd4fcaf0c3c88e59291d73a..ecc845ec7e8570eed5e94907110905f4fc1ab560 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -52,7 +52,7 @@ Public Class MockVehicleInputData
Public ReadOnly Property Width As Meter Implements IVehicleDeclarationInputData.Width
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
- Public ReadOnly Property DeclarationType As DeclarationType Implements IVehicleDeclarationInputData.DeclarationType
+ Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
Public Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Public ReadOnly Property XMLSource As XmlNode Implements IVehicleDeclarationInputData.XMLSource
End Class
\ No newline at end of file
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index fdaae09a92327447e529432c0385cb4c70f8e04e..bd5eeabb6cb5a3b0aa879a02e788ffbd684e7669 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -441,7 +441,7 @@ Public Class Vehicle
Public ReadOnly Property Width As Meter Implements IVehicleDeclarationInputData.Width
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
- Public ReadOnly Property DeclarationType As DeclarationType Implements IVehicleDeclarationInputData.DeclarationType
+ Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
Public ReadOnly Property IVehicleEngineeringInputData_Components As IVehicleComponentsEngineering Implements IVehicleEngineeringInputData.Components
Get
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 2a5209d1497022654655861ffc9f9450c5487b6b..3fe7fd624b078f5804de09e3a6cec9f175588cb4 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -190,7 +190,7 @@ namespace TUGraz.VectoCommon.InputData
ConsumerTechnology? DoorDriveTechnology { get; }
- DeclarationType DeclarationType { get; }
+ VehicleDeclarationType VehicleDeclarationType { get; }
// components
@@ -940,22 +940,22 @@ namespace TUGraz.VectoCommon.InputData
}
- public enum DeclarationType
+ public enum VehicleDeclarationType
{
interim,
final
}
- public static class DeclarationTypeHelper
+ public static class VehicleDeclarationTypeHelper
{
- public static DeclarationType Parse(string parse)
+ public static VehicleDeclarationType Parse(string parse)
{
switch (parse)
{
- case nameof(DeclarationType.interim):
- return DeclarationType.interim;
- case nameof(DeclarationType.final):
- return DeclarationType.final;
+ case nameof(VehicleDeclarationType.interim):
+ return VehicleDeclarationType.interim;
+ case nameof(VehicleDeclarationType.final):
+ return VehicleDeclarationType.final;
default:
throw new ArgumentOutOfRangeException();
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 1ee0e7330289e682961535814a9cb95a5d8340a8..28afea7f4637c5cd670ccf623da9e067ba63ee27 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -340,7 +340,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return VehicleData.DoorDriveTechnology; }
}
- public DeclarationType DeclarationType { get; }
+ public VehicleDeclarationType VehicleDeclarationType { get; }
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index f7449ff948c7c3181d03020d1aade3d3d81258d8..efe1a7b47f8f7e9a5676cf294620fa4d65bf3083 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -320,7 +320,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual Meter EntranceHeight { get { return null; } }
public virtual ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
- public virtual DeclarationType DeclarationType { get; }
+ public virtual VehicleDeclarationType VehicleDeclarationType { get; }
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index b731e1d9a3d6aba5ae9c555cdddd5c11b7b18f6a..bf7c74a87adc5ec88db2ea5ccc1df358c3ce0f43 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -329,7 +329,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
public virtual ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
- public virtual DeclarationType DeclarationType { get; }
+ public virtual VehicleDeclarationType VehicleDeclarationType { get; }
public virtual IVehicleComponentsDeclaration Components
@@ -1038,7 +1038,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return ConsumerTechnology.Unknown; }
}
- public virtual DeclarationType DeclarationType { get; }
+ public virtual VehicleDeclarationType VehicleDeclarationType { get; }
public IVehicleComponentsDeclaration Components
@@ -1299,9 +1299,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
}
- public override DeclarationType DeclarationType
+ public override VehicleDeclarationType VehicleDeclarationType
{
- get { return DeclarationTypeHelper.Parse(GetString(XMLNames.Bus_DeclarationType)); }
+ get { return VehicleDeclarationTypeHelper.Parse(GetString(XMLNames.Bus_DeclarationType)); }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index bb40f7e0cb0cee43a5eed725c0761e21735e5bbd..76017cff2db4dc91fb6f90148caee516789fd7ff 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -181,7 +181,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public virtual Meter Width { get { return null; } }
public virtual Meter EntranceHeight { get { return null; } }
public ConsumerTechnology? DoorDriveTechnology { get { return ConsumerTechnology.Unknown; } }
- public virtual DeclarationType DeclarationType { get; }
+ public virtual VehicleDeclarationType VehicleDeclarationType { get; }
IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index 3c6c3165921426d2753d51b8f22266c2344802cd..5ffc35e5e15c241c7227ebf0a55c72eb855f995c 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Meter Width { get; set; }
public Meter EntranceHeight { get; }
public ConsumerTechnology? DoorDriveTechnology { get; }
- public DeclarationType DeclarationType { get; }
+ public VehicleDeclarationType VehicleDeclarationType { get; }
public IVehicleComponentsDeclaration Components { get { return this; } }
public XmlNode XMLSource { get; }
@@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Meter Width { get; set; }
public Meter EntranceHeight { get; }
public ConsumerTechnology? DoorDriveTechnology { get; }
- public DeclarationType DeclarationType { get; }
+ public VehicleDeclarationType VehicleDeclarationType { get; }
public Watt MaxNetPower2 { get; }
public RegistrationClass? RegisteredClass { get; set; }
public int? NumberOfPassengersUpperDeck { get; set; }
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 1977b6b8148fcb15af612362a23942feb378bf91..7c4173e1f115e9337b8ff13de0fbf6c160425679 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -561,7 +561,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("Intermediate Manufacturer Address 1", vehicleData.ManufacturerAddress);
Assert.AreEqual("VEH-1234567890", vehicleData.VIN);
Assert.AreEqual(DateTime.Parse("2018-02-15T11:00:00Z").ToUniversalTime(), vehicleData.Date);
- Assert.AreEqual(DeclarationType.interim, vehicleData.DeclarationType);
+ Assert.AreEqual(VehicleDeclarationType.interim, vehicleData.VehicleDeclarationType);
TestEmptyInterimStageInputFields(vehicleData);
}
@@ -611,7 +611,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("VEH-2234567890", vehicleData.VIN);
Assert.AreEqual(DateTime.Parse("2021-02-13T07:20:08.0187663Z").ToUniversalTime(), vehicleData.Date);
Assert.AreEqual(false, vehicleData.AirdragModifiedMultistage);
- Assert.AreEqual(DeclarationType.final, vehicleData.DeclarationType);
+ Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
Assert.AreEqual(true, vehicleData.ADAS.EngineStopStart);
Assert.AreEqual(EcoRollType.WithEngineStop, vehicleData.ADAS.EcoRoll);
@@ -712,7 +712,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2000.SI<Meter>(), vehicleData.Width);
Assert.AreEqual(2050.SI<Meter>(), vehicleData.EntranceHeight);
Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicleData.DoorDriveTechnology);
- Assert.AreEqual(DeclarationType.final, vehicleData.DeclarationType);
+ Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
Assert.AreEqual(false, vehicleData.ADAS.EngineStopStart);
Assert.AreEqual(EcoRollType.WithoutEngineStop, vehicleData.ADAS.EcoRoll);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 76f1a3e5a39c54c1481e588cc4f0d1657a2a56f0..097afd10b64a342f7bec6077b85f734999996ceb 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2500, vehicle.Width.Value());
Assert.AreEqual(2000, vehicle.EntranceHeight.Value());
Assert.AreEqual(ConsumerTechnology.Electrically, vehicle.DoorDriveTechnology);
- Assert.AreEqual(DeclarationType.interim, vehicle.DeclarationType);
+ Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType);
TestADASInput(vehicle);
TestComponents(vehicle.Components);
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("Some Manufacturer Address 4", vehicle.ManufacturerAddress);
Assert.AreEqual("VEH-1234567894", vehicle.VIN);
Assert.AreEqual(DateTime.Parse("2022-01-09T11:00:00Z").ToUniversalTime(), vehicle.Date);
- Assert.AreEqual(DeclarationType.interim, vehicle.DeclarationType);
+ Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType);
Assert.AreEqual(null, vehicle.Model);
Assert.AreEqual(null, vehicle.LegislativeClass);