From c3904896ecb869d4147b749b00db9e88736bf444 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期一, 07 七月 2025 14:47:15 +0800
Subject: [PATCH] update database
---
ErrorAnalysis.Service/COMergeCalcService.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ErrorAnalysis.Service/COMergeCalcService.cs b/ErrorAnalysis.Service/COMergeCalcService.cs
index 161d2c1..e3b3051 100644
--- a/ErrorAnalysis.Service/COMergeCalcService.cs
+++ b/ErrorAnalysis.Service/COMergeCalcService.cs
@@ -22,12 +22,17 @@
const int _oWinStartIndex = (int)(4.88 / _gg + _offset); // org
const int _oWinEndIndex = (int)(6.36 / _gg + _offset); // width = 6.36-4.88=1.48
- private static double GetInterplolateResult(RepositoryBase repos, string modelId, double porosity, double sw, double speed)
+ private static double GetFarInterplolateResult(COFarResultRepository repos, string modelId, double porosity, double sw, double speed, double depth)
{
}
- public static double GetFarMergeCResult(string connectionString, string modelId, double porosity, double sw, double speed)
+ private static double GetNearInterplolateResult(COFarResultRepository repos, string modelId, double porosity, double sw, double speed, double depth)
+ {
+
+ }
+
+ public static double GetFarMergeCResult(string connectionString, string modelId, double porosity, double sw, double speed, double depth)
{
if (porosity > 40)
throw new InvalidDataException("Porosity value out of range!");
@@ -45,7 +50,7 @@
var length = _cWinEndIndex - _cWinStartIndex + 1;
var originC = cArr.Skip(_cWinStartIndex).Take(length).Sum();
- var coef = originC * 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6 * speed*depth*0.07;
+ var coef = originC * 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6 * speed * depth * 0.07;
if (sw > 0)
result = Utility.Interpolate(sw, 100, 0, 0, coef);
--
Gitblit v1.9.3