1. 영호 신호검색 추가 완료
This commit is contained in:
@@ -47,6 +47,11 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
IchimokuConditionSetup ichimokuConditionSetup = new IchimokuConditionSetup();
|
||||
MovingAverageConditionSetup movingAverageConditionSetup = new MovingAverageConditionSetup();
|
||||
|
||||
signals_LU.Clear();
|
||||
signals_SD.Clear();
|
||||
signals_LD.Clear();
|
||||
signals_SU.Clear();
|
||||
|
||||
// 추후 공통화 및 소스정리 필요
|
||||
while (true)
|
||||
{
|
||||
@@ -70,7 +75,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
|
||||
if (lastCandleData.IchimokData != null)
|
||||
{
|
||||
if (checked구름떼상향돌파)
|
||||
if (checked구름떼상향돌파 || 영호조건식_상향돌파)
|
||||
{
|
||||
item.Price = lastCandleData.Close;
|
||||
item.Rate = (lastCandleData.Close / lastCandleData.Open) * 100 - 100;
|
||||
@@ -93,7 +98,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
|
||||
if (lastCandleData.IchimokData != null)
|
||||
{
|
||||
if (checked구름떼하향돌파)
|
||||
if (checked구름떼하향돌파 || 영호조건식_하향돌파)
|
||||
{
|
||||
item.Price = lastCandleData.Close;
|
||||
item.Rate = (lastCandleData.Close / lastCandleData.Open) * 100 - 100;
|
||||
@@ -114,8 +119,8 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
foreach (CommonProperty.MCandleTimeType interval in Enum.GetValues(typeof(CommonProperty.MCandleTimeType)))
|
||||
{
|
||||
// Description
|
||||
var description = Utils.Convertor.GetEnumDescription((Enum)interval);
|
||||
if (!intervalList.Contains(description)) continue;
|
||||
var strInterval = Utils.Convertor.GetEnumDescription((Enum)interval);
|
||||
if (!intervalList.Contains(strInterval)) continue;
|
||||
|
||||
// 시간별로 정렬하기 (임시 리스트)
|
||||
var candleDatas = findedMarket.candleDataList[interval];
|
||||
@@ -142,15 +147,16 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var indicatorPrice = candleData.Open;
|
||||
var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100;
|
||||
|
||||
var signalData = signals_LU.Find(i => i.MarketName.Equals(market));
|
||||
|
||||
var description = string.Format("{0} 구름떼 상승", strInterval);
|
||||
var signalData = signals_LU.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
|
||||
// 없으면 생성
|
||||
if (signalData == null)
|
||||
{
|
||||
SignalInfoData signalInfoData = new SignalInfoData();
|
||||
signalInfoData.SignalStart = nowTime;
|
||||
signalInfoData.MarketName = market;
|
||||
signalInfoData.Description = string.Format("{0} 구름떼 상승", description);
|
||||
signalInfoData.Description = description;
|
||||
signalInfoData.Rate = rate;
|
||||
signalInfoData.Price = price;
|
||||
signalInfoData.IndicatorPrice = indicatorPrice;
|
||||
@@ -169,7 +175,8 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var indicatorPrice = candleData.Open;
|
||||
var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100;
|
||||
|
||||
var signalData = signals_SD.Find(i => i.MarketName.Equals(market));
|
||||
var description = string.Format("{0} 구름떼 하락", strInterval);
|
||||
var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
|
||||
// 없으면 생성
|
||||
if (signalData == null)
|
||||
@@ -177,7 +184,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
SignalInfoData signalInfoData = new SignalInfoData();
|
||||
signalInfoData.SignalStart = nowTime;
|
||||
signalInfoData.MarketName = market;
|
||||
signalInfoData.Description = string.Format("{0} 구름떼 하락", description);
|
||||
signalInfoData.Description = description;
|
||||
signalInfoData.Rate = rate;
|
||||
signalInfoData.Price = price;
|
||||
signalInfoData.IndicatorPrice = indicatorPrice;
|
||||
@@ -190,36 +197,93 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
|
||||
if (영호조건식_상향돌파 || 영호조건식_하향돌파)
|
||||
{
|
||||
|
||||
candleDatas_정렬.RemoveAt(candleDatas_정렬.Count - 1);
|
||||
var candleData_전전봉 = candleDatas.Find(i => i.Argument == candleDatas_정렬.Last().Argument);
|
||||
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전전봉);
|
||||
|
||||
// 24,72 높은값
|
||||
var 높은값_74_21_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[21].Value);
|
||||
var 높은값_74_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value);
|
||||
// 24,72 낮은값
|
||||
var 낮은값_74_21_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[21].Value);
|
||||
var 낮은값_74_24_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value);
|
||||
|
||||
// 24,72 높은값
|
||||
var 높은값_74_21_전봉 = Math.Max(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[21].Value);
|
||||
var 높은값_74_24_전봉 = Math.Max(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value);
|
||||
// 24,72 낮은값
|
||||
var 낮은값_74_21_전봉 = Math.Min(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[21].Value);
|
||||
var 낮은값_74_24_전봉 = Math.Min(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value);
|
||||
|
||||
// 24,72 높은값
|
||||
var 높은값_74_24 = Math.Max(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value);
|
||||
// 24,72 낮은값
|
||||
var 낮은값_74_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value);
|
||||
|
||||
if (영호조건식_상향돌파 &&
|
||||
candleData_전봉.movingAverageDataList[72].Value < candleData_전봉.IchimokData.상한선)
|
||||
{
|
||||
|
||||
}
|
||||
else if (영호조건식_하향돌파)
|
||||
// 전전봉의 4가 74, 21 보다 높고
|
||||
candleData_전전봉.movingAverageDataList[4].Value <= 높은값_74_24_전전봉 &&
|
||||
// 전봉의 4가 74,21 보다 작고나서
|
||||
candleData_전봉.movingAverageDataList[4].Value > 높은값_74_24_전봉 &&
|
||||
// 현재 시가도 4가 74,21 보다 작고, 고가도
|
||||
candleData.movingAverageDataList[4].Value > 높은값_74_24)
|
||||
{
|
||||
if (낮은값_74_21_전봉 < candleData_전봉.IchimokData.하한선 &&
|
||||
candleData_전봉.movingAverageDataList[4].Value < 낮은값_74_21_전봉)
|
||||
var price = candleData.Close;
|
||||
var rate = (candleData.Close / candleData.Open) * 100 - 100;
|
||||
var indicatorPrice = candleData.Open;
|
||||
var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100;
|
||||
|
||||
var description = string.Format("{0} 72,24,4 상승", strInterval); ;
|
||||
var signalData = signals_LU.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
|
||||
// 없으면 생성
|
||||
if (signalData == null)
|
||||
{
|
||||
SignalInfoData signalInfoData = new SignalInfoData();
|
||||
signalInfoData.SignalStart = nowTime;
|
||||
signalInfoData.MarketName = market;
|
||||
signalInfoData.Description = description;
|
||||
signalInfoData.Rate = rate;
|
||||
signalInfoData.Price = price;
|
||||
signalInfoData.IndicatorPrice = indicatorPrice;
|
||||
signalInfoData.IndicatorRate = indicatorRate;
|
||||
signalInfoData.MCandleTimeType = interval;
|
||||
|
||||
signals_LU.Add(signalInfoData);
|
||||
}
|
||||
}
|
||||
else if (영호조건식_하향돌파 &&
|
||||
// 전전봉의 4가 74, 21 보다 높고
|
||||
candleData_전전봉.movingAverageDataList[4].Value >= 낮은값_74_24_전전봉 &&
|
||||
// 전봉의 4가 74,21 보다 작고나서
|
||||
candleData_전봉.movingAverageDataList[4].Value < 낮은값_74_24_전봉 &&
|
||||
// 현재 시가도 4가 74,21 보다 작고, 고가도
|
||||
candleData.movingAverageDataList[4].Value < 낮은값_74_24)
|
||||
{
|
||||
|
||||
var price = candleData.Close;
|
||||
var rate = (candleData.Close / candleData.Open) * 100 - 100;
|
||||
var indicatorPrice = candleData.Open;
|
||||
var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100;
|
||||
|
||||
var description = string.Format("{0} 72,24,4 하락", strInterval);
|
||||
var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
|
||||
// 없으면 생성
|
||||
if (signalData == null)
|
||||
{
|
||||
SignalInfoData signalInfoData = new SignalInfoData();
|
||||
signalInfoData.SignalStart = nowTime;
|
||||
signalInfoData.MarketName = market;
|
||||
signalInfoData.Description = description;
|
||||
signalInfoData.Rate = rate;
|
||||
signalInfoData.Price = price;
|
||||
signalInfoData.IndicatorPrice = indicatorPrice;
|
||||
signalInfoData.IndicatorRate = indicatorRate;
|
||||
signalInfoData.MCandleTimeType = interval;
|
||||
|
||||
signals_SD.Add(signalInfoData);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user