Skip to content

T
Thick-Common
Commit 9671ddff authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

还在修改 样品采集，添加很多报警

parent 7e126e15
Hide whitespace changes
Inline Side-by-side
Showing with 404 additions and 203 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml.cs
View file @ 9671ddff
......@@ -64,16 +64,10 @@ namespace FLY.Thick.Base.UI
/// </summary>
public bool Enable { get; set; }
/// <summary>
/// 参数：速度
/// </summary>
public UInt32 Velocity { get; set; }
/// <summary>
/// 参数：样品点范围
/// </summary>
public int Range { get; set; }
public int SampleRange { get; set; }
/// <summary>
/// 参数：移动滤波 ，窗口值
......@@ -92,6 +86,18 @@ namespace FLY.Thick.Base.UI
/// 异常值
/// </summary>
public int ErrValue { get; set; }
/// <summary>
/// 当前 样品X_AD/样品0_AD 与 上一次比较 差异比例 单位不是%
/// </summary>
public double CrossErrPercent { get; set; }
/// <summary>
/// 异常比较 时间间隔范围;
/// 两次时间点比较， 时间点的间隔最大时长。 大于它无效，不能比较
/// </summary>
public int ErrIntervalMin { get; set; }
/// <summary>
/// 参数：样品点参数
/// </summary>
......@@ -99,7 +105,7 @@ namespace FLY.Thick.Base.UI
/// <summary>
/// 参数：特征查找范围
/// </summary>
public int Search { get; set; }
public int SearchRange { get; set; }
/// <summary>
/// 参数：特征参数
/// </summary>
......@@ -133,13 +139,12 @@ namespace FLY.Thick.Base.UI
this.getSampleService = getSampleService;
this.gageInfoService = gageInfoService;
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Enable), this, nameof(Enable));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Velocity), this, nameof(Velocity));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Range), this, nameof(Range));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SampleRange), this, nameof(SampleRange));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Window), this, nameof(Window));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.IsCheckByPercent), this, nameof(IsCheckByPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrPercent), this, nameof(ErrPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrValue), this, nameof(ErrValue));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Search), this, nameof(Search));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SearchRange), this, nameof(SearchRange));
Samples = new SampleCell[this.getSampleService.Samples.Count()];
Features = new SampleFeature[this.getSampleService.Features.Count()];
......@@ -173,7 +178,7 @@ namespace FLY.Thick.Base.UI
this.getSampleService.Enable = this.Enable;
this.getSampleService.Range = this.Range;
this.getSampleService.SampleRange = this.SampleRange;
this.getSampleService.Velocity = this.Velocity;
this.getSampleService.Window = this.Window;
this.getSampleService.IsCheckByPercent = this.IsCheckByPercent;
......@@ -190,7 +195,7 @@ namespace FLY.Thick.Base.UI
sample_desp.OrgAD = sample_src.OrgAD;
sample_desp.Position = sample_src.Position;
}
this.getSampleService.Search = this.Search;
this.getSampleService.SearchRange = this.SearchRange;
for (int i = 0; i < Features.Count(); i++)
{
var feature_src = this.Features[i];
......
Project.FLY.Thick.Base/FLY.Thick.Base/Client/GetSampleServiceClient.cs
View file @ 9671ddff
......@@ -15,14 +15,14 @@ namespace FLY.Thick.Base.Client
/// 边界查找服务 构造
/// </summary>
/// <param name="id"></param>
public GetSampleServiceClient(UInt32 id) : base(id) { init(); }
public GetSampleServiceClient(UInt32 id) : base(id) { }
/// <summary>
/// 边界查找服务 构造
/// </summary>
/// <param name="serviceId">服务id</param>
/// <param name="connName">连接器</param>
public GetSampleServiceClient(UInt32 serviceId, string connName) : base(serviceId, connName) { init(); }
public GetSampleServiceClient(UInt32 serviceId, string connName) : base(serviceId, connName) { }
......@@ -41,7 +41,7 @@ namespace FLY.Thick.Base.Client
/// <summary>
/// 参数：样品点范围
/// </summary>
public int Range { get; set; }
public int SampleRange { get; set; }
/// <summary>
......@@ -65,19 +65,23 @@ namespace FLY.Thick.Base.Client
/// <summary>
/// 样品
/// </summary>
public SampleCell[] Samples { get; set; } = new SampleCell[3];
public SampleCell[] Samples { get; set; } = new SampleCell[] {
new SampleCell(),new SampleCell(),new SampleCell()
};
/// <summary>
/// 查找公差
/// </summary>
public int Search { get; set; }
public int SearchRange { get; set; }
/// <summary>
/// 特征 相识度 0 正， 1 反
/// </summary>
public SampleFeature[] Features { get; set; } = new SampleFeature[2];
public SampleFeature[] Features { get; set; } = new SampleFeature[] {
new SampleFeature(),new SampleFeature()
};
public double CrossErrPercent { get; set; }
public int ErrIntervalMin { get; set; }
/// <summary>
///
......@@ -88,16 +92,6 @@ namespace FLY.Thick.Base.Client
}
#endregion
void init()
{
for (int i = 0; i < Samples.Count(); i++)
Samples[i] = new SampleCell();
for (int i = 0; i < Features.Count(); i++)
Features[i] = new SampleFeature();
}
}
}
Project.FLY.Thick.Base/FLY.Thick.Base/IService/IGetSampleService.cs
View file @ 9671ddff
......@@ -24,43 +24,64 @@ namespace FLY.Thick.Base.IService
/// <summary>
/// 参数：速度
/// </summary>
UInt32 Velocity { get; set; }
UInt32 Velocity { get; }
/// <summary>
/// 参数：样品点范围
/// 参数：样品点范围 单位:脉冲
/// 样品点直径为 Range*2
/// </summary>
int Range { get; set; }
int SampleRange { get; set; }
/// <summary>
/// 参数：移动滤波 ，窗口值
/// 参数：移动滤波 ，窗口值 单位:min
/// </summary>
int Window { get; set; }
/// <summary>
/// 使用%方式检查异常
/// 1.滤波前AD 与 滤波后AD比较
/// 2.当前样品AD 与 上一次样品AD比较
/// 3.当前 样品X_AD/样品0_AD 与 上一次比较
/// </summary>
bool IsCheckByPercent { get; set; }
/// <summary>
/// 异常%
/// 异常比例 单位不是%
/// </summary>
double ErrPercent { get; set; }
/// <summary>
/// 异常值
/// </summary>
int ErrValue { get; set; }
/// <summary>
/// 当前 样品X_AD/样品0_AD 与 上一次比较 差异比例 单位不是%
/// </summary>
double CrossErrPercent { get; set; }
/// <summary>
/// 异常比较 时间间隔范围;
/// 两次时间点比较， 时间点的间隔最大时长。 大于它无效，不能比较
/// </summary>
int ErrIntervalMin { get; set; }
/// <summary>
/// 参数：样品点参数
/// </summary>
[PropertyPush]
SampleCell[] Samples { get; }
/// <summary>
/// 参数：特征查找范围
/// 参数：特征查找范围 单位:脉冲
/// 取样范围 会扩大为 -SearchRange ~ +SearchRange
/// </summary>
int Search { get; set; }
int SearchRange { get; set; }
/// <summary>
/// 参数：特征参数
/// 参数：特征参数 0:正方向， 1:反方向
/// </summary>
[PropertyPush]
SampleFeature[] Features { get; }
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GetSample.cs
View file @ 9671ddff
......@@ -39,37 +39,53 @@ namespace FLY.Thick.Base.Server
/// <summary>
/// 参数：样品点范围
/// 参数：样品点范围 单位:脉冲
/// 样品点直径为 Range*2
/// </summary>
public int Range { get; set; } = 100;
public int SampleRange { get; set; } = 100;
/// <summary>
/// 滤波窗口,单位 min
/// </summary>
public int Window { get; set; }
/// <summary>
/// 使用%方式检查异常
/// </summary>
public bool IsCheckByPercent { get; set; } = true;
/// <summary>
/// 异常% 单位%
/// 异常比例 单位不是%
/// </summary>
public double ErrPercent { get; set; } = 2;
public double ErrPercent { get; set; } = 0.02;
/// <summary>
/// 异常值
/// </summary>
public int ErrValue { get; set; } = 200;
/// <summary>
/// 当前 样品X_AD/样品0_AD 与 上一次比较 差异比例 单位不是%
/// </summary>
public double CrossErrPercent { get; set; } = 0.02;
/// <summary>
/// 异常比较 时间间隔范围;
/// 两次时间点比较， 时间点的间隔最大时长。 大于它无效，不能比较
/// </summary>
public int ErrIntervalMin { get; set; } = 30;
/// <summary>
/// 样品
/// </summary>
public SampleCell[] Samples { get; set; }
/// <summary>
/// 查找公差
/// 参数：特征查找范围 单位:脉冲
/// 取样范围 会扩大为 -SearchRange ~ +SearchRange
/// </summary>
public int Search { get; set; } = 100;
public int SearchRange { get; set; } = 100;
/// <summary>
/// 特征 相识度 0 正， 1 反
......@@ -78,6 +94,8 @@ namespace FLY.Thick.Base.Server
#endregion
TempFilter2[] tempFilters;
DIRECTION[] directions;
IGageInfoService mGageInfo;
......@@ -106,7 +124,7 @@ namespace FLY.Thick.Base.Server
tempFilters[i] = new TempFilter2();
Enable = true;
Range = 100;//样品范围
SampleRange = 100;//样品范围
Velocity = 200;//取样速度
Window = 3;//移动窗口
IsCheckByPercent = true;
......@@ -137,7 +155,7 @@ namespace FLY.Thick.Base.Server
};
directions[2] = DIRECTION.FORWARD;
Search = 100;
SearchRange = 100;
Features[0] = new SampleFeature() { StartPos = 0, EndPos = 0 };
Features[1] = new SampleFeature() { StartPos = 2000, EndPos = 2100 };
......@@ -247,8 +265,8 @@ namespace FLY.Thick.Base.Server
SampleCell sample = Samples[i];
if ((sample.Enable) && (directions[i] == direction))
{
int _b = sample.Position - Range;
int _e = sample.Position + Range;
int _b = sample.Position - SampleRange;
int _e = sample.Position + SampleRange;
if (!valid)
{
......@@ -274,8 +292,8 @@ namespace FLY.Thick.Base.Server
{
if (Features[r_idx].Enable)
{
b -= Search;
e += Search;
b -= SearchRange;
e += SearchRange;
}
start = b;
end = e;
......@@ -296,7 +314,7 @@ namespace FLY.Thick.Base.Server
{
if (sample.Enable)
{
if(((sample.Position - Range)<0) || ((sample.Position+Range)>= flyad.PosLen))
if(((sample.Position - SampleRange)<0) || ((sample.Position+SampleRange)>= flyad.PosLen))
return false;
}
}
......@@ -304,7 +322,7 @@ namespace FLY.Thick.Base.Server
{
if (feature.Enable)
{
if(((feature.StartPos - Search)<0) || ((feature.EndPos+Search)>= flyad.PosLen))
if(((feature.StartPos - SearchRange)<0) || ((feature.EndPos+SearchRange)>= flyad.PosLen))
return false;
}
}
......@@ -323,163 +341,293 @@ namespace FLY.Thick.Base.Server
Do(direction, 0, dat);
}
/// <summary>
/// 样品取样，推送给thickm, 参数一定合法，不用检测
/// </summary>
/// <param name="direction">方向</param>
/// <param name="grid_start">开始grid序号</param>
/// <param name="buf">grid数据</param>
public virtual void Do(Misc.DIRECTION direction, int grid_start, int[] buf)
bool CalGridOffset(SampleFeature psr, Misc.DIRECTION direction,int grid_start, int[] buf, out int grid_offset)
{
//取样结果，isFailure=true, 取样失败，全部复位！！！
bool isFailure = false;
if (CheckParamIsValid() == false)
return;
int grid_offset = 0;//经过相识性计算后的偏移量
grid_offset = 0;
//检测机架数据，当为空时，不能作相识性计算
if (!mGageInfo.DataOK)
return true;
//在这里处理gsample->m_timer
int dir_idx = (direction == Misc.DIRECTION.FORWARD) ? 0 : 1;
int pos1 = psr.StartPos;
int pos2 = psr.EndPos;
int posOfGrid = flyad.PosOfGrid;
//数据在 gsample -> gagedata[0]
SampleFeature psr = Features[dir_idx] as SampleFeature;
int grid1 = pos1 / posOfGrid;
int grid2 = pos2 / posOfGrid;
int grid_searchtol = SearchRange / posOfGrid;
//这个方向的特征查找使能了，位置修正！！！！！！
if (psr.Enable)
//获取相同方向的机架信息数据
int index = (direction == Misc.DIRECTION.FORWARD) ? 0 : 1;
int[] gagedata = null;
mGageInfo.GetGageInfo(index, (asyncContext, retData) =>
{
//检测机架数据，当为空时，不能作相识性计算
if (!mGageInfo.DataOK)
goto _corr_end;
var reponse = retData as GetGageInfoResponse;
gagedata = reponse.Data;
}, this);
int pos1 = psr.StartPos;
int pos2 = psr.EndPos;
int posOfGrid = flyad.PosOfGrid;
int grid1 = pos1 / posOfGrid;
int grid2 = pos2 / posOfGrid;
int grid_searchtol = Search / posOfGrid;
//合格,查找最大相识性的点
int grid_b = grid1 - grid_searchtol;
int grid_e = grid2 + grid_searchtol;
int grid_len = grid_e - grid_b + 1;
int[] scanData = new int[grid_len];//这个方向的需要 特征查找范围内的数据，不用考虑 buf 不够 grid_len
//获取相同方向的机架信息数据
int index = (direction == Misc.DIRECTION.FORWARD) ? 0 : 1;
int[] gagedata = null;
mGageInfo.GetGageInfo(index, (asyncContext, retData) =>
Array.Copy(buf, grid_b - grid_start, scanData, 0, grid_len);
double max_relvency = 0;
int max_grid_offset = 0;
for (int i = 0; i < grid_searchtol * 2; i++)
{
double r = Misc.MyMath.Correl(gagedata, grid1, scanData, i, grid2 - grid1 + 1);
if (r > max_relvency)
{
var reponse = retData as GetGageInfoResponse;
gagedata = reponse.Data;
}, this);
max_relvency = r;
max_grid_offset = i - grid_searchtol;
}
}
psr.MaxRelevancy = max_relvency;
psr.MaxOffset = max_grid_offset * posOfGrid;
//合格,查找最大相识性的点
int grid_b = grid1 - grid_searchtol;
int grid_e = grid2 + grid_searchtol;
int grid_len = grid_e - grid_b + 1;
int[] scanData = new int[grid_len];//这个方向的需要 特征查找范围内的数据，不用考虑 buf 不够 grid_len
if (max_relvency > 0.8) //相识度必须高于0.8
{
grid_offset = max_grid_offset;//位置修正
return true;
}
else
{
//相似性太低，取样失败！！！
return false;
}
}
Array.Copy(buf, grid_b - grid_start, scanData, 0, grid_len);
/// <summary>
/// 设置这个方向 全部样品为失败
/// </summary>
/// <param name="direction"></param>
void SetFailure(Misc.DIRECTION direction)
{
for (int i = 0; i < Samples.Count(); i++)
{
SampleCell sample = Samples[i];
var tempre = tempFilters[i];
if ((directions[i] == direction) && (sample.Enable))
{
tempre.Reset();
sample.IsFailure = true;
}
}
}
double max_relvency = 0;
int max_grid_offset = 0;
enum GetSampleAdResult
{
OK,
/// <summary>
/// 没有采集数据
/// </summary>
Invalid,
/// <summary>
/// AD值为0
/// </summary>
Zero,
/// <summary>
/// 滤波 异常
/// </summary>
FilterErr,
/// <summary>
/// 与上一个比较，变化太大
/// </summary>
TimeCompareErr
}
GetSampleAdResult GetSampleAd(SampleCell sample, TempFilter2 tempre, int grid_start, int[] buf, int grid_offset, out int ad)
{
//获取grid 数据
int posOfGrid = flyad.PosOfGrid;
int grid = sample.Position / posOfGrid + grid_offset;
int grid_range = SampleRange / posOfGrid;
int grid1 = grid - grid_range;
int grid_len = grid_range * 2;
int grid_b = grid1 - grid_start;
int grid_e = grid_b + grid_len - 1;
//计算平均值
ad = Misc.MyMath.Avg(buf, grid_b, grid_e);
if (!Misc.MyBase.ISVALIDATA(ad))//AD无效。。。异常，复位
{
ad = -1;
for (int i = 0; i < grid_searchtol * 2; i++)
return GetSampleAdResult.Invalid;
}
else
{
int orgAd = ad;
ad = tempre.CalSampleAD(orgAd, TimeSpan.FromMinutes(Window));//ad 滤波
double diff = Math.Abs(orgAd - ad);
if (IsCheckByPercent)
{
double r = Misc.MyMath.Correl(gagedata, grid1, scanData, i, grid2 - grid1 + 1);
if (r > max_relvency)
if (diff == 0)
{
}
else if (ad == 0)
{
max_relvency = r;
max_grid_offset = i - grid_searchtol;
ad = -1;
return GetSampleAdResult.Zero;
}
else if (diff / ad >= ErrPercent) //大于2% 异常
{
return GetSampleAdResult.FilterErr;
}
}
psr.MaxRelevancy = max_relvency;
psr.MaxOffset = max_grid_offset * posOfGrid;
if (max_relvency > 0.8) //相识度必须高于0.8
grid_offset = max_grid_offset;//位置修正
else
{
//相似性太低，取样失败！！！
isFailure = true;
if (diff >= ErrValue)
{
return GetSampleAdResult.FilterErr;
}
}
//获取以前的Ad
int lastAd = tempre.GetLastAd(GetErrIntervalTime);
if (lastAd != -1) {
//找到了
diff = Math.Abs(ad - lastAd);
if (diff / ad >= ErrPercent) //大于2% 异常
{
return GetSampleAdResult.TimeCompareErr;
}
}
}
return GetSampleAdResult.OK;
}
DateTime GetErrIntervalTime => DateTime.Now - TimeSpan.FromMinutes(ErrIntervalMin);
_corr_end:
int ad = -1;
GetSampleAdResult SetSampleAds(Misc.DIRECTION direction, int grid_start, int[] buf, int grid_offset)
{
for (int i = 0; i < Samples.Count(); i++)
{
SampleCell sample = Samples[i] as SampleCell;
SampleCell sample = Samples[i];
var tempre = tempFilters[i];
if ((directions[i] == direction) && (sample.Enable))
{
ad = -1;
if (!isFailure)//不修要位置修正
//获取滤波后的AD值
var ret = GetSampleAd(sample, tempre, grid_start, buf, grid_offset, out int ad);
if(ret == GetSampleAdResult.OK)
{
//获取grid 数据
int posOfGrid = flyad.PosOfGrid;
int grid = sample.Position / posOfGrid + grid_offset;
int grid_range = Range / posOfGrid;
int grid1 = grid - grid_range;
int grid_len = grid_range * 2;
int grid_b = grid1 - grid_start;
int grid_e = grid_b + grid_len - 1;
//计算平均值
ad = Misc.MyMath.Avg(buf, grid_b, grid_e);
if (!Misc.MyBase.ISVALIDATA(ad))//AD无效。。。异常，复位
{
isFailure = true;
}
else
{
int orgAd = ad;
ad = tempre.CalSampleAD(orgAd, TimeSpan.FromMinutes(Window));//ad 滤波
int diff = Math.Abs(orgAd - ad);
if (IsCheckByPercent)
{
if (diff == 0)
{
}
else if (ad == 0)
{
isFailure = true;
}
else if (diff / ad >= ErrPercent * 0.01) //大于2% 异常
{
isFailure = true;
}
}
else {
if (diff >= ErrValue)
{
isFailure = true;
}
}
}
sample.AD = ad;
sample.IsFailure = false;
}
if (isFailure)
else
{
tempre.Reset();
ad = -1;
return ret;
}
else
}
}
if (Samples[0].AD > 0 && Samples[0].IsFailure == false)
{
//交叉比较
for (int i = 1; i < Samples.Count(); i++)
{
SampleCell sample = Samples[i];
if ((directions[i] == direction) && (sample.Enable))
{
sample.AD = ad;
double p = 1.0 * Samples[i].AD / Samples[0].AD;
if (p <= 0)
break;
int lastAdi = tempFilters[i].GetLastAd(GetErrIntervalTime);
int lastAd0 = tempFilters[0].GetLastAd(GetErrIntervalTime);
if (lastAd0 == 0)
break;
double last_p = 1.0 * lastAdi / lastAd0;
double diff = Math.Abs(last_p - p);
if (diff / p >= CrossErrPercent) //大于2% 异常
{
//TODO
//TODO
return GetSampleAdResult.TimeCompareErr;
}
}
sample.IsFailure = isFailure;
}
}
return GetSampleAdResult.OK;
}
/// <summary>
/// 样品取样，推送给thickm, 参数一定合法，不用检测
/// </summary>
/// <param name="direction">方向</param>
/// <param name="grid_start">开始grid序号</param>
/// <param name="buf">grid数据</param>
public virtual void Do(Misc.DIRECTION direction, int grid_start, int[] buf)
{
SampleChangedEvent?.Invoke(this);
if (CheckParamIsValid() == false)
return;
int grid_offset = 0;//经过相识性计算后的偏移量
if (isFailure)//样品获取失败，下次继续！！！
//数据在 gsample -> gagedata[0]
SampleFeature psr = Features[(direction == Misc.DIRECTION.FORWARD) ? 0 : 1];
//这个方向的特征查找使能了，位置修正！！！！！！
if (psr.Enable)
{
this.warningSystem.Add(
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Code,
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Descrption);
//通过特征 计算样品偏移,
//当没有机架信息，会返回 true
//成功 计算出偏移 返回 true
//相关性太低，返回 false
if (!CalGridOffset(psr, direction, grid_start, buf, out grid_offset))
{
//有问题，全部复位
SetFailure(direction);
this.warningSystem.Update(
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Code,
$"{ERRNOs.Instance.SAMPLE_ERRNO_Failure.Descrption}:特征查找失败");
goto _end;
}
}
//获取这个方向全部样品AD
var ret = SetSampleAds(direction, grid_start, buf, grid_offset);
switch (ret)
{
case GetSampleAdResult.Zero:
{
this.warningSystem.Update(
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Code,
$"{ERRNOs.Instance.SAMPLE_ERRNO_Failure.Descrption}:AD值为0");
}
break;
case GetSampleAdResult.Invalid:
{
this.warningSystem.Update(
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Code,
$"{ERRNOs.Instance.SAMPLE_ERRNO_Failure.Descrption}:没有采集数据");
}
break;
case GetSampleAdResult.FilterErr:
{
this.warningSystem.Update(
ERRNOs.Instance.SAMPLE_ERRNO_Failure.Code,
$"{ERRNOs.Instance.SAMPLE_ERRNO_Failure.Descrption}:滤波异常");
}
break;
}
if(ret != GetSampleAdResult.OK)
{
//有问题，全部复位
SetFailure(direction);
}
_end:
SampleChangedEvent?.Invoke(this);
}
/// <summary>
......@@ -494,7 +642,7 @@ namespace FLY.Thick.Base.Server
{
if (sample.Enable)
{
if ((sample.AD < 0))
if ((sample.AD <= 0))
return false;
}
}
......@@ -515,7 +663,7 @@ namespace FLY.Thick.Base.Server
{
if (sample.Enable)
{
if ((sample.AD < 0) || (sample.IsFailure))
if ((sample.AD <= 0) || (sample.IsFailure))
return true;
}
}
......@@ -542,17 +690,7 @@ namespace FLY.Thick.Base.Server
SampleChangedEvent?.Invoke(this);
}
/// <summary>
/// 重新获取样品
/// </summary>
//public void Reset()
//{
// foreach (SampleCell sample in Samples)
// {
// TempFilter tempre = sample.TempF;
// tempre.ResetSampleFailure();
// }
//}
public event PropertyChangedEventHandler PropertyChanged;
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/TempFilter.cs
View file @ 9671ddff
......@@ -239,8 +239,10 @@ namespace FLY.Thick.Base.Server
public class TempFilter2
{
List<TempFilterData> Datas = new List<TempFilterData>();
const int KeepTimeMin = 6;
const int KeepCount = 9;
TimeSpan keepTime = TimeSpan.FromMinutes(KeepTimeMin);
TimeSpan keepTime = TimeSpan.FromMinutes(6);
/// <summary>
///
/// </summary>
......@@ -261,50 +263,91 @@ namespace FLY.Thick.Base.Server
{
filterTime = TimeSpan.Zero;
}
keepTime = TimeSpan.FromMinutes(Math.Max(6, filterTime.TotalMinutes * 3));
var now = DateTime.Now;
Datas.RemoveAll(d => d.Time < now - keepTime);
keepTime = TimeSpan.FromMinutes(Math.Max(KeepTimeMin, filterTime.TotalMinutes * 3));
KeepSize();
Datas.Add(new TempFilterData()
{
Ad = ad,
FilterAd = ad,
Time = now
});
double sum = 0;
int cnt = 0;
for (int i = 0; i < Datas.Count(); i++)
double sum = ad;
int cnt = 1;
for (int i = 1; i < Datas.Count(); i++)
{
var d = Datas[Datas.Count()-1-i];
if (d.Time >= (now - filterTime) && d.IsReset == false)
{
sum += d.Ad;
cnt++;
int index = Datas.Count() - 1 - i;
var d = Datas[index];
if (d.IsReset) {
//这个是reset 信号，退出
break;
}
else {
if (d.Time < (now - filterTime))
{
//太久了，退出
break;
}
sum += d.Ad;
cnt++;
}
if (cnt > 0)
{
Datas.Last().FilterAd = (int)Math.Round(sum / cnt);
}
return Datas.Last().FilterAd;
ad = (int)Math.Round(sum / cnt);
Datas.Last().FilterAd = ad;
return ad;
}
/// <summary>
///
/// </summary>
public void Reset()
{
KeepSize();
if (Datas.Count > 0 && !Datas.Last().IsReset)
{
//上一次是复位信号，就不需要再添加一个复位信号了
Datas.Add(new TempFilterData() { IsReset = true, Time = DateTime.Now });
}
}
void KeepSize()
{
var now = DateTime.Now;
Datas.RemoveAll(d => d.Time < now - keepTime);
Datas.Add(new TempFilterData() { IsReset = true, Time = DateTime.Now });
int index = Datas.FindIndex(d => d.Time >= now - keepTime);
if (index <= 0)
return;
//小于index, 都是要删除的
//但必须保证删除后 Datas.Length >=10
int len = Datas.Count() - index;
if (len < KeepCount)
index = Datas.Count() - KeepCount;
if (index <= 0)
return;
Datas.RemoveRange(0, index);
}
public List<TempFilterData> GetDatas()
{
return Datas;
}
public int GetLastAd(DateTime time)
{
for (int i = 1; i < Datas.Count; i++)
{
int index = Datas.Count() - 1 - i;
var d = Datas[index];
if (d.Time < time)
return -1;//时间太早了，没有数据
if (Datas[index].IsReset)
continue;
return d.Ad;
}
return -1;//没有数据
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment