From 0c43dbc54e4a18bd0916ad40d4fc7799e0c22c82 Mon Sep 17 00:00:00 2001
From: qinjie <qinjie@163.com>
Date: 星期六, 02 十二月 2023 15:14:55 +0800
Subject: [PATCH] 提交文件
---
Hydro.Inp/NetWork.cs | 2 +-
out/Hydro.Core.dll | 0
out/CommonBase.dll | 0
out/Hydro.ConfigModel.dll | 0
out/Hydro.HydraulicOptimizer.dll | 0
Test/Program.cs | 4 ++--
6 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Hydro.Inp/NetWork.cs b/Hydro.Inp/NetWork.cs
index fae93e4..49c3f29 100644
--- a/Hydro.Inp/NetWork.cs
+++ b/Hydro.Inp/NetWork.cs
@@ -1014,7 +1014,7 @@
/// <returns></returns>
public virtual List<TimePoint> Calc()
{
- var inpPath = Path.Combine(Directory.GetCurrentDirectory(), @"data\inp\calc.inp");
+ var inpPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"data\inp\calc.inp");
BuildToInp(inpPath);
return Calc(inpPath);
}
diff --git a/Test/Program.cs b/Test/Program.cs
index 32c6f7a..d8f56d8 100644
--- a/Test/Program.cs
+++ b/Test/Program.cs
@@ -17,7 +17,7 @@
const string revitInpPath = "d:\\t2.inp";
static void Main(string[] args)
{
- Test3();
+ Test4();
}
static void Test1()
@@ -146,7 +146,7 @@
static void Test4()
{
var nw = new NetWork();
- var result = nw.Calc(inpPath);
+ var result = nw.Calc();
Console.WriteLine(JsonConvert.SerializeObject(result));
Console.ReadLine();
}
diff --git a/out/CommonBase.dll b/out/CommonBase.dll
index effa5ea..60e129e 100644
--- a/out/CommonBase.dll
+++ b/out/CommonBase.dll
Binary files differ
diff --git a/out/Hydro.ConfigModel.dll b/out/Hydro.ConfigModel.dll
index da39fb0..47e2f31 100644
--- a/out/Hydro.ConfigModel.dll
+++ b/out/Hydro.ConfigModel.dll
Binary files differ
diff --git a/out/Hydro.Core.dll b/out/Hydro.Core.dll
index fa4df45..af3a86e 100644
--- a/out/Hydro.Core.dll
+++ b/out/Hydro.Core.dll
Binary files differ
diff --git a/out/Hydro.HydraulicOptimizer.dll b/out/Hydro.HydraulicOptimizer.dll
index c14bd82..4c676e8 100644
--- a/out/Hydro.HydraulicOptimizer.dll
+++ b/out/Hydro.HydraulicOptimizer.dll
Binary files differ
--
Gitblit v1.9.3