From b825d70578b0ddf6d479569887c194f919795dad Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/06-schedule-simulation/01-/02-schedule/ScheduleHelper.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/06-simulation-drill/01-/02-schedule/ScheduleHelper.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/06-schedule-simulation/01-/02-schedule/ScheduleHelper.cs
similarity index 96%
rename from WinFrmUI/PBS.WinFrmUI.Hydro/06-simulation-drill/01-/02-schedule/ScheduleHelper.cs
rename to WinFrmUI/PBS.WinFrmUI.Hydro/06-schedule-simulation/01-/02-schedule/ScheduleHelper.cs
index fdb7ccb..3bd97d2 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/06-simulation-drill/01-/02-schedule/ScheduleHelper.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/06-schedule-simulation/01-/02-schedule/ScheduleHelper.cs
@@ -217,7 +217,7 @@
{
if (combine == null || !combine.Any())
return default;
-
+
//鍏堜慨姝ｇ粍鍚堟洸绾垮拰妯″瀷鐨勫亸宸壃绋�
var conclusion_ex_list_list = new List<List<AnalysisConclusionViewModel>>();
var conclusion_ex_list_dict = new Dictionary<long, List<AnalysisConclusionViewModel>>();
@@ -226,9 +226,7 @@
{
//杩涘彛姘翠綅
- var inlet_water_level = 0;
-
-
+ var inlet_water_level = 0;
var current_pressure_diff = target_pressure - inlet_water_level + _sel_opt_pump_pressure_excess;
current_pressure_diff = Math.Round(current_pressure_diff, 1);
@@ -264,13 +262,13 @@
return default;
- var total_flow_deviation_ratio = Math.Abs(1 - Math.Abs(total_flow / target_flow));
- if (total_flow_deviation_ratio > _sel_opt_flow_deviation_ratio)
- return default;
- if (total_flow_deviation_ratio > _sel_opt_reasonable_flow_deviation_ratio)
- {
- combine_merit_ratio -= total_flow_deviation_ratio;
- }
+ //var total_flow_deviation_ratio = Math.Abs(1 - Math.Abs(total_flow / target_flow));
+ //if (total_flow_deviation_ratio > _sel_opt_flow_deviation_ratio)
+ // return default;
+ //if (total_flow_deviation_ratio > _sel_opt_reasonable_flow_deviation_ratio)
+ //{
+ // combine_merit_ratio -= total_flow_deviation_ratio;
+ //}
double eff = 0, wp = 0, uwp = 0;
wp = Yw.Pump.CalculationHelper.CalcuWP(total_power, total_flow);
@@ -343,8 +341,8 @@
var current_frequency_space = frequency_space + (i * frequency_iteration_space);
cl_ex_list_list_list = FrequencyFilters(target_flow, frequency_min, frequency_max, current_frequency_space, all_fre_conclusion_ex_list_list, all_fix_conclusion_ex_list_list);
if (cl_ex_list_list_list.Any())
- {
- break;
+ {
+ break;
}
}
@@ -355,7 +353,7 @@
//鍒嗙粍鎺掑垪缁勫悎姹傛渶浼�
var ana_combine_list = new List<AnaCombine>();
- foreach (var item_cl_ex_list_list in cl_ex_list_list_list)
+ foreach (var item_cl_ex_list_list in cl_ex_list_list_list)
{
var cl_ex_list_list = CartesianProduct(item_cl_ex_list_list, target_flow);
var opt_cl_ex_list = cl_ex_list_list.OrderBy(x => x.Sum(x => x.Power)).FirstOrDefault();
--
Gitblit v1.9.3