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

Skip to content
Snippets Groups Projects
Commit 7b623ce5 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

add floor type to primary bus segment table, use as criterion for selectring...

add floor type to primary bus segment table, use as criterion for selectring matching primary mission
parent 40c46580
No related branches found
No related tags found
No related merge requests found
...@@ -168,8 +168,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl ...@@ -168,8 +168,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var primarySegment = GetPrimarySegment(PrimaryVehicle); var primarySegment = GetPrimarySegment(PrimaryVehicle);
var primaryMission = primarySegment.Missions.Where( var primaryMission = primarySegment.Missions.Where(
m => { m => {
return m.BusParameter.DoubleDecker == CompletedVehicle.VehicleCode.IsDoubleDeckerBus() && return m.BusParameter.DoubleDecker ==
m.MissionType == mission.MissionType; CompletedVehicle.VehicleCode.IsDoubleDeckerBus() &&
m.MissionType == mission.MissionType &&
m.BusParameter.FloorType == CompletedVehicle.VehicleCode.GetFloorType();
}).First(); }).First();
simulationRunData = CreateVectoRunDataGeneric( simulationRunData = CreateVectoRunDataGeneric(
primaryMission, primaryMission,
......
...@@ -154,6 +154,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -154,6 +154,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public Meter DeltaHeight { get; internal set; } public Meter DeltaHeight { get; internal set; }
public Meter EntranceHeight { get; set; } public Meter EntranceHeight { get; set; }
public VehicleCode VehicleCode { get; set; } public VehicleCode VehicleCode { get; set; }
public FloorType FloorType { get; set; }
} }
......
...@@ -133,6 +133,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -133,6 +133,7 @@ namespace TUGraz.VectoCore.Models.Declaration
PassengerDensityRef = passengerDensityRef, PassengerDensityRef = passengerDensityRef,
DoubleDecker = row.ParseBoolean("doubledecker"), DoubleDecker = row.ParseBoolean("doubledecker"),
LowEntry = GetLowEntry(row.Field<string>("lowentry")), LowEntry = GetLowEntry(row.Field<string>("lowentry")),
FloorType = row.Field<string>("floortype").ParseEnum<FloorType>(),
EntranceHeight = row.ParseDouble("entranceheight").SI(Unit.SI.Milli.Meter).Cast<Meter>(), EntranceHeight = row.ParseDouble("entranceheight").SI(Unit.SI.Milli.Meter).Cast<Meter>(),
VehicleCode = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>(), VehicleCode = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>(),
HVACConfiguration = BusHVACSystemConfigurationHelper.Parse(row.Field<string>("hvacsystemconfiguration")), HVACConfiguration = BusHVACSystemConfigurationHelper.Parse(row.Field<string>("hvacsystemconfiguration")),
......
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