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

조건 단순 비교 관련 로직 변경

Browse Source
This commit is contained in:
kyh
2024-04-23 10:31:17 +09:00
parent c51d6edcbd
commit 8bdafc5b25
1 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Million/Manager/CalculateManager.cs
View File

@@ -407,23 +407,37 @@ namespace Million.Manager
var originValueList = new List<double>();
var compareValueList = new List<double>();
originValueList.Add(parent.IndicatorDic[originKey].value);
compareValueList.Add(parent.IndicatorDic[compareKey].value);
if (originSetup.CandlePriceType == CandlePriceType.종가)
if(parent.IndicatorDic[originKey].GetType() == typeof(IchimokData))
{
originValueList.Add(parent.IndicatorDic[originKey].highValue);
originValueList.Add(parent.IndicatorDic[originKey].lowValue);
}
if (compareSetup.CandlePriceType == CandlePriceType.종가)
originValueList.Add(GetValueData(originSetup, parent, originKey));
}
else
{
compareValueList.Add(parent.IndicatorDic[compareKey].highValue);
compareValueList.Add(parent.IndicatorDic[compareKey].lowValue);
//originValueList.Add(parent.IndicatorDic[originKey].value);
if (originSetup.CandlePriceType == CandlePriceType.종가)
{
originValueList.Add(parent.IndicatorDic[originKey].highValue);
originValueList.Add(parent.IndicatorDic[originKey].lowValue);
}
}
if (parent.IndicatorDic[compareKey].GetType() == typeof(IchimokData))
{
originValueList.Add(GetValueData(compareSetup, parent, compareKey));
}
else
{
//compareValueList.Add(parent.IndicatorDic[compareKey].value);
if (compareSetup.CandlePriceType == CandlePriceType.종가)
{
compareValueList.Add(parent.IndicatorDic[compareKey].highValue);
compareValueList.Add(parent.IndicatorDic[compareKey].lowValue);
}
}
var cnt = originValueList.Count >= compareValueList.Count ? originValueList.Count : compareValueList.Count;
var flag = true;
var flag = false;
for (var i = 0; i < cnt; i++)
{
if (parent.CalculateFlag[cSetup.IndexString]) break;
@@ -451,27 +465,31 @@ namespace Million.Manager
(cSetup.CompareType == CompareType.Origin_Down_Compare_Up && originVal < compareVal) ||
(cSetup.CompareType == CompareType.Origin_DownOrSame_Compare_Up && originVal <= compareVal))
{
flag = false;
if (!CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName])
{
CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName] = true;
break;
}
var childList = GetChildrenDatas(parent, cSetup.MCandleTimeType, childrenCandleDataList);
if (cSetup.CompareType == CompareType.Origin_Up_Compare_Down || cSetup.CompareType == CompareType.Origin_UpOrSame_Compare_Down)
SearchAndSetMainValue(childList, parent, setUp, originSetup, compareSetup, originKey, compareKey, parent.IndicatorDic[key].GetType() == typeof(IchimokData),
parent.IndicatorDic[compareKey].GetType() == typeof(IchimokData));
else
SearchAndSetMainValue(childList, parent, setUp, compareSetup, originSetup, compareKey, originKey, parent.IndicatorDic[compareKey].GetType() == typeof(IchimokData),
parent.IndicatorDic[originKey].GetType() == typeof(IchimokData));
flag = true;
parent.CalculateFlag[cSetup.IndexString] = true;
break;
//flag = false;
//if (!CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName])
//{
// CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName] = true;
// break;
//}
}
}
if (flag)
CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName] = false;
{
var childList = GetChildrenDatas(parent, cSetup.MCandleTimeType, childrenCandleDataList);
if (cSetup.CompareType == CompareType.Origin_Up_Compare_Down || cSetup.CompareType == CompareType.Origin_UpOrSame_Compare_Down)
SearchAndSetMainValue(childList, parent, setUp, originSetup, compareSetup, originKey, compareKey, parent.IndicatorDic[originKey].GetType() == typeof(IchimokData),
parent.IndicatorDic[compareKey].GetType() == typeof(IchimokData));
else
SearchAndSetMainValue(childList, parent, setUp, compareSetup, originSetup, compareKey, originKey, parent.IndicatorDic[compareKey].GetType() == typeof(IchimokData),
parent.IndicatorDic[originKey].GetType() == typeof(IchimokData));
}
//if (flag)
// CommonProperty.compareIndicatorState[setUp.IndexString][coinFullName] = false;
}
}