冲突解决

qin

2024-05-06 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c

 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);