From 09f3cdf4eec25526c4e5b924b67f8cfd4a089fec Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 31 十月 2022 14:28:41 +0800
Subject: [PATCH] 修改 计算泵站能效权重比 （叠加扬程）
---
Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs b/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs
index 1c5e1be..14970eb 100644
--- a/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs
+++ b/Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs
@@ -124,11 +124,16 @@
double qa_total = 0;
+ double qh_total = 0;
foreach (var item in child_ana_records)
{
if (item.Ea.HasValue && item.Qa.HasValue && item.Ea.Value > 10 && item.Qa.Value > 10)
{
qa_total += item.Qa.Value;
+ if (item.Ha.HasValue)
+ {
+ qh_total += item.Qa.Value * item.Ha.Value;
+ }
}
}
@@ -139,7 +144,11 @@
{
if (item.Ea.HasValue && item.Qa.HasValue && item.Ea.Value > 10 && item.Qa.Value > 10)
{
- eta += item.Ea.Value * item.Qa.Value / qa_total;
+ if (item.Ha.HasValue && item.Ha.Value != 0)
+ {
+ eta += item.Ea.Value * (item.Qa.Value * item.Ha.Value / qh_total);//鍙犲姞鎵▼鎹㈢畻
+ }
+ // eta += item.Ea.Value * item.Qa.Value / qa_total; 鏃х畻娉�
}
}
--
Gitblit v1.9.3