CS2-54: Fixed 'route speed' calculation

This commit is contained in:
KharchenkoVV 2021-08-19 14:13:08 +05:00
parent 9bda8b986d
commit aa87cb1c35

View File

@ -222,14 +222,6 @@ namespace AsbCloudInfrastructure.Services
return CalculateResult(mechSpeedBase);
}
private static IEnumerable<(double BhaUpSpeedPlan, double BhaUpSpeedFact)> GetWellBhaUpSpeedPlanFact(
IEnumerable<IGrouping<int, WellOperation>> groupedOperations)
{
var bhaUpSpeedBase = GetParams(groupedOperations, 1072);
return CalculateResult(bhaUpSpeedBase);
}
private static IEnumerable<(double BhaDownSpeedPlan, double BhaDownSpeedFact)> GetWellBhaDownSpeedPlanFact(
IEnumerable<IGrouping<int, WellOperation>> groupedOperations)
{
@ -238,6 +230,14 @@ namespace AsbCloudInfrastructure.Services
return CalculateResult(bhaDownSpeedBase);
}
private static IEnumerable<(double BhaUpSpeedPlan, double BhaUpSpeedFact)> GetWellBhaUpSpeedPlanFact(
IEnumerable<IGrouping<int, WellOperation>> groupedOperations)
{
var bhaUpSpeedBase = GetParams(groupedOperations, 1072);
return CalculateResult(bhaUpSpeedBase);
}
private static IEnumerable<(double CasingDownSpeedPlan, double CasingDownSpeedFact)> GetWellCasingDownPlanFact(
IEnumerable<IGrouping<int, WellOperation>> groupedOperations)
{
@ -279,8 +279,8 @@ namespace AsbCloudInfrastructure.Services
var routeSpeedsBase = bhaRaiseDecreaseCollection.Select(el =>
(
RouteDepthPlan: (el.FirstBhaPositionDecreasePlan?.WellDepth - el.LastBhaPositionIncreasePlan?.WellDepth) ?? 0,
RouteDepthFact: (el.FirstBhaPositionDecreaseFact?.WellDepth - el.LastBhaPositionIncreaseFact?.WellDepth) ?? 0,
RouteDepthPlan: (el.LastBhaPositionIncreasePlan?.WellDepth - el.FirstBhaPositionDecreasePlan?.WellDepth) ?? 0,
RouteDepthFact: (el.LastBhaPositionIncreaseFact?.WellDepth - el.FirstBhaPositionDecreaseFact?.WellDepth) ?? 0,
RouteDurationPlan: (el.LastBhaPositionIncreasePlan?.StartDate +
TimeSpan.FromHours(el.LastBhaPositionIncreasePlan?.DurationHours ?? 0) -
el.FirstBhaPositionDecreasePlan?.StartDate)?.TotalHours ?? 0,