From e15d326bf99045464912aad08d18faa0c667cdb5 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期三, 22 五月 2024 09:27:34 +0800
Subject: [PATCH] 调度算法 修改 调度逻辑 修改 调度接口 web新增
---
Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs b/Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs
index a112236..9c475f5 100644
--- a/Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs
+++ b/Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs
@@ -173,7 +173,7 @@
DAL.ScheduleAnaLog _dalAnaLog = new DAL.ScheduleAnaLog();
- public OptimalCombine AnaOptimalCombine(List<Pump> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags)
+ public OptimalCombine AnaOptimalCombine(List<Model.PumpInfo> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags)
{
if (pumps == null || !pumps.Any())
{
@@ -206,8 +206,8 @@
#endregion
- var pump_nr_dict = pumps.ToDictionary(x => x.ID, x => x.Nr);
- var pump_flag_list = pumps.Select(x => x.ID).ToList();
+ var pump_nr_dict = pumps.ToDictionary(x => x.Flag, x => x.Nr);
+ var pump_flag_list = pumps.Select(x => x.Flag).ToList();
var optimal_combine_list = new List<OptimalCombine>();
for (int pumpCount = 1; pumpCount <= pumps.Count; pumpCount++)
{
@@ -499,7 +499,7 @@
}
- public string Ana(List<Pump> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags)
+ public string Ana(List<PumpInfo> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags)
{
if (pumps == null || !pumps.Any())
{
@@ -532,7 +532,7 @@
#endregion
- var pump_flag_list = pumps.Select(x => x.ID).ToList();
+ var pump_flag_list = pumps.Select(x => x.Flag).ToList();
var optimal_combine_list = new List<OptimalCombine>();
for (int pumpCount = 1; pumpCount <= pumps.Count; pumpCount++)
{
--
Gitblit v1.9.3