From 554694000f4d7ffc231a23e7ff429595c254ceaa Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 07 八月 2024 17:41:14 +0800
Subject: [PATCH] 辅助功能添加
---
IStation.Service/08-algorithm/02-schedule/ScheduleHelper.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/IStation.Service/08-algorithm/02-schedule/ScheduleHelper.cs b/IStation.Service/08-algorithm/02-schedule/ScheduleHelper.cs
index c4d3bab..42fa4b4 100644
--- a/IStation.Service/08-algorithm/02-schedule/ScheduleHelper.cs
+++ b/IStation.Service/08-algorithm/02-schedule/ScheduleHelper.cs
@@ -20,6 +20,8 @@
#endregion
+ #region Private Variable
+
private readonly decimal _frequency_min = 28;
private readonly decimal _frequency_max = 50;
private readonly decimal _frequency_space = 1;//棰戠巼闂撮殧
@@ -45,7 +47,9 @@
private List<List<int>> _same_section_flag_combine_list = null; // 鍚屾娉电粍鍚�
private List<Model.WaterSupplyLimit> _water_supply_limit_list = null; //渚涙按闄愬埗鍒楄〃
private List<Model.FrequencyLimit> _frequency_limit_list = null; // 棰戠巼闄愬埗鍒楄〃
- private Dictionary<int,double> _flag_cumulative_runtime_dict = null; // 娉电疮璁¤繍琛屾椂闀垮瓧鍏�
+ private Dictionary<int, double> _flag_cumulative_runtime_dict = null; // 娉电疮璁¤繍琛屾椂闀垮瓧鍏�
+
+ #endregion
/// <summary>
/// 鍒濆鍖�
@@ -111,7 +115,7 @@
var min_open_count = _min_open_count;
var max_open_count = _max_open_count < 1 ? pump_list.Count : _max_open_count;
var must_open_flag_list = _must_open_flag_list;
- var must_close_flag_list = _must_close_flag_list;
+ var must_close_flag_list = _must_close_flag_list;
var forbidden_flag_combine_list = _forbidden_flag_combine_list;
var associative_flag_combine_list = _associative_flag_combine_list;
var same_section_flag_combine_list = _same_section_flag_combine_list;
@@ -149,7 +153,7 @@
var exist_must_close_flag_list = must_close_flag_list != null && must_close_flag_list.Count > 0;
#endregion
-
+
#region 瀛樺湪-绂佺敤缁勫悎
var exist_forbidden_flag_combine_list = forbidden_flag_combine_list != null && forbidden_flag_combine_list.Count > 0;
@@ -201,7 +205,7 @@
#region 瀛樺湪-娉电疮璁¤繍琛屾椂闀垮瓧鍏�
- var flag_cumulative_runtime_loss_ratio_dict=new Dictionary<int,double>();
+ var flag_cumulative_runtime_loss_ratio_dict = new Dictionary<int, double>();
var exist_flag_cumulative_runtime_dict = flag_cumulative_runtime_dict != null && flag_cumulative_runtime_dict.Count > 0;
if (exist_flag_cumulative_runtime_dict)
{
@@ -216,8 +220,6 @@
{
//渚涙按闄愬埗
var exist_limit = false;
-#if DEBUG
-#else
if (exist_water_supply_limit_list)
{
var limit = water_supply_limit_list.Find(x => x.PumpCount == current_open_flag_list.Count);
@@ -228,8 +230,7 @@
exist_limit = true;
}
}
- }
-#endif
+ }
if (!exist_limit)
{
var opt_ana_combine = GetOptAnaCombine
@@ -759,8 +760,7 @@
var loss_ratio = 1 - level;
flag_cumulative_runtime_loss_ratio_dict.Add(flag, loss_ratio);
}
-
- return flag_cumulative_runtime_dict;
+ return flag_cumulative_runtime_loss_ratio_dict;
}
/// <summary>
@@ -852,7 +852,6 @@
return lstResult;
}
-
/// <summary>
/// 鑾峰彇鎺掑垪缁勫悎
@@ -882,6 +881,10 @@
var analysis_deviation = _service_analysis_deviation.GetByFlowAndRunFlags(flow, flags);
if (analysis_deviation == null)
{
+ if (GlobalHelper.IsStation2(flags))
+ {
+ Yw.LogHelper.Error($"[{Yw.Untity.IntListHelper.ToString(flags)}]缁勫悎涓嶅瓨鍦ㄥ亸宸郴鏁�!");
+ }
return deviation_factor_dict;
}
@@ -915,8 +918,7 @@
#endregion
-
-
+
#region Expand
/// <summary>
--
Gitblit v1.9.3