2023年12月26日

cloudflight

2023-12-26 5fa6947054206e2e781eadd4effdcdf52eda28c4

 Hydro.MapView/MapViewNetWork2Inp.cs

@@ -30,8 +30,8 @@
            StreamReader sr = new StreamReader(filePath);
            //try
            {
                Nodes = new List<NodeCalcModel>();
                Links = new List<LinkCalcModel>();
                Nodes = new NodeViewModelList();
                Links = new LinkViewModelList();



@@ -221,7 +221,7 @@
                                break;
                            case "STATUS":
                                {
                                    LinkViewModel link = (LinkViewModel)Links.Find(l => l.ID == parts.ToString(0, null));
                                    LinkViewModel link = Links.Find(l => l.ID == parts.ToString(0, null));
                                    if (link != null)
                                        link.Status = StringToStatus(parts.ToString(1, "OPEN"));
                                }
@@ -392,13 +392,13 @@
            k1 = 0;
            while (k1 < Links.Count)
            {
                var p = (LinkViewModel)Links[k1];
                var J = (NodeViewModel)Nodes[k2];
                var p = Links[k1];
                var J = Nodes[k2];
                var k0 = k2;
                while (J.ID != p.Node1 && k2 < Nodes.Count)
                {
                    k2++;
                    if (k2 < Nodes.Count) J = (NodeViewModel)Nodes[k2];
                    if (k2 < Nodes.Count) J = Nodes[k2];

                }
                if (k2 == Nodes.Count)
@@ -423,13 +423,13 @@
            k1 = 0;
            while (k1 < Links.Count)
            {
                var p = (LinkViewModel)Links[k1];
                var J = (NodeViewModel)Nodes[k2];
                var p = Links[k1];
                var J = Nodes[k2];
                var k0 = k2;
                while (J.ID != p.Node2 && k2 < Nodes.Count)
                {
                    k2++;
                    if (k2 < Nodes.Count) J = (NodeViewModel)Nodes[k2];
                    if (k2 < Nodes.Count) J = Nodes[k2];
                }
                if (k2 == Nodes.Count)
                {
@@ -593,12 +593,12 @@
            StreamReader sr = new StreamReader(filePath);
            //try
            {
                Nodes = new List<NodeCalcModel>();
                Nodes = new NodeViewModelList();
                //reservoirs = new List<Reservoir>();
                //tanks = new List<Tank>();
                //meters = new List<Meter>();

                Links = new List<LinkCalcModel>();
                Links =new LinkViewModelList();
                //valves = new List<Valve>();
                //repeaters = new List<Repeater>();

@@ -807,12 +807,12 @@
                k2 = 0;
                while (k2 < Links.Count)
                {
                    var p = (LinkViewModel)Links[k2];
                    var J = (NodeViewModel)Nodes[k1];
                    var p = Links[k2];
                    var J = Nodes[k1];
                    while (J.ID != p.Node1 && k1 < Nodes.Count)
                    {
                        k1++;
                        if (k1 < Nodes.Count) J = (NodeViewModel)Nodes[k1];
                        if (k1 < Nodes.Count) J = Nodes[k1];

                    }
                    if (k1 == Nodes.Count)
@@ -832,12 +832,12 @@
                k2 = 0;
                while (k2 < Links.Count)
                {
                    var p = (LinkViewModel)Links[k2];
                    var J = (NodeViewModel)Nodes[k1];
                    var p = Links[k2];
                    var J = Nodes[k1];
                    while (J.ID != p.Node2 && k1 < Nodes.Count)
                    {
                        k1++;
                        if (k1 < Nodes.Count) J = (NodeViewModel)Nodes[k1];
                        if (k1 < Nodes.Count) J =Nodes[k1];
                    }
                    if (k1 == Nodes.Count)
                    {
@@ -900,7 +900,7 @@

            Nodes.ForEach(o0 =>
            {
                var o = (NodeViewModel)o0;
                var o = o0;
                if (!o.Visible) return;
                if (o is JunctionViewModel j)
                    junctionStringBuilder.AppendLine(j.ToString() + $"{j.Level}\tJunction");
@@ -1011,7 +1011,7 @@

            StringBuilder emitterStringBuilder = new StringBuilder();
            emitterStringBuilder.AppendLine(";Junction        \tCoefficient");
            Nodes.ForEach(o => emitterStringBuilder.Append(((NodeViewModel)o).ToEmitterString()));
            Nodes.ForEach(o => emitterStringBuilder.Append((o).ToEmitterString()));