core升级

cloudflight

2024-06-17 b62f5f0104845c2a3a74707792ebf28a506e24f1

 Hydraulic/Hydro.MapView/MapViewNetWork.cs

@@ -856,10 +856,12 @@

        public List<TimePoint> Calc(string inpPath, string configPath = null)
        {
            bool CalcByConfig = false;
            List<TimePoint> list = new List<TimePoint>();
            if (CalcByConfig)
            {

            WdnmoParam wdnmoParam = new WdnmoParam();


            Nodes.ForEach(n =>
            {
                //if (n is JunctionViewModel || n is MeterViewModel || n is NozzleViewModel)
@@ -881,8 +883,16 @@
            });

            calc c = new calc();
            var list = c.GetCalcResult(inpPath, wdnmoParam, configPath);
                list = c.GetCalcResult(inpPath, wdnmoParam, configPath);
            if (list == null) return list;
            }
            else
            {
                list= base.Calc(inpPath); 
            }
            
           

            list.Sort((a, b) => string.Compare(a.Key, b.Key));
            Nodes.Sort((a, b) => string.Compare(a.ID, b.ID));
            Links.Sort((a, b) => string.Compare(a.ID, b.ID));