修改能量分析方法的返回类型为List

cloudflight

2024-11-24 38d5a93ca9e47c8449e67433b9a0dd25d1defe25

 Hydro/Yw.EPAnet.Core/EPAmodel.cs

@@ -2,40 +2,13 @@
//using AForge.Genetic;
//using Hydro.CodeProvider;
//using Hydro.CommonBase;
//using Hydro.HydraulicModel;
//using Yw.EPAcore.Core;
//using SolutionDBHelper_NS;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data.SqlTypes;
using System.Drawing;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
////using WaterDistributioinManager;
//using Hydro.ConfigModel;

namespace Hydro.HydraulicModel
namespace Yw.EPAcore.Core
{
   
    //public static class EPAModelInput
    //{
    //    public static Dictionary<HydraulicInputType, int> defineEPATypeCode = new Dictionary<HydraulicInputType, int>() 
    //    {
    //        { HydraulicInputType.press,HydraulicCore.Const_class.Const_Node.EN_TANKLEVEL },
    //        { HydraulicInputType.demand,HydraulicCore.Const_class.Const_Node.EN_DEMAND },
    //        { HydraulicInputType.level,HydraulicCore.Const_class.Const_Node.EN_TANKLEVEL },
    //        { HydraulicInputType.initPumpRS,HydraulicCore.Const_class.Const_Link.EN_INITSETTING },
    //        { HydraulicInputType.initSettings,HydraulicCore.Const_class.Const_Link.EN_INITSETTING },
    //        { HydraulicInputType.initStatus,HydraulicCore.Const_class.Const_Link.EN_INITSTATUS },
    //        { HydraulicInputType.pattern,HydraulicCore.Const_class.Const_Node.EN_PATTERN },


    //    };
       
    //}
    public enum HydraulicInputType
    {
@@ -95,7 +68,7 @@

    public static class NodeOutputType
    {
        public static List<HydraulicOutputType> List=new List<HydraulicOutputType>()
        public static List<HydraulicOutputType> List = new List<HydraulicOutputType>()
        {
            HydraulicOutputType.None,
            HydraulicOutputType.Elev,
@@ -111,7 +84,7 @@
        /// <summary>
        /// 空
        /// </summary>
        None= -1,
        None = -1,

        /// <summary>
        /// 节点标高
@@ -138,7 +111,7 @@
        /// </summary>
        Quality = (int)HydraulicCore.Const_class.Const_Node.EN_QUALITY,//12

        




@@ -191,7 +164,7 @@
        /// </summary> 
        Settings = (int)HydraulicCore.Const_class.Const_Link.EN_SETTING,//12