From 21dd2ae9704c484d5d75b2ed980e5402505da7dc Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 05 十一月 2024 18:01:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Hydro/Yw.EPAnet.Calcu.Core/03-calcu/CalcuResult.cs | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/CalcuResult.cs b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/CalcuResult.cs
index 474f615..a3f40b8 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/CalcuResult.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/03-calcu/CalcuResult.cs
@@ -3,7 +3,7 @@
/// <summary>
/// 璁＄畻缁撴灉
/// </summary>
- public class CalcuResult
+ public class CalcuResult:IDisposable
{
/// <summary>
///
@@ -12,8 +12,10 @@
{
this.Succeed = true;
this.FailedList = new List<CalcuFailed>();
- this.NodeList = new List<CalcuNode>();
- this.LinkList = new List<CalcuLink>();
+ this.NodeList = new List<ICalcuNode>();
+ this.LinkList = new List<ICalcuLink>();
+ this.NodeDict = new Dictionary<string, ICalcuNode>();
+ this.LinkDict = new Dictionary<string, ICalcuLink>();
}
/// <summary>
@@ -29,19 +31,35 @@
/// <summary>
/// 鑺傜偣鍒楄〃
/// </summary>
- public List<CalcuNode> NodeList { get; set; }
+ public List<ICalcuNode> NodeList { get; set; }
/// <summary>
/// 绠℃鍒楄〃
/// </summary>
- public List<CalcuLink> LinkList { get; set; }
+ public List<ICalcuLink> LinkList { get; set; }
+
+ /// <summary>
+ /// 鑺傜偣瀛楀吀
+ /// </summary>
+ public Dictionary<string,ICalcuNode> NodeDict { get; set; }
+
+ /// <summary>
+ /// 绠℃瀛楀吀
+ /// </summary>
+ public Dictionary<string,ICalcuLink> LinkDict { get; set; }
+
+ public void Dispose()
+ {
+
+ }
+
/// <summary>
/// 鑾峰彇缁勪欢鍒楄〃
/// </summary>
- public List<CalcuParter> GetParterList()
+ public List<ICalcuParter> GetParterList()
{
- var list = new List<CalcuParter>();
+ var list = new List<ICalcuParter>();
if (this.NodeList != null && this.NodeList.Count > 0)
{
list.AddRange(this.NodeList);
--
Gitblit v1.9.3