提交代码

qinjie

2023-12-02 c3dbb679c8752b3e26199b9f51fcc77eca884025

提交代码

 Hydro.Inp/NetWork.cs

@@ -2,6 +2,7 @@
//using Hydro.HydraulicModel;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.IO;
using System.IO.Ports;
@@ -465,7 +466,7 @@
                #region 优化方案
                int k1 = 0;
                int k2 = 0;
                


                Nodes.Sort((a, b) => string.Compare(a.ID, b.ID));
                points.Sort((a, b) => string.Compare(a.ID, b.ID));
@@ -493,7 +494,7 @@
                }
                #endregion

             


                //建立点线关系链表StartNode，先将管线以Node1（节点1的ID）排序，再将Nodes按ID排序，建立两个游标k1、k2，正向一次循环，建立链表关系
                //时间复杂度 O(n)
@@ -954,9 +955,15 @@
            HydraulicModel.Epanet epanet = new HydraulicModel.Epanet();
            var result = new List<TimePoint>();
            var err = epanet.open(InpPath, "d:\\5.log", "");

            if (err != 0)
            {
                throw new Exception($"计算失败：{err}");
                throw new Exception($"打开计算文件失败：{err}");
            }
            var errCal = epanet.solveH();
            if (errCal != 0)
            {
                throw new Exception($"计算失败：{errCal}");
            }
            int nodeCount = 0, linkCount = 0;
            epanet.getcount((int)CountType.Node, ref nodeCount);

 Test/Program.cs

@@ -17,7 +17,7 @@
        const string revitInpPath = "d:\\t2.inp";
        static void Main(string[] args)
        {
            Test4();
            Test3();
        }

        static void Test1()
@@ -138,7 +138,7 @@
        static void Test3()
        {
            var nw = new NetWorkMapModel();
            var result = nw.Calc();
            var result = nw.Calc("d:\\revitinp.inp");
            Console.WriteLine(result);
            Console.ReadLine();
        }

 Test/Test.csproj

@@ -14,7 +14,7 @@
    <Deterministic>true</Deterministic>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
    <PlatformTarget>x64</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>

 out/HydraulicModel.dll

Binary files differ