From c4b3f80d78846cb67ab21b09cc2b3224aca37311 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 17 三月 2025 11:36:53 +0800
Subject: [PATCH] 系统曲线修改
---
WinFrmUI/PBS.WinFrmUI.Hydro/01-system-curve/WaterDistributionCalculator.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/01-water-supply-system-curve/WaterDistributionCalculator.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/01-system-curve/WaterDistributionCalculator.cs
similarity index 97%
rename from WinFrmUI/PBS.WinFrmUI.Hydro/01-water-supply-system-curve/WaterDistributionCalculator.cs
rename to WinFrmUI/PBS.WinFrmUI.Hydro/01-system-curve/WaterDistributionCalculator.cs
index f5d96e2..92ee758 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/01-water-supply-system-curve/WaterDistributionCalculator.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/01-system-curve/WaterDistributionCalculator.cs
@@ -4,6 +4,7 @@
public class NodeConfig
{
public int NodeIndex { get; set; }
+ public double Elevation { get; set; }
public double MinFlow { get; set; } // 鏈�灏忛渶姘撮噺(m鲁/h)
public double MaxFlow { get; set; } // 鏈�澶ч渶姘撮噺(m鲁/h)
}
@@ -64,7 +65,7 @@
private IEnumerable<DistributionResult> GenerateAllocations(double targetDemand)
{
var rand = new Random();
- int maxAttempts = 3; //鏈�澶у皾璇曟鏁�
+ int maxAttempts = 2; //鏈�澶у皾璇曟鏁�
// 鍩轰簬鑺傜偣浼樺厛绾х敓鎴愬�欓�夐泦锛堝弬鑰傿P绁炵粡缃戠粶鐗瑰緛閫夋嫨[3](@ref)锛�
var candidateNodes = _nodes
@@ -88,7 +89,7 @@
// 闅忔満鍒嗛厤鍓╀綑姘撮噺锛堥噰鐢ㄨ嚜閫傚簲鏉冮噸璋冩暣[6](@ref)锛�
// while (remaining > 0.001) // 鍏佽1L璇樊
- while (remaining > 0.1)
+ while (remaining > 0.5)
{
var availableNodes = candidateNodes
.Where(n => allocation[n.NodeIndex] < n.MaxFlow)
--
Gitblit v1.9.3