From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决
---
Hydraulic/Hydro.HydraulicOptimizer/WDNModelOptimizer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Hydraulic/Hydro.HydraulicOptimizer/WDNModelOptimizer.cs b/Hydraulic/Hydro.HydraulicOptimizer/WDNModelOptimizer.cs
index f1e3242..58caf21 100644
--- a/Hydraulic/Hydro.HydraulicOptimizer/WDNModelOptimizer.cs
+++ b/Hydraulic/Hydro.HydraulicOptimizer/WDNModelOptimizer.cs
@@ -758,7 +758,7 @@
private string loadLogicParam()
{
- string result = null;
+ //string result = null;
//(LogicPoint)((LogicTile)sender).Tag;
param = new LogicModelParams();
@@ -769,7 +769,7 @@
$"SELECT {LogicPoint.selectColumn} FROM RemoteHost");
- double d=0;
+ //double d=0;
foreach (var host in hosts.Where(x => x.LogicType == "鍒濆鏉′欢" && x.ParentId != -1 && x.Ext.Enable).OrderBy(x=>x.Sort))
@@ -1022,7 +1022,7 @@
private string loadGeneticParam(FinishEvent onFinished, FinishEvent onError, FinishEvent onReportProgress, SetEvent SetVarsMethod)
{
- string result = null;
+ //string result = null;
//DLengths.ForEach(m => chromosomeLength += m);
--
Gitblit v1.9.3