From c9dc061bd96b46da91c166031a08130dce332790 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 31 Mar 2021 19:26:18 +0200
Subject: [PATCH] changed input data provider for bus dimensions because
dimension unit is in mm not in m
---
.../DataProvider/XMLDeclarationVehicleDataProvider.cs | 10 +++++-----
.../VectoCoreTest/XML/XMLMultistageBusDataTest.cs | 9 +++++----
.../VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs | 10 +++++-----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index bf7c74a87a..c23c943f06 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -1254,7 +1254,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return ElementExists(XMLNames.Bus_HeighIntegratedBody)
- ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>()
+ ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() * 0.001
: null;
}
}
@@ -1264,7 +1264,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return ElementExists(XMLNames.Bus_VehicleLength)
- ? GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>()
+ ? GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>() * 0.001
: null;
}
}
@@ -1274,7 +1274,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return ElementExists(XMLNames.Bus_VehicleWidth)
- ? GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>()
+ ? GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>() * 0.001
: null;
}
}
@@ -1284,7 +1284,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return ElementExists(XMLNames.Bus_EntranceHeight)
- ? GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>()
+ ? GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>() * 0.001
: null;
}
}
@@ -1480,7 +1480,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return ElementExists(XMLNames.Bus_HeighIntegratedBody)
- ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>()
+ ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() * 0.001
: null;
}
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 7c4173e1f1..dda41de716 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -14,6 +14,7 @@ using TUGraz.VectoCore.Models.Declaration;
namespace TUGraz.VectoCore.Tests.XML
{
+ [TestFixture]
public class XMLMultistageBusDataTest
{
protected IXMLInputDataReader _xmlInputReader;
@@ -707,10 +708,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(24, vehicleData.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CA, vehicleData.VehicleCode);
Assert.AreEqual(true, vehicleData.LowEntry);
- Assert.AreEqual(2500.SI<Meter>(), vehicleData.Height);
- Assert.AreEqual(12000.SI<Meter>(), vehicleData.Length);
- Assert.AreEqual(2000.SI<Meter>(), vehicleData.Width);
- Assert.AreEqual(2050.SI<Meter>(), vehicleData.EntranceHeight);
+ Assert.AreEqual(2.5.SI<Meter>(), vehicleData.Height);
+ Assert.AreEqual(12.SI<Meter>(), vehicleData.Length);
+ Assert.AreEqual(2.SI<Meter>(), vehicleData.Width);
+ Assert.AreEqual(2.05.SI<Meter>(), vehicleData.EntranceHeight);
Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicleData.DoorDriveTechnology);
Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 097afd10b6..ab48567380 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -54,10 +54,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(10, vehicle.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(false, vehicle.LowEntry);
- Assert.AreEqual(2500, vehicle.Height.Value());//HeightIntegratedBody
- Assert.AreEqual(9500, vehicle.Length.Value());
- Assert.AreEqual(2500, vehicle.Width.Value());
- Assert.AreEqual(2000, vehicle.EntranceHeight.Value());
+ Assert.AreEqual(2.5, vehicle.Height.Value());//HeightIntegratedBody
+ Assert.AreEqual(9.5, vehicle.Length.Value());
+ Assert.AreEqual(2.5, vehicle.Width.Value());
+ Assert.AreEqual(2, vehicle.EntranceHeight.Value());
Assert.AreEqual(ConsumerTechnology.Electrically, vehicle.DoorDriveTechnology);
Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType);
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(20, vehicle.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CC, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
- Assert.AreEqual(2500, vehicle.Height.Value());
+ Assert.AreEqual(2.5, vehicle.Height.Value());
}
[TestCase]
--
GitLab