on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

корректировка класса интерполяции глубин

Browse Source
This commit is contained in:
eugeniy_ivanov 2022-10-11 17:25:59 +05:00
parent 37e29e003c
commit cb2a8dfdeb
3 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs Normal file
View File

@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudInfrastructure.Services.Subsystems.Utils
{
#nullable enable
internal class DepthInterpolation
{
private IEnumerator<(DateTimeOffset dateMin, float depthMin, DateTimeOffset dateMax, float depthMax)> enumerator;
(DateTimeOffset x, float? y) lastValue = default;
private DateTimeOffset dateMin;
public DepthInterpolation(IOrderedEnumerable<(DateTimeOffset dateMin, float depthMin, DateTimeOffset dateMax, float depthMax)> collection)
{
enumerator = collection.GetEnumerator();
enumerator.MoveNext();
dateMin = enumerator.Current.dateMin;
}
public float GetDepth(DateTimeOffset date)
{
{
while (isLess(date))
{
lastValue.x = date;
lastValue.y = CalcValue(enumerator.Current, (date - dateMin).TotalSeconds);
enumerator.MoveNext();
}
}
return (float)lastValue.y;
}
private bool isLess(DateTimeOffset date)
{
if (date >= enumerator.Current.dateMin)
return true;
return false;
}
private float CalcValue((DateTimeOffset dateMin, float depthMin, DateTimeOffset dateMax, float depthMax) item, double timestamp)
{
var a = (item.depthMax - item.depthMin) / (item.dateMax - item.dateMin).TotalSeconds;
var b = item.depthMin * (item.dateMax.Second - (item.depthMax - item.depthMin) / (item.dateMax.Second - item.dateMin.Second));
var resultDepth = a * timestamp + b;
return (float)resultDepth;
}
}
#nullable disable
}

52
AsbCloudInfrastructure/Services/Subsystems/Interpolation.cs
View File

@ -1,52 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudInfrastructure.Services.Subsystems.Utils
{
#nullable enable
internal class Interpolation
{
private IEnumerator<(DateTimeOffset dateMin, float? depthMin, DateTimeOffset dateMax, float? depthMax)> enumerator;
(DateTimeOffset x, float? y) lastValue = default;
public Interpolation(IOrderedEnumerable<(DateTimeOffset dateMin, float? depthMin, DateTimeOffset dateMax, float? depthMax)> collection)
{
enumerator = collection.GetEnumerator();
enumerator.MoveNext();
}
public float GetDepth(DateTimeOffset date)
{
{
while (date >= enumerator.Current.dateMax)
{
if (isLess(date))
{
lastValue.x = date;
lastValue.y = CalcValue(enumerator.Current, date.Second);
}
enumerator.MoveNext();
}
}
return (float)lastValue.y;
}
private bool isLess(DateTimeOffset date)
{
if (date <= enumerator.Current.dateMax && date >= enumerator.Current.dateMin)
return true;
return false;
}
private float CalcValue((DateTimeOffset dateMin, float? depthMin, DateTimeOffset dateMax, float? depthMax) item, int x)
{
var a = (item.depthMax - item.depthMin) / (item.dateMax.Second - item.dateMin.Second);
var b = item.depthMin * (item.dateMax.Second - (item.depthMax - item.depthMin) / (item.dateMax.Second - item.dateMin.Second));
var resultDepth = a * x + b;
return (float)resultDepth;
}
}
#nullable disable
}

11
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs
View File

@ -284,24 +284,21 @@ namespace AsbCloudInfrastructure.Services.Subsystems
dataSpinList.Add(dateRowItem); dataSpinList.Add(dateRowItem);
} }
await resultSpin.DisposeAsync(); await resultSpin.DisposeAsync();
using var resultDepthFromSaub = await GetResultFromQueryAsync(queryDepthFromSaub, begin, idTelemetry, db, token); using var resultDepthFromSaub = await GetResultFromQueryAsync(queryDepthFromSaub, begin, idTelemetry, db, token);
var dataDepthFromSaub = new List<(DateTimeOffset dateMin, float depthMin, DateTimeOffset dateMax, float depthMax)>();
var dataDepthFromSaub = new List<(DateTimeOffset dateMin, float? depthMin, DateTimeOffset dateMax, float? depthMax)>();
while (resultDepthFromSaub.Read()) while (resultDepthFromSaub.Read())
{ {
var dateRowItem = var dateRowItem =
( (
resultDepthFromSaub.GetFieldValue<DateTimeOffset>(0), resultDepthFromSaub.GetFieldValue<DateTimeOffset>(0),
resultDepthFromSaub.GetFieldValue<float?>(1), resultDepthFromSaub.GetFieldValue<float>(1),
resultDepthFromSaub.GetFieldValue<DateTimeOffset>(2), resultDepthFromSaub.GetFieldValue<DateTimeOffset>(2),
resultDepthFromSaub.GetFieldValue<float?>(3) resultDepthFromSaub.GetFieldValue<float>(3)
); );
dataDepthFromSaub.Add(dateRowItem); dataDepthFromSaub.Add(dateRowItem);
} }
var interp = new Interpolation(dataDepthFromSaub.OrderBy(t => t.depthMin)); var interp = new DepthInterpolation(dataDepthFromSaub.OrderBy(t => t.depthMin));
if (dataSpinList.Any()) if (dataSpinList.Any())
{ {
var mode = dataSpinList[0].Mode; var mode = dataSpinList[0].Mode;