From d63b83c2c745c1f8a140221c28c0e6dbe61d6110 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 30 四月 2024 17:47:17 +0800
Subject: [PATCH] 调度修改
---
Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs b/Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs
index 38a5f47..fa8d83e 100644
--- a/Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs
+++ b/Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs
@@ -195,6 +195,12 @@
scheduleCombine.Pump1 = freItem.Frequency;
scheduleCombine.CurveQH = freItem.CurveQH.ToJson();
scheduleCombine.CurveQP = freItem.CurveQP.ToJson();
+
+ freItem.CurveQH.GetMinMaxPointY(out double maxHead, out double minHead);
+ scheduleCombine.MinFlow = freItem.CurveQH.Min;
+ scheduleCombine.MaxFlow = freItem.CurveQH.Max;
+ scheduleCombine.MaxHead = maxHead;
+ scheduleCombine.MinHead = minHead;
scheduleCombine.AnaStatus = false;
list.Add(scheduleCombine);
}
@@ -239,8 +245,18 @@
scheduleCombine.RunCount = pumpCount;
scheduleCombine.Pump1 = freItem1.Frequency;
scheduleCombine.Pump2 = freItem2.Frequency;
- scheduleCombine.CurveQH = FitHelper.BuildCurveExpress(pointQH).ToJson();
- scheduleCombine.CurveQP = FitHelper.BuildCurveExpress(pointQP).ToJson();
+
+ var curveQH = FitHelper.BuildCurveExpress(pointQH);
+ var curveQP = FitHelper.BuildCurveExpress(pointQP);
+
+ scheduleCombine.CurveQH = curveQH.ToJson();
+ scheduleCombine.CurveQP = curveQP.ToJson();
+
+ curveQH.GetMinMaxPointY(out double maxHead, out double minHead);
+ scheduleCombine.MinFlow = curveQH.Min;
+ scheduleCombine.MaxFlow = curveQH.Max;
+ scheduleCombine.MaxHead = maxHead;
+ scheduleCombine.MinHead = minHead;
scheduleCombine.AnaStatus = false;
list.Add(scheduleCombine);
}
@@ -290,8 +306,18 @@
scheduleCombine.Pump1 = freItem1.Frequency;
scheduleCombine.Pump2 = freItem2.Frequency;
scheduleCombine.Pump3 = freItem3.Frequency;
- scheduleCombine.CurveQH = FitHelper.BuildCurveExpress(pointQH).ToJson();
- scheduleCombine.CurveQP = FitHelper.BuildCurveExpress(pointQP).ToJson();
+
+ var curveQH = FitHelper.BuildCurveExpress(pointQH);
+ var curveQP = FitHelper.BuildCurveExpress(pointQP);
+
+ scheduleCombine.CurveQH = curveQH.ToJson();
+ scheduleCombine.CurveQP = curveQP.ToJson();
+
+ curveQH.GetMinMaxPointY(out double maxHead, out double minHead);
+ scheduleCombine.MinFlow = curveQH.Min;
+ scheduleCombine.MaxFlow = curveQH.Max;
+ scheduleCombine.MaxHead = maxHead;
+ scheduleCombine.MinHead = minHead;
scheduleCombine.AnaStatus = false;
list.Add(scheduleCombine);
}
--
Gitblit v1.9.3