From 5dde4212e3a73bf1ab0fd9e4d34dfebad0f8ffa2 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 03 八月 2024 11:27:08 +0800
Subject: [PATCH] fix：修复初分配计算异常的问题
---
Hydraulic/Hydro.CommonBase/ParamModel.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Hydraulic/Hydro.CommonBase/ParamModel.cs b/Hydraulic/Hydro.CommonBase/ParamModel.cs
index 16ce6e2..06bde77 100644
--- a/Hydraulic/Hydro.CommonBase/ParamModel.cs
+++ b/Hydraulic/Hydro.CommonBase/ParamModel.cs
@@ -717,20 +717,12 @@
dict_Name = new Dictionary<string, variable>();
dict_ID=new Dictionary<int, variable>();
dict_Tag=new Dictionary<string, variable>();
- //dict_OutPut = new Dictionary<string, Ivariable[]>();
+
变量全集.ForEach(vv => { if (!string.IsNullOrEmpty(vv.Name) && !dict_Name.ContainsKey(vv.Name)) dict_Name.Add(vv.Name, vv); });
变量全集.ForEach(vv => { if (!dict_ID.ContainsKey(vv.ID)) dict_ID.Add(vv.ID, vv); });
变量全集.ForEach(vv => { if (!string.IsNullOrEmpty(vv.Tag) && !dict_Tag.ContainsKey(vv.Tag)) dict_Tag.Add(vv.Tag, vv); });
-
- //输出变量.ForEach(vv =>
- //{
- // if (!string.IsNullOrEmpty(vv.Tag) && !dict_OutPut.ContainsKey(vv.Tag))
- // dict_OutPut.Add(vv.Tag, new Ivariable[] { vv });
- // if (!string.IsNullOrEmpty(vv.expressString) &&!dict_OutPut.ContainsKey(vv.expressString))
- // dict_OutPut.Add(vv.expressString,new Ivariable[] { vv });
- //});
-
+
预处理插件.ForEach(vv =>
{
if (vv.IndicatorType=="方案筛选器")
@@ -741,6 +733,20 @@
}
+
+ public void buildOutputDict()
+ {
+ dict_OutPut = new Dictionary<string, Ivariable[]>();
+ //dict_OutPut = new Dictionary<string, Ivariable[]>();
+ 输出变量.ForEach(vv =>
+ {
+ if (!string.IsNullOrEmpty(vv.Tag) && !dict_OutPut.ContainsKey(vv.Tag))
+ dict_OutPut.Add(vv.Tag, new Ivariable[] { vv });
+ if (!string.IsNullOrEmpty(vv.expressString) && !dict_OutPut.ContainsKey(vv.expressString))
+ dict_OutPut.Add(vv.expressString, new Ivariable[] { vv });
+ });
+ }
+
[NonSerialized]
[JsonIgnore]
public Dictionary<string, childSolutionParam> ChildParam = new Dictionary<string, childSolutionParam>();
--
Gitblit v1.9.3