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

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

bugfix: error in computaton of reference load, reference load may not exceed maximum load

parent 6e61e215
No related branches found
No related tags found
No related merge requests found
......@@ -137,14 +137,14 @@ namespace TUGraz.VectoCore.Models.Declaration
mission.MaxLoad = grossVehicleMassRating - mission.MassExtra - curbWeight;
var refLoadField = row.Field<string>("payload-" + missionType.ToString().ToLower());
mission.RefLoad = CalculateRefLoad(grossVehicleMassRating, refLoadField, missionType);
mission.RefLoad = CalculateRefLoad(grossVehicleMassRating, refLoadField, missionType, mission.MaxLoad);
yield return mission;
}
}
private static Kilogram CalculateRefLoad(Kilogram grossVehicleMassRating, string refLoadField,
MissionType missionType)
private static Kilogram CalculateRefLoad(Kilogram grossVehicleMassRating, string refLoadField, MissionType missionType,
Kilogram maxLoad)
{
const double longHaulFactor = 0.5882;
const double otherFactor = 0.3941;
......@@ -162,7 +162,7 @@ namespace TUGraz.VectoCore.Models.Declaration
refLoad = refLoadField.ToDouble().SI<Kilogram>();
}
return VectoMath.Min(refLoad, grossVehicleMassRating);
return VectoMath.Min(refLoad, maxLoad);
}
}
}
\ No newline at end of file
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