million/Million
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

최초 시점 잡는 로직 예외처리 위치 변경

Browse Source
This commit is contained in:
kyh
2022-10-28 13:25:09 +09:00
parent d8a4f578e6
commit 61b5ef230d
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Million/Manager/CalculateManager.cs
View File

@@ -598,7 +598,13 @@ namespace Million.Manager
foreach (var parent in parentCandleDataList)
{
var dic = parent.CalculateFlag;
var overlapData = GetOverlapValueData(setUp, parent, key);
if (overlapData == 0) continue;
var valDic = ResultLogicManager.GetIndicateValue(dic, totalIndicators, parent);
var subVal = GetConditionValue(subScript.regularExpressionString, valDic, dic);
if (subVal == 0) continue;
//Sub 조건 만족 여부
if (subScript.DicExcuteScript(dic))
{
@@ -606,23 +612,23 @@ namespace Million.Manager
}
else
{
subFlag = false;
var str = "";
if (recentlyDataFlag)
if (subFlag)
{
if (subManagement != null && !subManagement[coinFullName])
{
subFlag = false;
var str = "";
if (recentlyDataFlag)
{
str = "Buyer(Realtime) Mode\r\n";
str += coinFullName + " 최초 돌파 Sub조건 초기화 됨\r\n";
LogManager.WriteLog(str, coinFullName);
subManagement[coinFullName] = true;
}
else
{
firstFlag = false;
}
subManagement[coinFullName] = true;
}
else
{
firstFlag = false;
}
}
//sub 조건이 만족할 경우
@@ -631,14 +637,6 @@ namespace Million.Manager
if(recentlyDataFlag)
if (!subManagement[coinFullName]) continue;
var overlapData = GetOverlapValueData(setUp, parent, key);
if (overlapData == 0) continue;
var valDic = ResultLogicManager.GetIndicateValue(dic, totalIndicators, parent);
var subVal = GetConditionValue(subScript.regularExpressionString, valDic, dic);
if (subVal == 0) continue;
if (upperMainIndicatorFlag)
if (overlapData < subVal) continue;