From 9acdf3c826311bd67180821ce19c625d0e384ca8 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期四, 19 十二月 2024 09:45:18 +0800
Subject: [PATCH] 紧急提交更新
---
Calc/IStation.Calc.Core/递归计算2/ErQuCalcHelper_2_递归_定水量.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217.cs" "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217.cs"
index 32fd78c..32beb2a 100644
--- "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217.cs"
+++ "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217.cs"
@@ -6,6 +6,9 @@
namespace IStation.Calc
{
+ /// <summary>
+ /// 瀹氬彇姘存�婚噺
+ /// </summary>
internal partial class ErQuCalcHelper_2_閫掑綊_瀹氭按閲� : ErQuCalcHelper_2_閫掑綊
{
protected List<List<Dictionary<int, BlockItemList>>> _dictCalcCache瀹氭按閲�;
@@ -142,7 +145,7 @@
var td = GetTimeDataBundle(pumpNum_left);
td.GetRangeDataStart1(0, out sumFlowWhole, out sumCompareWhole);
- if (sumFlowWhole >= this._stationTotalFlow)
+ if (sumFlowWhole >= this._flowInTotalFlow)
{
if (sumCompareWhole < current_best_solution.TotalCompare)
{
@@ -212,7 +215,7 @@
td.GetRangeData1(0, splitIndx, out sumFlowLeft, out sumCompareLeft);
- if (sumFlowLeft >= this._stationTotalFlow)
+ if (sumFlowLeft >= this._flowInTotalFlow)
{//宸︿晶宸茬粡鑳借揪鍒拌姹備簡
if (current_best_solution.TotalCompare > sumCompareLeft)
{
@@ -290,7 +293,7 @@
return null;
}
- if (lastTotalFlow > this._stationTotalFlow)
+ if (lastTotalFlow > this._flowInTotalFlow)
{//宸茶揪鍒版祦閲�:鍩烘湰涓婁笉浼氬嚭鐜�,杩涘叆鍓嶅凡鍒ゆ柇
return null;
}
@@ -318,7 +321,7 @@
isNeedInsertCache = false;
- if (cache_model.TotalFlow + lastTotalFlow >= this._stationTotalFlow)
+ if (cache_model.TotalFlow + lastTotalFlow >= this._flowInTotalFlow)
{
BlockItemList cache_model_copy = new BlockItemList();
cache_model_copy.TotalCompare = cache_model.TotalCompare;
@@ -352,7 +355,7 @@
if (sumCompareWhole == double.MaxValue)
continue;
- if (sumFlowWhole + lastTotalFlow >= this._stationTotalFlow &&
+ if (sumFlowWhole + lastTotalFlow >= this._flowInTotalFlow &&
sumCompareWhole < current_best_solution.TotalCompare)
{
current_best_solution.TotalCompare = sumCompareWhole;
@@ -433,7 +436,7 @@
if (sumCompareLeft == double.MaxValue)
continue;
var total_current_flow = sumFlowLeft + lastTotalFlow;
- if (total_current_flow >= this._stationTotalFlow)
+ if (total_current_flow >= this._flowInTotalFlow)
{//宸︿晶宸茬粡鑳借揪鍒拌姹備簡
if (current_best_solution.TotalCompare > sumCompareLeft)
{
--
Gitblit v1.9.3