From 00bcee19c5dff21a9848c16b45419efb74bf07e9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 11 十一月 2024 11:58:27 +0800
Subject: [PATCH] Epanet.Calcu修改
---
Hydro/Yw.EPAnet.Calcu.Core/01-network/00-core/Network.cs | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/Hydro/Yw.EPAnet.Calcu.Core/01-network/00-core/Network.cs b/Hydro/Yw.EPAnet.Calcu.Core/01-network/00-core/Network.cs
index c513e42..ba16391 100644
--- a/Hydro/Yw.EPAnet.Calcu.Core/01-network/00-core/Network.cs
+++ b/Hydro/Yw.EPAnet.Calcu.Core/01-network/00-core/Network.cs
@@ -12,39 +12,28 @@
{
this.Reservoirs = new List<Reservoir>();
this.Tanks = new List<Tank>();
+ this.Waterboxs = new List<Waterbox>();
this.Junctions = new List<Junction>();
this.Nozzles = new List<Nozzle>();
this.Hydrants = new List<Hydrant>();
+ this.Bluntheads = new List<Blunthead>();
+ this.Elbows = new List<Elbow>();
+ this.Threelinks = new List<Threelink>();
+ this.Fourlinks = new List<Fourlink>();
this.Meters = new List<Meter>();
+ this.Flowmeters = new List<Flowmeter>();
+ this.Pressmeters = new List<Pressmeter>();
+ this.Pipes = new List<Pipe>();
+ this.Translations = new List<Translation>();
this.Pumps = new List<Pump>();
this.Valves = new List<Valve>();
- this.Pipes = new List<Pipe>();
+ this.Exchangers = new List<Exchanger>();
+ this.Compressors = new List<Compressor>();
this.Curves = new List<Curve>();
this.Patterns = new List<Pattern>();
this.Rules = new List<Rule>();
- }
-
- /// <summary>
- ///
- /// </summary>
- public Network(Network rhs)
- {
- this.Reservoirs = rhs.Reservoirs;
- this.Tanks = rhs.Tanks;
- this.Junctions = rhs.Junctions;
- this.Nozzles = rhs.Nozzles;
- this.Hydrants = rhs.Hydrants;
- this.Meters = rhs.Meters;
-
- this.Pumps = rhs.Pumps;
- this.Valves = rhs.Valves;
- this.Pipes = rhs.Pipes;
-
- this.Curves = rhs.Curves;
- this.Patterns = rhs.Patterns;
- this.Rules = rhs.Rules;
}
#region Node
@@ -58,6 +47,11 @@
/// 姘存睜鍒楄〃
/// </summary>
public List<Tank> Tanks { get; set; }
+
+ /// <summary>
+ /// 姘寸鍒楄〃
+ /// </summary>
+ public List<Waterbox> Waterboxs { get; set; }
/// <summary>
/// 杩炴帴鑺傜偣鍒楄〃
@@ -75,14 +69,54 @@
public List<Hydrant> Hydrants { get; set; }
/// <summary>
+ /// 闂峰ご鍒楄〃
+ /// </summary>
+ public List<Blunthead> Bluntheads { get; set; }
+
+ /// <summary>
+ /// 寮ご鍒楄〃
+ /// </summary>
+ public List<Elbow> Elbows { get; set; }
+
+ /// <summary>
+ /// 涓夐�氬垪琛�
+ /// </summary>
+ public List<Threelink> Threelinks { get; set; }
+
+ /// <summary>
+ /// 鍥涢�氬垪琛�
+ /// </summary>
+ public List<Fourlink> Fourlinks { get; set; }
+
+ /// <summary>
/// 姘磋〃鍒楄〃
/// </summary>
public List<Meter> Meters { get; set; }
+ /// <summary>
+ /// 娴侀噺璁″垪琛�
+ /// </summary>
+ public List<Flowmeter> Flowmeters { get; set; }
+
+ /// <summary>
+ /// 鍘嬪姏琛ㄥ垪琛�
+ /// </summary>
+ public List<Pressmeter> Pressmeters { get; set; }
+
#endregion
- #region Linker
+ #region Link
+
+ /// <summary>
+ /// 绠￠亾鍒楄〃
+ /// </summary>
+ public List<Pipe> Pipes { get; set; }
+
+ /// <summary>
+ /// 杩囨浮浠跺垪琛�
+ /// </summary>
+ public List<Translation> Translations { get; set; }
/// <summary>
/// 姘存车鍒楄〃
@@ -95,9 +129,14 @@
public List<Valve> Valves { get; set; }
/// <summary>
- /// 绠￠亾鍒楄〃
+ /// 鎹㈢儹鍣ㄥ垪琛�
/// </summary>
- public List<Pipe> Pipes { get; set; }
+ public List<Exchanger> Exchangers { get; set; }
+
+ /// <summary>
+ /// 鍘嬬缉鏈哄垪琛�
+ /// </summary>
+ public List<Compressor> Compressors { get; set; }
#endregion
@@ -118,6 +157,7 @@
/// </summary>
public List<Rule> Rules { get; set; }
+
#endregion
--
Gitblit v1.9.3