From 9b88b95cf4b97d2fd9aa63dc5cabc17e93fb870c Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 27 四月 2024 19:39:14 +0800
Subject: [PATCH] 创建
---
HydroV1.1.sln | 33 ----------------
/dev/null | 23 -----------
Hydraulic/Hydro.Revit2022/Hydro.Revit2022.csproj | 4 +-
Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj | 4 +-
Hydraulic/Hydro.HydraulicOptimizer/Hydro.HydraulicOptimizer.csproj | 4 +-
5 files changed, 6 insertions(+), 62 deletions(-)
diff --git a/Hydraulic/Hydro.HydraulicOptimizer/Hydro.HydraulicOptimizer.csproj b/Hydraulic/Hydro.HydraulicOptimizer/Hydro.HydraulicOptimizer.csproj
index 4e67062..05fc7d0 100644
--- a/Hydraulic/Hydro.HydraulicOptimizer/Hydro.HydraulicOptimizer.csproj
+++ b/Hydraulic/Hydro.HydraulicOptimizer/Hydro.HydraulicOptimizer.csproj
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\bin\debug\</OutputPath>
+ <OutputPath>..\..\..\bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -27,7 +27,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\bin\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
index fa07e49..0292793 100644
--- a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
+++ b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
@@ -21,7 +21,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\bin\debug\</OutputPath>
+ <OutputPath>..\..\..\bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>0</WarningLevel>
@@ -32,7 +32,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\out2\</OutputPath>
+ <OutputPath>..\..\..\bin\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/Hydraulic/Hydro.Revit2022/Hydro.Revit2022.csproj b/Hydraulic/Hydro.Revit2022/Hydro.Revit2022.csproj
index 7ffe3b7..631feba 100644
--- a/Hydraulic/Hydro.Revit2022/Hydro.Revit2022.csproj
+++ b/Hydraulic/Hydro.Revit2022/Hydro.Revit2022.csproj
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\bin\debug\</OutputPath>
+ <OutputPath>..\..\..\bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\bin\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/Hydro.Simu/.vs/Hydro.Simu.csproj.dtbcache.json b/Hydro.Simu/.vs/Hydro.Simu.csproj.dtbcache.json
deleted file mode 100644
index 385765c..0000000
--- a/Hydro.Simu/.vs/Hydro.Simu.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydro.Simu","ProjectFileName":"Hydro.Simu.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"SimuHelper.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicOptimizer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files\\IIS\\Microsoft Web Deploy V3\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydro.Simu\\bin\\Debug\\Hydro.Simu.dll","OutputItemRelativePath":"Hydro.Simu.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydro.Simu\\bin\\Debug\\Hydro.Simu.pdb","OutputItemRelativePath":"Hydro.Simu.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydro.Simu/Hydro.Simu.csproj b/Hydro.Simu/Hydro.Simu.csproj
deleted file mode 100644
index 078e97b..0000000
--- a/Hydro.Simu/Hydro.Simu.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{E1F630A0-C0A3-4965-A6B5-0F41AA139348}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Hydro.Simu</RootNamespace>
- <AssemblyName>Hydro.Simu</AssemblyName>
- <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <Deterministic>true</Deterministic>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\Out\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="SimuHelper.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Hydraulic\Hydro.CommonBase\Hydro.CommonBase.csproj">
- <Project>{84e17ba3-ba03-43c1-9d19-8ce64508f2b5}</Project>
- <Name>Hydro.CommonBase</Name>
- </ProjectReference>
- <ProjectReference Include="..\Hydraulic\Hydro.Core\Hydro.Core.csproj">
- <Project>{CA211620-16A7-4953-929D-723A5F9D3239}</Project>
- <Name>Hydro.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\Hydraulic\Hydro.HydraulicOptimizer\Hydro.HydraulicOptimizer.csproj">
- <Project>{0f5c43e6-97ba-457c-954d-62eab47a38a9}</Project>
- <Name>Hydro.HydraulicOptimizer</Name>
- </ProjectReference>
- <ProjectReference Include="..\Hydraulic\Hydro.Inp2.2\Hydro.Inp2.2.csproj">
- <Project>{FFFBE974-BA86-420D-AA27-6DB215017C8C}</Project>
- <Name>Hydro.Inp2.2</Name>
- </ProjectReference>
- <ProjectReference Include="..\Hydraulic\Hydro.MapView\Hydro.MapView.csproj">
- <Project>{18e2e3d7-508e-4781-a760-ba852564e409}</Project>
- <Name>Hydro.MapView</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/Hydro.Simu/Hydro.Simu.csproj.user b/Hydro.Simu/Hydro.Simu.csproj.user
deleted file mode 100644
index 9b86104..0000000
--- a/Hydro.Simu/Hydro.Simu.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Hydro.Simu/Properties/AssemblyInfo.cs b/Hydro.Simu/Properties/AssemblyInfo.cs
deleted file mode 100644
index 21ea783..0000000
--- a/Hydro.Simu/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 鏈夊叧绋嬪簭闆嗙殑涓�鑸俊鎭敱浠ヤ笅
-// 鎺у埗銆傛洿鏀硅繖浜涚壒鎬у�煎彲淇敼
-// 涓庣▼搴忛泦鍏宠仈鐨勪俊鎭��
-[assembly: AssemblyTitle("Hydro.Simu")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Hydro.Simu")]
-[assembly: AssemblyCopyright("Copyright 漏 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 灏� ComVisible 璁剧疆涓� false 浼氫娇姝ょ▼搴忛泦涓殑绫诲瀷
-//瀵� COM 缁勪欢涓嶅彲瑙併�傚鏋滈渶瑕佷粠 COM 璁块棶姝ょ▼搴忛泦涓殑绫诲瀷
-//璇峰皢姝ょ被鍨嬬殑 ComVisible 鐗规�ц缃负 true銆�
-[assembly: ComVisible(false)]
-
-// 濡傛灉姝ら」鐩悜 COM 鍏紑锛屽垯涓嬪垪 GUID 鐢ㄤ簬绫诲瀷搴撶殑 ID
-[assembly: Guid("e1f630a0-c0a3-4965-a6b5-0f41aa139348")]
-
-// 绋嬪簭闆嗙殑鐗堟湰淇℃伅鐢变笅鍒楀洓涓�肩粍鎴�:
-//
-// 涓荤増鏈�
-// 娆＄増鏈�
-// 鐢熸垚鍙�
-// 淇鍙�
-//
-//鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滅敓鎴愬彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊�
-//閫氳繃浣跨敤 "*"锛屽涓嬫墍绀�:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Hydro.Simu/SimuHelper.cs b/Hydro.Simu/SimuHelper.cs
deleted file mode 100644
index 12018d7..0000000
--- a/Hydro.Simu/SimuHelper.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-锘縰sing Hydro.CommonBase;
-using Hydro.Core;
-using Hydro.HydraulicOptimizer;
-using Hydro.MapView;
-using Hydro.Model;
-using ISupply.WinFrmUI.Basic;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-
-namespace Hydro.Simu
-{
-
- public class SimuHelper
- {
- //private object obj;
- private bool isFinished;
- /// <summary>
- /// 瀛樺偍缁撴灉鏁版嵁
- /// </summary>
- private List<Result> _res { get; set; } = null;
- Build Build { get; set; }
-
- private double outlet_Press_scada;
-
- private double outlet_Press_Zero;
-
- WDNModelOptimizer wdo_BuildAnalyse { get; set; }
- WDNModelOptimizer wdo_Simulate { get; set; }
- /// <summary>
- /// 杈撳叆鐨凚uild瀵硅薄锛屽垵濮嬪寲鍒嗘瀽
- /// </summary>
- /// <param name="build">Build涓繀瑕佺殑鍙傛暟锛氱郴缁熸渶澶ф祦閲忋�佺敤鎴峰帇鍔涢渶姹�(鏈鍘嬪姏鍊�)</param>
- /// <param name="outlet_Press_scada">鎭掑帇鍊�</param>
- public SimuHelper(Build build, double outlet_Press_scada)
- {
- Build = build;
- this.outlet_Press_scada = outlet_Press_scada;
- //InitAnalyse();
- }
-
-
-
- WdnmoParam _wParam1;
- WdnmoParam _wParam2;
- WDNModelOptimizer wdo_Simulate1 = null;
- WDNModelOptimizer wdo_Simulate2 = null;
- #region 妯℃嫙鎺у埗
- /// <summary>
- /// 寰呮坊鍔犳按娉垫暟鎹�
- /// </summary>
- /// <param name="wParam"></param>
- public WdnmoParam RunSimu(DateTime time0, double[] pump_ZTs) // [0,1,0,1]
- {
- _wParam1 = null;
- _wParam2 = null;
- string result = null;
- double outlet_demand_in = 0;
- //灏唗ime杞崲涓烘椂闂寸偣
- var timeOA = DateTime.Parse("1900-1-1").Add(time0.TimeOfDay).ToOADate();
- //鏍规嵁鏃堕棿锛岃幏鍙栨祦閲�;鏍规嵁娴侀噺锛岃幏鍙栧帇鍔�
- // var Min = float.MaxValue;
- // Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data.ForEach(p => { if (Min > Math.Abs(p.X - (float)timeOA)) Min=Math.Abs(p.X - (float)timeOA); });
- //鍦˙uild.鐢ㄦ按瓒嬪娍鏇茬嚎.Data涓�,鎵惧埌鏈�鎺ヨ繎timeOA鐨勭偣鎴栭檮杩戠殑鐐�
- //var outlet_demand_in = Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data.Where(p => Math.Abs(p.X - (float)timeOA)== Min).FirstOrDefault().Y;
- //鍦˙uild.鐢ㄦ按瓒嬪娍鏇茬嚎.Data,鐢ㄦ彃鍊兼硶姹傚嚭timeOA瀵瑰簲鐨勬祦閲�
- for (int i = 0; i < Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data.Count - 1; i++)
- {
- if (Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].X <= timeOA && timeOA <= Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i + 1].X)//鎵惧埌
- {
- //绾挎�ф彃鍊�
- outlet_demand_in = (float)(Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].Y + (Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i + 1].Y - Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].Y) * (timeOA - Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].X) / (Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i + 1].X - Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].X));
-
- break;
- }
- else if (Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].X <= timeOA && i == Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data.Count - 1)//娌℃壘鍒�
- {
- outlet_demand_in = Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data[i].Y;
- }
- }
-
-
-
- if (outlet_demand_in <= 0)//娌℃壘鍒�
- {
- return null;// "鏃堕棿閿欒";
- }
- var outlet_press_in_up = Build.娴侀噺鍘嬮檷涓婇檺.Evaluate(outlet_demand_in);
- var outlet_press_in_down = Build.娴侀噺鍘嬮檷涓嬮檺.Evaluate(outlet_demand_in);
- var outlet_press_in = Build.娴侀噺鍘嬮檷骞冲潎.Evaluate(outlet_demand_in);
-
- var Outlet_press_Zero = Build.娴侀噺鍘嬮檷骞冲潎.Data[0].Y;
-
- var wParam1 = new WdnmoParam();
- wParam1.ScadaPoints = new List<TimePoint>()
- {
- new TimePoint() { Key = "outlet_demand_in", Value = outlet_demand_in },
- new TimePoint() { Key = "outlet_press_in", Value = outlet_press_in },
- };
-
- //娣诲姞杈撳嚭闇�姹�
- //outlet_power_out锛氳緭鍑哄姛鐜�, outlet_press_out锛氳緭鍑哄帇鍔�
- //pump1#_ZT_in锛氭按娉�1杞��, pump2#_ZT_in锛氭按娉�2杞��, pump3#_ZT_in锛氭按娉�3杞��, pump4#_ZT_in锛氭按娉�4杞��
- wParam1.ResultPoints = new List<TimePoint>()
- {
- new TimePoint() { Key = "outlet_power_out" },
- new TimePoint() { Key = "outlet_press_out"},
-
- };
- for (int i = 0; i < pump_ZTs.Length; i++)
- {
- wParam1.ScadaPoints.Add(new TimePoint() { Key = "pump" + (i + 1) + "#_ZT_in", Value = pump_ZTs[i] });
- wParam1.ResultPoints.Add(new TimePoint() { Key = "pump" + (i + 1) + "#_ZT_out", Value = pump_ZTs[i] });
- }
- wParam1.buildDict();
-
- if (wdo_Simulate1 == null)
- {
- wdo_Simulate1 = new WDNModelOptimizer(new GeneticParams(0));
- if ((result = wdo_Simulate1.Init(GlobalPath.configPath + @"config_simulate1.wdb", GlobalPath.modelPath + "model1.inp", this.CombineFinish1, this.CombineFinish1, null, wParam1, true)) != null)
- {
- wdo_Simulate1.Close();
- return null;//result;
- }
- }
-
- isFinished1 = false;
- if (wdo_Simulate1.Run(wParam1, false) != null)
- {
- wdo_Simulate1.Close();
- return null; //return result;
- }
-
-
- var wParam2 = new WdnmoParam();
- wParam2.ScadaPoints = new List<TimePoint>()
- {
- new TimePoint() { Key = "outlet_demand_in", Value = outlet_demand_in },
- new TimePoint() { Key = "outlet_press_in", Value = outlet_Press_scada },
-
-
- };
- //娣诲姞杈撳嚭闇�姹�
- //outlet_power_out锛氳緭鍑哄姛鐜�, outlet_press_out锛氳緭鍑哄帇鍔�
- //pump1#_ZT_in锛氭按娉�1杞��, pump2#_ZT_in锛氭按娉�2杞��, pump3#_ZT_in锛氭按娉�3杞��, pump4#_ZT_in锛氭按娉�4杞��
- wParam2.ResultPoints = new List<TimePoint>()
- {
- new TimePoint() { Key = "outlet_power_out" },
- new TimePoint() { Key = "outlet_press_out" },
-
- };
- for (int i = 0; i < pump_ZTs.Length; i++)
- {
- wParam2.ScadaPoints.Add(new TimePoint() { Key = "pump" + (i + 1) + "#_ZT_in", Value = pump_ZTs[i] });
- wParam2.ResultPoints.Add(new TimePoint() { Key = "pump" + (i + 1) + "#_ZT_out", Value = pump_ZTs[i] });
- }
- wParam2.buildDict();
-
-
- if (wdo_Simulate2 == null)
- {
- wdo_Simulate2 = new WDNModelOptimizer(new GeneticParams(0));
- if ((result = wdo_Simulate2.Init(GlobalPath.configPath + @"config_simulate2.wdb", GlobalPath.modelPath + "model2.inp", this.CombineFinish2, this.CombineFinish2, null, wParam2, true)) != null)
- {
- wdo_Simulate2.Close();
- return null;//result;
-
- }
- }
-
- isFinished2 = false;
-
- if ((result = wdo_Simulate2.Run(wParam2, false)) != null)
- {
- wdo_Simulate2.Close();
- return null;//result;
-
- }
-
-
- while (true)
- {
-
- Thread.Sleep(100);
-
- lock (obj)
- {
- if (isFinished1 && isFinished2) break;
- }
-
- }
-
- if (_wParam1 != null && _wParam2 != null)
- {
- _wParam1.buildDict();
- _wParam2.buildDict();
- var json1 = JsonConvert.SerializeObject(_wParam1);
- var json2 = JsonConvert.SerializeObject(_wParam2);
- WdnmoParam wParam = new WdnmoParam();
-
- wParam.ResultPoints.Add(new TimePoint() { Key = "鍔熺巼", Value = wParam1.dict_ResultPoints["outlet_power_out"] });
- wParam.ResultPoints.Add(new TimePoint() { Key = "鍔熺巼_瀹為檯", Value = wParam2.dict_ResultPoints["outlet_power_out"] });
- wParam.ResultPoints.Add(new TimePoint() { Key = "娉靛悗鍘嬪姏", Value = outlet_press_in });
- wParam.ResultPoints.Add(new TimePoint() { Key = "娉靛悗鍘嬪姏涓婇檺", Value = outlet_press_in_up });
- wParam.ResultPoints.Add(new TimePoint() { Key = "娉靛悗鍘嬪姏涓嬮檺", Value = outlet_press_in_down });
- wParam.ResultPoints.Add(new TimePoint() { Key = "璁＄畻娉靛悗鍘嬪姏", Value = wParam1.dict_ResultPoints["outlet_press_out"] });
- wParam.ResultPoints.Add(new TimePoint() { Key = "鎭掑帇鍊�", Value = outlet_Press_scada });
- double calc_user_press = Build.鐢ㄦ埛鍘嬪姏闇�姹� + wParam1.dict_ResultPoints["outlet_press_out"] - outlet_press_in;
- wParam.ResultPoints.Add(new TimePoint() { Key = "鏈鍘嬪姏", Value = calc_user_press });
- double real_user_press = Build.鐢ㄦ埛鍘嬪姏闇�姹� + wParam2.dict_ResultPoints["outlet_press_out"] - outlet_press_in;
- wParam.ResultPoints.Add(new TimePoint() { Key = "鐪熷疄鏈鍘嬪姏", Value = real_user_press });
- for (int i = 0; i < pump_ZTs.Length; i++)
- {
- wParam.ResultPoints.Add(new TimePoint() { Key = "pump" + (i + 1) + "#_ZT_out", Value = wParam1.dict_ResultPoints["pump" + (i + 1) + "#_ZT_out"] });
- }
- wParam.buildDict();
- return wParam;
- }
- return null;
-
- }
- /// <summary>
- /// 缁撴潫鍒嗘瀽锛岄噴鏀惧唴瀛�
- /// </summary>
- public void Close()
- {
- if (wdo_BuildAnalyse != null)
- {
- wdo_BuildAnalyse.Close();
- wdo_BuildAnalyse = null;
- }
- if (wdo_Simulate1 != null)
- {
- wdo_Simulate1.Close();
- }
- if (wdo_Simulate2 != null)
- {
- wdo_Simulate2.Close();
- }
-
-
- }
- #endregion
-
-
-
- #region 瀹屾垚1
- private void CombineFinish1(dynamic wParam)
- {
-
- if (wParam is string)
- {
- lock (obj)
- {
- isFinished1 = true;
- }
- return;//MessageBox.Show(txt);
- }
- else
- {
- _wParam1 = wParam;
- lock (obj)
- {
- isFinished1 = true;
- }
- }
-
-
- }
- private void CombineFinish2(dynamic wParam)
- {
-
- if (wParam is string)
- {
- lock (obj)
- {
- isFinished2 = true;
- }
- return;//MessageBox.Show(txt);
- }
- else
- {
-
- _wParam2 = wParam;
- lock (obj)
- {
- isFinished2 = true;
- }
-
- }
-
- }
- #endregion
-
- #region 杈呭姪鍒嗘瀽鏂规硶
- /// <summary>
- /// 鍒濆鍖栧垎鏋愶紝璇勪及Build鐨勭郴缁熷弬鏁帮紝骞惰褰曞湪Build鐨勨�淏uild.娴侀噺鍘嬮檷鏇茬嚎鈥濅腑
- /// </summary>
- private void InitAnalyse()
- {
- if (Build.UDList == null)
- {
- Build.UDList = GetInitUDList();
- var dv = Build.UDList.DefaultView;
- dv.RowFilter = "鏄惁鍚敤=true";
- Build.UDNames = new List<string>();
- Build.UDPatterns = new List<double>();
- foreach (DataRowView drv in dv)
- {
-
- Build.UDPatterns.Add((double)drv["鏈�灏忛瀹氭祦閲廋MH"]);
- Build.UDPatterns.Add((double)drv["棰濆畾娴侀噺CMH"]);
- Build.UDNames.Add(drv["缁欐按閰嶄欢鍚嶇О"].ToString());
- }
- }
- analy_press_flow();
- //ProcessFlowTrend();
-
- }
- private object obj = new object();
- private bool isFinished1;
- private bool isFinished2;
-
- private void CombineFinish(dynamic txt)
- {
- lock (obj)
- {
- isFinished = true;
- }
- if (txt is string)
- {
- return;//MessageBox.Show(txt);
- }
- else
- {
-
- if (txt.results != null && txt.results.Count > 0)
- {
- AddPoints(txt.results);
- }
-
- }
-
- }
- private void AddPoints(List<Result> res)
- {
-
- _res = res;
- List<PointF> nums = res.Select(o => new PointF((float)o.Demand, (float)o.ObjFunctionValue)).ToList();
-
- var chartDatas = nums.Select(p => new PointF(p.X, p.Y + Build.鐢ㄦ埛鍘嬪姏闇�姹�)).ToList();
- outlet_Press_Zero = chartDatas.Min(o => o.Y);
- if (chartDatas == null || chartDatas.Count == 0) return;
-
-
- // 璁＄畻澶氶」寮忓湪鐐� x 澶勭殑鍙栧��
- // 璁＄畻鎷熷悎鏇茬嚎涓婄殑鐐�
- var curve = new CurveFitHelper(chartDatas, 2);
- List<List<PointF>> confidencePoints = curve.GetConfidenceCurve(100);
-
- Build.娴侀噺鍘嬮檷鏇茬嚎.Data = chartDatas;
- Build.娴侀噺鍘嬮檷涓嬮檺.Data = confidencePoints[0];
- Build.娴侀噺鍘嬮檷涓嬮檺.CurveFit();
- Build.娴侀噺鍘嬮檷涓婇檺.Data = confidencePoints[1];
- Build.娴侀噺鍘嬮檷涓婇檺.CurveFit();
- Build.娴侀噺鍘嬮檷骞冲潎.Data = confidencePoints[2];
- Build.娴侀噺鍘嬮檷骞冲潎.CurveFit();
-
- }
- private void analy_press_flow()
- {
-
- // bool Success = true;
-
- var template = Build.template;
- var _Network = template.network;
- _Network.SetNodeDemand();
- _Network.Calc(template.FullPath, GlobalPath.configPath + "config_calc.wdb");
- _Network.CalcLinkMinorLoss();
- string result = null;
-
- GeneticParams gparam = new GeneticParams(0);
- var wdo = new WDNModelOptimizer(gparam);
- bool isInited = false;
- //int times = 0;
- //for (double i = 1; i <= _SelectedPump.鍏ユ埛绠￠暱; i += _SelectedPump.鍏ユ埛绠￠暱 / 10)
- double i = Build.绯荤粺鏈�澶ф祦閲�;// _SelectedPump.鍏ユ埛绠￠暱;
- {
-
- isFinished = false;
- WdnmoParam wParam = new WdnmoParam();
- wParam.ScadaPoints = new List<TimePoint>();
- wParam.ScadaPoints.Add(new TimePoint() { Key = "TotalDemand", Value = i });
- wParam.ScadaPoints.Add(new TimePoint() { Key = "DLDB", Pattern = Build.UDPatterns.ToArray() });
- if (!isInited)
- {
- isInited = true;
- if ((result = wdo.Init(GlobalPath.configPath + @"config_System.wdb", template.FullPath, this.CombineFinish, this.CombineFinish, null, wParam, true)) != null)
- {
- wdo.Close();
-
-
- return;
- }
- }
- if ((result = wdo.Run(wParam, false)) != null)
- {
- wdo.Close();
-
-
- return;
- }
-
-
- while (true)
- {
-
- Thread.Sleep(100);
-
- lock (obj)
- {
- if (isFinished) break;
- }
-
- }
- }
-
-
- wdo.Close();
-
- }
- private DataTable GetInitUDList()
- {
-
- // 娣诲姞鍒�
- var dataTable = new DataTable();
- dataTable.Columns.Add("鏄惁鍚敤", typeof(bool));
- dataTable.Columns.Add("鏁伴噺", typeof(int));
- dataTable.Columns.Add("缁欐按閰嶄欢鍚嶇О", typeof(string));
- dataTable.Columns.Add("鏈�灏忔祦閲廘PS", typeof(double));
- dataTable.Columns.Add("棰濆畾娴侀噺LPS", typeof(double));
- dataTable.Columns.Add("鏈�灏忛瀹氭祦閲廋MH", typeof(double));
- dataTable.Columns.Add("棰濆畾娴侀噺CMH", typeof(double));
- dataTable.Columns.Add("绫诲瀷", typeof(string));
-
- // 娣诲姞琛�
- dataTable.Rows.Add(true, 1, "姹℃按鐩嗘按榫欏ご", 0.2, 0.2, 0.72, 0.72, "浣忓畢");
- dataTable.Rows.Add(false, 1, "浣忓畢鍘ㄦ埧娲楁钉鐩嗘按榫欏ご", 0.14, 0.2, 0.504, 0.72, "浣忓畢");
- dataTable.Rows.Add(true, 1, "娲楁钉鐩嗘按榫欏ご", 0.24, 0.32, 0.864, 1.152, "椋熷爞/楗簵");
- dataTable.Rows.Add(false, 1, "鏅�氭按榫欏ご", 0.44, 0.44, 1.584, 1.584, "鏃�");
- dataTable.Rows.Add(false, 1, "浣忓畢闆嗕腑缁欐按榫欏ご", 0.3, 0.3, 1.08, 1.08, "浣忓畢");
- dataTable.Rows.Add(true, 1, "娲楁墜鐩嗘按榫欏ご", 0.1, 0.15, 0.36, 0.54, "浣忓畢");
- dataTable.Rows.Add(false, 1, "娲楄劯鐩嗗拰鐩ユ礂妲芥按榫欏ご", 0.16, 0.2, 0.576, 0.72, "浣忓畢");
- dataTable.Rows.Add(false, 1, "娴寸泦姘撮緳澶�", 0.2, 0.3, 0.72, 1.08, "浣忓畢");
- dataTable.Rows.Add(false, 1, "澶т究鍣紙娴悆闃�锛�", 0.1, 0.1, 0.36, 0.36, "浣忓畢");
- dataTable.Rows.Add(false, 1, "澶т究鍣紙鑷棴寮忓啿娲楅榾锛�", 1.2, 1.3, 4.32, 4.68, "浣忓畢");
- dataTable.Rows.Add(false, 1, "澶т究妲藉啿娲楁按绠辫繘姘撮榾", 0.1, 0.1, 0.36, 0.36, "浣忓畢");
- dataTable.Rows.Add(false, 1, "灏忎究鍣紙鎵嬪姩鍐叉礂闃�锛�", 0.05, 0.05, 0.18, 0.18, "浣忓畢");
- dataTable.Rows.Add(false, 1, "灏忎究鍣紙鑷棴寮忓啿娲楅榾锛�", 0.1, 0.1, 0.36, 0.36, "浣忓畢");
- dataTable.Rows.Add(false, 1, "灏忎究鍣紙鑷姩鍐叉礂姘寸杩涙按闃�锛�", 0.1, 0.1, 0.36, 0.36, "浣忓畢");
- dataTable.Rows.Add(false, 1, "瀹為獙瀹ゅ寲楠岄緳澶村崟鑱�", 0.07, 0.07, 0.252, 0.252, "瀹為獙瀹�");
- dataTable.Rows.Add(false, 1, "瀹為獙瀹ゅ寲楠岄緳澶村弻鑱�", 0.15, 0.15, 0.54, 0.54, "瀹為獙瀹�");
- dataTable.Rows.Add(false, 1, "瀹為獙瀹ゅ寲楠岄緳澶翠笁鑱�", 0.2, 0.2, 0.72, 0.72, "瀹為獙瀹�");
- dataTable.Rows.Add(true, 1, "鍑�韬櫒鍐叉礂姘撮緳澶�", 0.07, 0.1, 0.252, 0.36, "浣忓畢");
- dataTable.Rows.Add(false, 1, "楗按鍣ㄥ柗鍢�", 0.05, 0.05, 0.18, 0.18, "浣忓畢");
- dataTable.Rows.Add(false, 1, "娲掓按鏍�", 0.4, 0.4, 1.44, 1.44, "浣忓畢");
- dataTable.Rows.Add(false, 1, "娲掓按鏍�", 0.7, 0.7, 2.52, 2.52, "浣忓畢");
- dataTable.Rows.Add(false, 1, "瀹ゅ唴娲掓按榫欏ご", 0.2, 0.2, 0.72, 0.72, "浣忓畢");
- dataTable.Rows.Add(true, 1, "瀹剁敤娲楄。鏈虹粰姘撮緳澶�", 0.24, 0.24, 0.864, 0.864, "浣忓畢");
- return dataTable;
- }
-
-
- #endregion
- #region 澶勭悊娴侀噺瓒嬪娍
- private void ProcessFlowTrend(List<PointF> nums)
- {
-
- var curve = new CurveFitHelper(nums, 2);
-
- List<List<PointF>> confidencePoints = curve.GetConfidenceCurve(48);
- //_SelectedPump.鐢ㄦ按瓒嬪娍鏇茬嚎.Data = nums;
- Build.鐢ㄦ按瓒嬪娍涓嬮檺.Data = confidencePoints[0];
- Build.鐢ㄦ按瓒嬪娍涓婇檺.Data = confidencePoints[1];
- Build.鐢ㄦ按瓒嬪娍鏇茬嚎.Data = confidencePoints[2];
- }
- #endregion
- }
-}
diff --git a/Hydro.Simu/app.config b/Hydro.Simu/app.config
deleted file mode 100644
index 77f9dd4..0000000
--- a/Hydro.Simu/app.config
+++ /dev/null
@@ -1,23 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
\ No newline at end of file
diff --git a/HydroV1.1.sln b/HydroV1.1.sln
index 21becc5..78b5a07 100644
--- a/HydroV1.1.sln
+++ b/HydroV1.1.sln
@@ -29,8 +29,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.HydraulicOptimizer", "Hydraulic\Hydro.HydraulicOptimizer\Hydro.HydraulicOptimizer.csproj", "{0F5C43E6-97BA-457C-954D-62EAB47A38A9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.Simu", "Hydro.Simu\Hydro.Simu.csproj", "{E1F630A0-C0A3-4965-A6B5-0F41AA139348}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_new|Any CPU = Debug_new|Any CPU
@@ -380,36 +378,6 @@
{0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x64.Build.0 = Release|Any CPU
{0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.ActiveCfg = Release|Any CPU
{0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.Build.0 = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|x64.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|x64.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|x86.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug_new|x86.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|x64.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug|x86.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|Any CPU.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|x64.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|x64.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|x86.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Debug1|x86.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|Any CPU.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|x64.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|x64.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|x86.ActiveCfg = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.dll_test|x86.Build.0 = Debug|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|Any CPU.Build.0 = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|x64.ActiveCfg = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|x64.Build.0 = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|x86.ActiveCfg = Release|Any CPU
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -426,7 +394,6 @@
{D2B8356F-0EA6-4167-8119-57B3E49A55CF} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
{D66081C0-21B2-4B2A-A4AD-DAE293271972} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
{0F5C43E6-97BA-457C-954D-62EAB47A38A9} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
- {E1F630A0-C0A3-4965-A6B5-0F41AA139348} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {04D92980-B7F3-4AC8-B744-D6A674322C27}
--
Gitblit v1.9.3