From 8bf26c8b3e8ac79377b4a72fc0d0962d83c9cc3c Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Mon, 10 Feb 2020 12:30:53 +0100
Subject: [PATCH] changed length, height and width values in
HeavybusSegmentationTable.csv and the related unit test
---
.../InputData/FileIO/JSON/JSONInputData.cs | 2 +-
.../Declaration/HeavyBusSegmentationTable.csv | 40 ++--
.../DeclarationSegmentHeavyBusesTest.cs | 179 +++++++++---------
.../XML/XMLCompleteBusReaderTest.cs | 4 -
4 files changed, 111 insertions(+), 114 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 7a6f4467fe..f97a264583 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -967,7 +967,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
- public class JSONInputDataSingleBusV6 : JSONFile, ISingleBusInputDataProvider
+ public class JSONInputDataSingleBusV6 : JSONFile
{
private readonly IXMLInputDataReader _xmlInputReader;
diff --git a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
index c6c79aeee3..27a9d77fdb 100644
--- a/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/HeavyBusSegmentationTable.csv
@@ -1,26 +1,26 @@
HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated , Num Axles , TPMLM_Min , TPMLM_Max , doubledecker , floor type , DesignSpeed , Body , .vacc file , Cross Wind Correction , CdxA Standard , AxlesWeights , Width , Length , Body Height , CurbMass , PassengersLowerDeck , PassengersUpperDeck , Heavy Urban , Urban , Suburban , Interurban , Coach , External displays , Internal displays , Fridge , Kitchen Standard , HVAC System Configuration , HVAC Compressor type , HVAC Aux Heater , HVAC Double Glasing , HVAC Heatpump , HVAC Adjustable AuxiliaryHeater , HVAC SeparateAirDistributionDucts
## Heavy Bus Primary Vehicles
-P31SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.7 , 10000 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P31DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 12 , 3.7 , 10000 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.0 , 10000 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 12 , 3.9 , 10000 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P31SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 10000 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P31DD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 10000 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 10000 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P32SD , 1 , HeavyBus , PB41 , - , 2 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 10000 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
##
-P33SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14 , 2.7 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P33DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 14 , 3.0 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.9 , 12000 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.0 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P33SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P33DD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P34SD , 1 , HeavyBus , PB42 , 0 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.0 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
-P35SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18 , 2.7 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P35DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18 , 3.7 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18 , 3.0 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18 , 3.9 , 12000 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P35SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18.2 , 2.8 , 12000 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P35DD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 12000 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 12000 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36SD , 1 , HeavyBus , PB43 , 1 , 3 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 12000 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
## ,
-P37SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.7 , 14000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P37DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.0 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.9 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P37SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.8 , 14000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P37DD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38SD , 1 , HeavyBus , PB44 , 0 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
-P39SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 20 , 2.7 , 14000 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P39DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 20 , 3.7 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 20 , 3.0 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 20 , 3.9 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P39SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , low , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 2.6 , 14000 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P39DD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , low , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 14000 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
+P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 0 , high , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 14000 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40SD , 1 , HeavyBus , PB45 , 1 , 4 , 7.4 , 999 , 1 , high , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 14000 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 0b24f7d9cd..10f0b03fca 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -105,14 +105,15 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var missions = new[]
{ MissionType.HeavyUrban, MissionType.Urban, MissionType.Suburban, MissionType.Interurban, MissionType.Coach };
- for (var i = 0; i < 3; i++) {
+ for (var i = 0; i < 3; i++)
+ {
AssertMission(
segment.Missions[i],
missionType: missions[i],
cdxA: 4.9,
length: 12,
width: 2.55,
- height: 2.7,
+ height: 2.8,
curbMass: 10000,
refLoad: 5618.16,
lowLoad: 1123.632,
@@ -124,12 +125,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i % 3],
cdxA: 6.2,
- length: 12,
+ length: 10.5,
width: 2.55,
- height: 3.7,
+ height: 3.8,
curbMass: 10000,
- refLoad: 6929.064,
- lowLoad: 1385.8128,
+ refLoad: 5966.694,
+ lowLoad: 1193.3388,
axleWeightDistribution: new[] { 0.375, 0.625 }
);
}
@@ -140,7 +141,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 4.6,
length: 12,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 10000,
refLoad: 4301.748,
lowLoad: 860.3496,
@@ -152,7 +153,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 4.6,
length: 12,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 10000,
refLoad: 2737.476,
lowLoad: 547.4952,
@@ -163,24 +164,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[8],
missionType: MissionType.Interurban,
cdxA: 5.2,
- length: 12,
+ length: 10.5,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 10000,
- refLoad: 5866.02,
- lowLoad: 1173.204,
+ refLoad: 5051.295,
+ lowLoad: 1010.259,
axleWeightDistribution: new[] { 0.375, 0.625 }
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
cdxA: 5.2,
- length: 12,
+ length: 10.5,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 10000,
- refLoad: 3910.68,
- lowLoad: 782.136,
+ refLoad: 3367.53,
+ lowLoad: 673.506,
axleWeightDistribution: new[] { 0.375, 0.625 }
);
@@ -211,12 +212,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i],
cdxA: 5.0,
- length: 14,
+ length: 14.2,
width: 2.55,
- height: 2.7,
+ height: 2.8,
curbMass: 12000,
- refLoad: 6658.56,
- lowLoad: 1331.712,
+ refLoad: 6762.6,
+ lowLoad: 1352.52,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
);
}
@@ -225,12 +226,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i % 3],
cdxA: 6.3,
- length: 14,
+ length: 13.5,
width: 2.55,
- height: 3.7,
+ height: 3.8,
curbMass: 12000,
- refLoad: 8212.224,
- lowLoad: 1642.4448,
+ refLoad: 7891.434,
+ lowLoad: 1578.2868,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
);
}
@@ -239,24 +240,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[6],
missionType: MissionType.Interurban,
cdxA: 4.7,
- length: 14,
+ length: 13.8,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 12000,
- refLoad: 5098.368,
- lowLoad: 1019.6736,
+ refLoad: 5018.706,
+ lowLoad: 1003.7412,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
cdxA: 4.7,
- length: 14,
+ length: 13.8,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 12000,
- refLoad: 3244.416,
- lowLoad: 648.8832,
+ refLoad: 3193.722,
+ lowLoad: 638.7444,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 }
);
@@ -266,7 +267,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 5.3,
length: 14,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 12000,
refLoad: 6952.32,
lowLoad: 1390.464,
@@ -278,7 +279,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 5.3,
length: 14,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 12000,
refLoad: 4634.88,
lowLoad: 926.976,
@@ -312,12 +313,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i],
cdxA: 5.1,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 2.7,
+ height: 2.8,
curbMass: 12000,
- refLoad: 8739.36,
- lowLoad: 1747.872,
+ refLoad: 8843.4,
+ lowLoad: 1768.68,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
}
@@ -326,12 +327,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i % 3],
cdxA: 6.4,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 3.7,
+ height: 3.8,
curbMass: 12000,
- refLoad: 10778.544,
- lowLoad: 2155.7088,
+ refLoad: 10906.86,
+ lowLoad: 2181.372,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
}
@@ -340,24 +341,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[6],
missionType: MissionType.Interurban,
cdxA: 4.8,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 12000,
- refLoad: 6691.608,
- lowLoad: 1338.3216,
+ refLoad: 6771.27,
+ lowLoad: 1354.254,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
cdxA: 4.8,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 12000,
- refLoad: 4258.296,
- lowLoad: 851.6592,
+ refLoad: 4308.99,
+ lowLoad: 861.798,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
@@ -365,24 +366,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[8],
missionType: MissionType.Interurban,
cdxA: 5.4,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 12000,
- refLoad: 9124.92,
- lowLoad: 1824.984,
+ refLoad: 9233.55,
+ lowLoad: 1846.71,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
cdxA: 5.4,
- length: 18,
+ length: 18.2,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 12000,
- refLoad: 6083.28,
- lowLoad: 1216.656,
+ refLoad: 6155.7,
+ lowLoad: 1231.14,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 }
);
@@ -415,7 +416,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 5.1,
length: 15,
width: 2.55,
- height: 2.7,
+ height: 2.8,
curbMass: 14000,
refLoad: 7178.76,
lowLoad: 1435.752,
@@ -429,7 +430,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 6.4,
length: 15,
width: 2.55,
- height: 3.7,
+ height: 3.8,
curbMass: 14000,
refLoad: 8853.804,
lowLoad: 1770.7608,
@@ -443,7 +444,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 4.8,
length: 15,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 14000,
refLoad: 5496.6780,
lowLoad: 1099.3356,
@@ -455,7 +456,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 4.8,
length: 15,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 14000,
refLoad: 3497.886,
lowLoad: 699.5772,
@@ -468,7 +469,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 5.4,
length: 15,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 14000,
refLoad: 7495.47,
lowLoad: 1499.094,
@@ -480,7 +481,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
cdxA: 5.4,
length: 15,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 14000,
refLoad: 4996.98,
lowLoad: 999.396,
@@ -514,12 +515,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i],
cdxA: 5.2,
- length: 20,
+ length: 21,
width: 2.55,
- height: 2.7,
+ height: 2.6,
curbMass: 14000,
- refLoad: 9779.76,
- lowLoad: 1955.952,
+ refLoad: 10299.96,
+ lowLoad: 2059.992,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
}
@@ -528,12 +529,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[i],
missionType: missions[i % 3],
cdxA: 6.5,
- length: 20,
+ length: 21,
width: 2.55,
- height: 3.7,
+ height: 3.8,
curbMass: 14000,
- refLoad: 12061.704,
- lowLoad: 2412.3408,
+ refLoad: 12703.284,
+ lowLoad: 2540.6568,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
}
@@ -542,24 +543,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[6],
missionType: MissionType.Interurban,
cdxA: 4.9,
- length: 20,
+ length: 21,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 14000,
- refLoad: 7488.228,
- lowLoad: 1497.6456,
+ refLoad: 7886.538,
+ lowLoad: 1577.3076,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
cdxA: 4.9,
- length: 20,
+ length: 21,
width: 2.55,
- height: 3.0,
+ height: 3.15,
curbMass: 14000,
- refLoad: 4765.236,
- lowLoad: 953.0472,
+ refLoad: 5018.706,
+ lowLoad: 1003.7412,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
@@ -567,24 +568,24 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
segment.Missions[8],
missionType: MissionType.Interurban,
cdxA: 5.5,
- length: 20,
+ length: 21,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 14000,
- refLoad: 10211.22,
- lowLoad: 2042.244,
+ refLoad: 10754.37,
+ lowLoad: 2150.874,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
cdxA: 5.5,
- length: 20,
+ length: 21,
width: 2.55,
- height: 3.9,
+ height: 3.7,
curbMass: 14000,
- refLoad: 6807.48,
- lowLoad: 1361.496,
+ refLoad: 7169.58,
+ lowLoad: 1433.916,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 }
);
@@ -599,7 +600,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(cdxA, m.DefaultCDxA.Value(), 1e-9);
Assert.AreEqual(length, m.BusParameter.VehicleLength.Value(), 1e-9);
Assert.AreEqual(width, m.BusParameter.VehicleWidth.Value(), 1e-9);
- Assert.AreEqual(height, m.VehicleHeight.Value(), 1e-9);
+ Assert.AreEqual(height, m.BusParameter.BodyHeight.Value(), 1e-9);
Assert.AreEqual(curbMass, m.CurbMass.Value(), 1e-9);
Assert.AreEqual(refLoad, m.RefLoad.Value(), 1e-9);
Assert.AreEqual(lowLoad, m.LowLoad.Value(), 1e-9);
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index d978c26853..126b9fd084 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -1,14 +1,10 @@
using System;
-using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Xml;
using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.BusAuxiliaries;
-using TUGraz.VECTO;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
--
GitLab