Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit c9dc061b authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

changed input data provider for bus dimensions because dimension unit is in mm not in m

parent c7b3a0f6
No related branches found
No related tags found
No related merge requests found
...@@ -1254,7 +1254,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -1254,7 +1254,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get get
{ {
return ElementExists(XMLNames.Bus_HeighIntegratedBody) return ElementExists(XMLNames.Bus_HeighIntegratedBody)
? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() * 0.001
: null; : null;
} }
} }
...@@ -1264,7 +1264,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -1264,7 +1264,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get get
{ {
return ElementExists(XMLNames.Bus_VehicleLength) return ElementExists(XMLNames.Bus_VehicleLength)
? GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>() ? GetDouble(XMLNames.Bus_VehicleLength).SI<Meter>() * 0.001
: null; : null;
} }
} }
...@@ -1274,7 +1274,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -1274,7 +1274,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get get
{ {
return ElementExists(XMLNames.Bus_VehicleWidth) return ElementExists(XMLNames.Bus_VehicleWidth)
? GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>() ? GetDouble(XMLNames.Bus_VehicleWidth).SI<Meter>() * 0.001
: null; : null;
} }
} }
...@@ -1284,7 +1284,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -1284,7 +1284,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get get
{ {
return ElementExists(XMLNames.Bus_EntranceHeight) return ElementExists(XMLNames.Bus_EntranceHeight)
? GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>() ? GetDouble(XMLNames.Bus_EntranceHeight).SI<Meter>() * 0.001
: null; : null;
} }
} }
...@@ -1480,7 +1480,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider ...@@ -1480,7 +1480,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get get
{ {
return ElementExists(XMLNames.Bus_HeighIntegratedBody) return ElementExists(XMLNames.Bus_HeighIntegratedBody)
? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() ? GetDouble(XMLNames.Bus_HeighIntegratedBody).SI<Meter>() * 0.001
: null; : null;
} }
} }
......
...@@ -14,6 +14,7 @@ using TUGraz.VectoCore.Models.Declaration; ...@@ -14,6 +14,7 @@ using TUGraz.VectoCore.Models.Declaration;
namespace TUGraz.VectoCore.Tests.XML namespace TUGraz.VectoCore.Tests.XML
{ {
[TestFixture]
public class XMLMultistageBusDataTest public class XMLMultistageBusDataTest
{ {
protected IXMLInputDataReader _xmlInputReader; protected IXMLInputDataReader _xmlInputReader;
...@@ -707,10 +708,10 @@ namespace TUGraz.VectoCore.Tests.XML ...@@ -707,10 +708,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(24, vehicleData.NumberOfPassengersUpperDeck); Assert.AreEqual(24, vehicleData.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CA, vehicleData.VehicleCode); Assert.AreEqual(VehicleCode.CA, vehicleData.VehicleCode);
Assert.AreEqual(true, vehicleData.LowEntry); Assert.AreEqual(true, vehicleData.LowEntry);
Assert.AreEqual(2500.SI<Meter>(), vehicleData.Height); Assert.AreEqual(2.5.SI<Meter>(), vehicleData.Height);
Assert.AreEqual(12000.SI<Meter>(), vehicleData.Length); Assert.AreEqual(12.SI<Meter>(), vehicleData.Length);
Assert.AreEqual(2000.SI<Meter>(), vehicleData.Width); Assert.AreEqual(2.SI<Meter>(), vehicleData.Width);
Assert.AreEqual(2050.SI<Meter>(), vehicleData.EntranceHeight); Assert.AreEqual(2.05.SI<Meter>(), vehicleData.EntranceHeight);
Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicleData.DoorDriveTechnology); Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicleData.DoorDriveTechnology);
Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType); Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
......
...@@ -54,10 +54,10 @@ namespace TUGraz.VectoCore.Tests.XML ...@@ -54,10 +54,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(10, vehicle.NumberOfPassengersUpperDeck); Assert.AreEqual(10, vehicle.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode); Assert.AreEqual(VehicleCode.CB, vehicle.VehicleCode);
Assert.AreEqual(false, vehicle.LowEntry); Assert.AreEqual(false, vehicle.LowEntry);
Assert.AreEqual(2500, vehicle.Height.Value());//HeightIntegratedBody Assert.AreEqual(2.5, vehicle.Height.Value());//HeightIntegratedBody
Assert.AreEqual(9500, vehicle.Length.Value()); Assert.AreEqual(9.5, vehicle.Length.Value());
Assert.AreEqual(2500, vehicle.Width.Value()); Assert.AreEqual(2.5, vehicle.Width.Value());
Assert.AreEqual(2000, vehicle.EntranceHeight.Value()); Assert.AreEqual(2, vehicle.EntranceHeight.Value());
Assert.AreEqual(ConsumerTechnology.Electrically, vehicle.DoorDriveTechnology); Assert.AreEqual(ConsumerTechnology.Electrically, vehicle.DoorDriveTechnology);
Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType); Assert.AreEqual(VehicleDeclarationType.interim, vehicle.VehicleDeclarationType);
...@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore.Tests.XML ...@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(20, vehicle.NumberOfPassengersUpperDeck); Assert.AreEqual(20, vehicle.NumberOfPassengersUpperDeck);
Assert.AreEqual(VehicleCode.CC, vehicle.VehicleCode); Assert.AreEqual(VehicleCode.CC, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry); Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(2500, vehicle.Height.Value()); Assert.AreEqual(2.5, vehicle.Height.Value());
} }
[TestCase] [TestCase]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment