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-12-06 11:09:47 +09:00
parent 0cf3bd3aa0
commit b7f35ea1ef
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Million/CommonProperty.cs
View File

@@ -209,9 +209,10 @@ namespace Million
// 기준선 설정 (일목)
public enum Indicator_IchmokuOverLine
{
선행스팬1 = 1,
선행스팬1 = 1,
선행스팬2 = 2,
선행스팬1OR2중고가= 3,
선행스팬1OR2중고가 = 3,
선행스팬1OR2중저가 = 4
}
// 구매/판매 조건 설정

12
Million/Data/IchimokData.cs
View File

@@ -56,5 +56,17 @@ namespace Million.Data
return value > value2 ? value : value2;
}
/// <summary>
/// 두 선행스팬 값중에 아래 값을 리턴함
/// </summary>
/// <returns></returns>
public double GetDownOverValue()
{
if (value == 0 || value2 == 0)
return 0;
return value < value2 ? value : value2;
}
}
}

7
Million/IndicatorConditionSetup/IchimokuConditionSetup.cs
View File

@@ -166,9 +166,12 @@ namespace Million.IndicatorConditionSetup
{
targetValue = ichi.GetOverValue();
}
else if (IndicatorIchmokuOverLine == CommonProperty.Indicator_IchmokuOverLine.선행스팬1OR2중저가)
{
targetValue = ichi.GetDownOverValue();
}
var stValue = targetCandle.StartValue;
var stValue = targetCandle.StartValue;
var enValue = targetCandle.EndValue;
var tempValue = stValue;
while (tempValue <= enValue)

8
Million/Manager/CalculateManager.cs
View File

@@ -1178,6 +1178,10 @@ namespace Million.Manager
{
data = ((IchimokData)candleData.IndicatorDic[key]).GetOverValue();
}
else if (((IchimokuConditionSetup)setUp).IndicatorIchmokuOverLine == CommonProperty.Indicator_IchmokuOverLine.선행스팬1OR2중저가)
{
data = ((IchimokData)candleData.IndicatorDic[key]).GetDownOverValue();
}
}
#endregion
return data;
@@ -1208,6 +1212,10 @@ namespace Million.Manager
{
overlapData = ((IchimokData)candleData.IndicatorDic[key]).GetOverValue();
}
else if (((IchimokuConditionSetup)setUp).IndicatorIchmokuOverLine == CommonProperty.Indicator_IchmokuOverLine.선행스팬1OR2중저가)
{
overlapData = ((IchimokData)candleData.IndicatorDic[key]).GetDownOverValue();
}
}
#endregion
return overlapData;

4
Million/Manager/ResultLogicManager.cs
View File

@@ -42,6 +42,10 @@ namespace Million.Manager
val = indiData.value;
else if (indi.IndicatorIchmokuOverLine == Indicator_IchmokuOverLine.선행스팬2)
val = indiData.value2;
else if (indi.IndicatorIchmokuOverLine == Indicator_IchmokuOverLine.선행스팬1OR2중고가)
val = indiData.GetOverValue();
else if (indi.IndicatorIchmokuOverLine == Indicator_IchmokuOverLine.선행스팬1OR2중저가)
val = indiData.GetDownOverValue();
valDic.Add(key.Key, val);
}