From 1a8a81785470302fc7fbd6914a9df5d1094dac2a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 28 八月 2024 17:31:07 +0800
Subject: [PATCH] 调度修改
---
IStation.Service/08-algorithm/01-analysis/AnalysisHelper.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/IStation.Service/08-algorithm/01-analysis/AnalysisHelper.cs b/IStation.Service/08-algorithm/01-analysis/AnalysisHelper.cs
index 24bd9b0..3b3c0c5 100644
--- a/IStation.Service/08-algorithm/01-analysis/AnalysisHelper.cs
+++ b/IStation.Service/08-algorithm/01-analysis/AnalysisHelper.cs
@@ -11,13 +11,13 @@
double _frequency_def = 50;
double _frequency_min = 25;
double _frequency_max = 50;
- double _frequency_space = 0.1;//棰戠巼闂撮殧
+ double _frequency_space = 0.10;//棰戠巼闂撮殧
- double _head_space = 0.1;//鎵▼闂撮殧
+ double _head_space = 0.1;//鎵▼闂撮殧
readonly DAL.SQLite.AnalysisCombine _dal_analysis_combine = new();
- readonly DAL.SQLite.AnalysisConclusion _dal_analysis_conclusion = new();
- readonly DAL.SQLite.AnalysisLog _dal_analysis_log = new();
+ readonly DAL.SQLite.AnalysisConclusion _dal_analysis_conclusion = new();
+ readonly DAL.SQLite.AnalysisFactor _dal_analysis_factor= new();
/// <summary>
@@ -27,20 +27,24 @@
/// <returns></returns>
public void AnalysisCombine(List<Model.Pump> pumps)
{
- InsertAnaLog("寮�濮嬪垎鏋愭车缁勫悎");
+ InsertAnaLog("寮�濮嬪垎鏋愭车缁勫悎");
if (pumps == null || pumps.Count < 1)
{
InsertAnaLog("鍒嗘瀽澶辫触:娌℃湁娉垫暟鎹�!");
return;
}
+
+ var all_ana_factor_list = _dal_analysis_factor.GetAll();
var fre_def = _frequency_def;
var ana_pump_list = new List<AnaPump>();
foreach (var pump in pumps)
{
+ var pump_factor_list = all_ana_factor_list?.Where(x => x.Flag == pump.Flag).ToList();
if (pump.IsBp)
{
//鍙橀娉�
- var anaPump = new AnaPump(pump, fre_def, _frequency_min, _frequency_max, _frequency_space);
+ var fre_head_diff_avg_dict= pump_factor_list?.ToDictionary(x=>x.Hz,y=>y.HeadDeviation);
+ var anaPump = new AnaPump(pump, fre_def, _frequency_min, _frequency_max, _frequency_space, fre_head_diff_avg_dict);
if (anaPump.AllowCalc)
ana_pump_list.Add(anaPump);
}
@@ -89,8 +93,6 @@
InsertAnaLog($"鍒嗘瀽杩涘害:{pumps.Count}鍙版车,鍒嗘瀽瀹屾瘯!");
}
-
-
/// <summary>
/// 鍒嗘瀽缁撹
@@ -145,7 +147,7 @@
var analysis_conclusion = new Entity.AnalysisConclusion();
analysis_conclusion.ID = Yw.YitIdHelper.NextId();
analysis_conclusion.CombineID = analysis_combine_id;
- analysis_conclusion.Pump = analysis_combine.Pump;
+ analysis_conclusion.Pump = analysis_combine.Pump;
analysis_conclusion.Head = head;
analysis_conclusion.Flow = flow.Value;
analysis_conclusion.Power = curveQP.GetFitPointY(flow.Value);
@@ -164,12 +166,15 @@
}
}
+
+ #region Expand
+
/// <summary>
/// 鍦嗘暣
/// </summary>
private void Round(Entity.AnalysisConclusion conclusion)
{
- conclusion.Pump = Math.Round(conclusion.Pump, 1);
+ conclusion.Pump = Math.Round(conclusion.Pump, 1);
conclusion.Head = Math.Round(conclusion.Head, 1);
conclusion.Flow = Math.Round(conclusion.Flow, 1);
conclusion.Power = Math.Round(conclusion.Power, 1);
@@ -182,8 +187,7 @@
/// </summary>
private void InsertAnaLog(string info)
{
- var entity = new Entity.AnalysisLog(info);
- _dal_analysis_log.Insert(entity);
+ LogHelper.Info(info);
}
/// <summary>
@@ -217,7 +221,6 @@
InsertAnaLog(log);
}
-
/// <summary>
/// 鎻掑叆鍒嗘瀽缁撹鍒楄〃
/// </summary>
@@ -236,7 +239,10 @@
log = $"鍒嗘瀽杩涘害:{runFlag},涓嬫爣:{index},鏁伴噺:{list.Count},鎻掑叆鑰楁椂:{sw.ElapsedMilliseconds / 1000}m";
InsertAnaLog(log);
}
- }
+
+ #endregion
+
+ }
}
--
Gitblit v1.9.3