Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

added accelerationFile, CrosswindCorrectionParameters to CompletedBusSegments

parent 84a7f5d4
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 88 additions and 54 deletions
VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+ 5
− 0
View file @ e637a918
...@@ -90,6 +90,10 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -90,6 +90,10 @@ namespace TUGraz.VectoCore.Models.Declaration
var segment = new Segment { var segment = new Segment {
Found = true, Found = true,
AccelerationFile =
RessourceHelper.ReadStream(
DeclarationData.DeclarationDataResourcePrefix + ".VACC." +
row.Field<string>(".vaccfile")),
Missions = CreateMissions(rows), Missions = CreateMissions(rows),
VehicleClass = VehicleClassHelper.Parse("CB" + row.Field<string>("vehicleparametergroup")), VehicleClass = VehicleClassHelper.Parse("CB" + row.Field<string>("vehicleparametergroup")),
}; };
...@@ -115,6 +119,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -115,6 +119,7 @@ namespace TUGraz.VectoCore.Models.Declaration
var mission = new Mission { var mission = new Mission {
MissionType = missionType, MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
MinLoad = null, MinLoad = null,
MaxLoad = null, MaxLoad = null,
RefLoad = 100.SI<Kilogram>(), // dummy value to trigger simulation with ref load RefLoad = 100.SI<Kilogram>(), // dummy value to trigger simulation with ref load
......
VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+ 12
− 0
View file @ e637a918
...@@ -37,6 +37,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -37,6 +37,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry); var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length); Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass); Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
Assert.IsNotNull(segment.AccelerationFile);
} }
[TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31a, 3)] [TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.ClassCB31a, 3)]
...@@ -53,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -53,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(4.9, mission.DefaultCDxA.Value()); Assert.AreEqual(4.9, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -84,6 +86,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -84,6 +86,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(4.9, mission.DefaultCDxA.Value()); Assert.AreEqual(4.9, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -115,6 +118,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -115,6 +118,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(6.2, mission.DefaultCDxA.Value()); Assert.AreEqual(6.2, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -147,6 +151,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -147,6 +151,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.7, mission.DefaultCDxA.Value()); Assert.AreEqual(5.7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -179,6 +184,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -179,6 +184,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(7, mission.DefaultCDxA.Value()); Assert.AreEqual(7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -211,6 +217,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -211,6 +217,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i+3], mission.MissionType); Assert.AreEqual(_missionsTypes[i+3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value()); Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -243,6 +250,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -243,6 +250,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value()); Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -274,6 +282,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -274,6 +282,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value()); Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -306,6 +315,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -306,6 +315,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.6, mission.DefaultCDxA.Value()); Assert.AreEqual(4.6, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -337,6 +347,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -337,6 +347,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value()); Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -368,6 +379,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -368,6 +379,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value()); Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 37.5, axle2: 62.5, axle3: 0, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
......
VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+ 15
− 1
View file @ e637a918
...@@ -54,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -54,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry); var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length); Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass); Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
Assert.IsNotNull(segment.AccelerationFile);
} }
...@@ -71,6 +72,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -71,6 +72,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5, mission.DefaultCDxA.Value()); Assert.AreEqual(5, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -101,6 +103,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -101,6 +103,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5, mission.DefaultCDxA.Value()); Assert.AreEqual(5, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -131,6 +134,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -131,6 +134,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(6.3, mission.DefaultCDxA.Value()); Assert.AreEqual(6.3, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -162,6 +166,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -162,6 +166,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.8, mission.DefaultCDxA.Value()); Assert.AreEqual(5.8, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -193,6 +198,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -193,6 +198,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(7.1, mission.DefaultCDxA.Value()); Assert.AreEqual(7.1, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -224,6 +230,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -224,6 +230,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value()); Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -255,6 +262,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -255,6 +262,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value()); Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -286,6 +294,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -286,6 +294,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value()); Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -317,6 +326,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -317,6 +326,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(4.7, mission.DefaultCDxA.Value()); Assert.AreEqual(4.7, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -348,6 +358,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -348,6 +358,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.3, mission.DefaultCDxA.Value()); Assert.AreEqual(5.3, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -379,6 +390,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -379,6 +390,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType); Assert.AreEqual(_missionsTypes[i + 3], mission.MissionType);
Assert.AreEqual(5.3, mission.DefaultCDxA.Value()); Assert.AreEqual(5.3, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 27.3, axle2: 45.4, axle3: 27.3, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -408,6 +420,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -408,6 +420,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.1, mission.DefaultCDxA.Value()); Assert.AreEqual(5.1, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -438,6 +451,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -438,6 +451,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.1, mission.DefaultCDxA.Value()); Assert.AreEqual(5.1, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 24.3, axle2: 35.2, axle3: 40.5, axle4: 0, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
......
VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+ 4
− 1
View file @ e637a918
...@@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry); var segment = DeclarationData.CompletedBusSegments.Lookup(axleConfig.NumAxles(), vehicleCode, registrationClass, passengersLowerDeck, bodyHeight.SI<Meter>(), lowEntry);
Assert.AreEqual(numberOfMissions, segment.Missions.Length); Assert.AreEqual(numberOfMissions, segment.Missions.Length);
Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass); Assert.AreEqual(vehicleParameterGroup, segment.VehicleClass);
Assert.IsNotNull(segment.AccelerationFile);
} }
...@@ -64,6 +65,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -64,6 +65,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value()); Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 20, axle2: 28.20, axle3: 32.40, axle4: 19.40, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 20, axle2: 28.20, axle3: 32.40, axle4: 19.40, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
...@@ -95,6 +97,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration ...@@ -95,6 +97,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
Assert.AreEqual(_missionsTypes[i], mission.MissionType); Assert.AreEqual(_missionsTypes[i], mission.MissionType);
Assert.AreEqual(5.2, mission.DefaultCDxA.Value()); Assert.AreEqual(5.2, mission.DefaultCDxA.Value());
Assert.AreEqual("CoachBus", mission.CrossWindCorrectionParameters);
AssertAxleDistribution(axle1: 20, axle2: 28.2, axle3: 32.4, axle4: 19.4, axleLoadDistribution: mission.AxleWeightDistribution); AssertAxleDistribution(axle1: 20, axle2: 28.2, axle3: 32.4, axle4: 19.4, axleLoadDistribution: mission.AxleWeightDistribution);
AssertBusParameters( AssertBusParameters(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about