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

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

move default airdrag area from segment to mission

parent 6c2675c8
No related branches found
No related tags found
No related merge requests found
......@@ -54,13 +54,15 @@ namespace TUGraz.VectoCore.Models.Declaration
public Stream CycleFile;
public List<MissionTrailer> Trailer;
public IList<MissionTrailer> Trailer;
public Kilogram MinLoad;
public Kilogram LowLoad;
public Kilogram RefLoad;
public Kilogram MaxLoad;
public SquareMeter DefaultCDxA;
public CubicMeter TotalCargoVolume;
public Dictionary<LoadingType, Kilogram> Loadings
......
......@@ -59,9 +59,5 @@ namespace TUGraz.VectoCore.Models.Declaration
public MeterPerSecond DesignSpeed { get; internal set; }
public SquareMeter CdADefault { get; internal set; }
public SquareMeter CdAConstruction { get; internal set; }
}
}
\ No newline at end of file
......@@ -104,10 +104,6 @@ namespace TUGraz.VectoCore.Models.Declaration
VehicleHeight = LookupHeight(vehicleCategory, axleConfiguration, grossVehicleMassRating, vocational),
DesignSpeed = row.ParseDouble("designspeed").KMPHtoMeterPerSecond(),
GrossVehicleMassRating = grossVehicleMassRating,
CdADefault = string.IsNullOrEmpty(row["cdxa_default"].ToString()) ? null : row.ParseDouble("cdxa_default").SI<SquareMeter>(),
CdAConstruction = string.IsNullOrEmpty(row["cdxa_construction"].ToString())
? null
: row.ParseDouble("cdxa_construction").SI<SquareMeter>(),
};
return segment;
......@@ -248,12 +244,25 @@ namespace TUGraz.VectoCore.Models.Declaration
RefLoad = refLoad,
LowLoad = lowLoad,
TotalCargoVolume = body.CargoVolume + trailers.Sum(t => t.CargoVolume).DefaultIfNull(0),
DefaultCDxA = ReadDefaultAirDragValue(row, missionType)
};
missions.Add(mission);
}
return missions.ToArray();
}
private static SquareMeter ReadDefaultAirDragValue(DataRow row, MissionType missionType)
{
var airDragColumn = "cdxa_default";
if (missionType == MissionType.Construction) {
airDragColumn = "cdxa_construction";
}
var cdxA = string.IsNullOrEmpty(row[airDragColumn].ToString())
? null
: row.ParseDouble(airDragColumn).SI<SquareMeter>();
return cdxA;
}
private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight, Kilogram vehicleWeight,
IEnumerable<MissionTrailer> trailers, bool lowLoading)
{
......
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