From 86e24a36b2d271774348a83db677ccab04cf2b0d Mon Sep 17 00:00:00 2001 From: kyh <1329522@naver.com> Date: Mon, 19 Aug 2024 10:44:43 +0900 Subject: [PATCH] =?UTF-8?q?60=EB=B6=84=EB=B4=89=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndicatorProcess.cs | 440 +++++++++--------- .../MovingAverageConditionSetup.cs | 2 + 2 files changed, 224 insertions(+), 218 deletions(-) diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 593d8b3..67f05f7 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -141,11 +141,12 @@ namespace BitgetAPI.IndicatorConditionSetup { var dic = new Dictionary(); dic.Add("val", 0); - dic.Add("clearFlag", true); - dic.Add("flag", false); + dic.Add("clearFlag", true); dic.Add("firstFlag", true); + dic.Add("flag", false); + dic.Add("breakFlag", false); 전저점.Add(market + strInterval, dic); - } + } // 시간별로 정렬하기 (임시 리스트) var candleDatas = findedMarket.candleDataList[interval]; @@ -154,7 +155,7 @@ namespace BitgetAPI.IndicatorConditionSetup var candleData = candleDatas.Find(i => i.Argument == candleDatas_정렬.Last().Argument); - if (candleData == null) continue; + if (candleData == null) continue; ichimokuConditionSetup.calIchimokuData(candleDatas_정렬, candleData); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData); @@ -162,68 +163,68 @@ namespace BitgetAPI.IndicatorConditionSetup candleDatas_정렬.RemoveAt(candleDatas_정렬.Count - 1); var candleData_전봉 = candleDatas.Find(i => i.Argument == candleDatas_정렬.Last().Argument); - if (candleData_전봉 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_정렬, candleData_전봉); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전봉); + if (candleData_전봉 == null) continue; + ichimokuConditionSetup.calIchimokuData(candleDatas_정렬, candleData_전봉); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전봉); if (checked구름떼상향돌파 && candleData_전봉.Open < candleData_전봉.IchimokData.상한선 && candleData.Open > candleData.IchimokData.상한선 && candleData.Low > candleData.IchimokData.상한선 && candleData.Close > candleData.IchimokData.상한선) { - - var indicatorPrice = candleData.Open; - var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; + + var indicatorPrice = candleData.Open; + var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; var description = string.Format("{0} 구름떼 상승", strInterval); var signalData = signals_LU.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); - // 없으면 생성 - if (signalData == null) - { - var price = candleData.Close; - var rate = (candleData.Close / candleData.Open) * 100 - 100; + // 없으면 생성 + if (signalData == null) + { + var price = candleData.Close; + var rate = (candleData.Close / candleData.Open) * 100 - 100; - 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; + 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 (checked구름떼상향돌파 && candleData_전봉.Open > candleData_전봉.IchimokData.하한선 && candleData.Open < candleData.IchimokData.하한선 && candleData.High < candleData.IchimokData.하한선 - && candleData.Close < candleData.IchimokData.하한선) - { - - var indicatorPrice = candleData.Open; - var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; + } + else if (checked구름떼상향돌파 && candleData_전봉.Open > candleData_전봉.IchimokData.하한선 && candleData.Open < candleData.IchimokData.하한선 && candleData.High < candleData.IchimokData.하한선 + && candleData.Close < candleData.IchimokData.하한선) + { + + var indicatorPrice = candleData.Open; + var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; var description = string.Format("{0} 구름떼 하락", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); - // 없으면 생성 - if (signalData == null) - { - var price = candleData.Close; - var rate = (candleData.Close / candleData.Open) * 100 - 100; + // 없으면 생성 + if (signalData == null) + { + var price = candleData.Close; + var rate = (candleData.Close / candleData.Open) * 100 - 100; - 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; + 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); } @@ -237,31 +238,36 @@ namespace BitgetAPI.IndicatorConditionSetup movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전전봉); // 24,72 높은값 - var 높은값_74_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); + var 높은값_72_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); + var 낮은값_72_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); + var 높은값_72_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); + var 낮은값_72_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); + var 높은값_72_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); + var 낮은값_72_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); + + var 높은값_48_24 = Math.Max(candleData.movingAverageDataList[48].Value, candleData.movingAverageDataList[24].Value); var 전전봉4 = candleData_전전봉.movingAverageDataList[4].Value; var 전전봉12 = candleData_전전봉.movingAverageDataList[12].Value; var 전전봉24 = candleData_전전봉.movingAverageDataList[24].Value; + var 전전봉48 = candleData_전전봉.movingAverageDataList[48].Value; var 전전봉72 = candleData_전전봉.movingAverageDataList[72].Value; var 전봉4 = candleData_전봉.movingAverageDataList[4].Value; var 전봉12 = candleData_전봉.movingAverageDataList[12].Value; var 전봉24 = candleData_전봉.movingAverageDataList[24].Value; + var 전봉48 = candleData_전봉.movingAverageDataList[48].Value; var 전봉72 = candleData_전봉.movingAverageDataList[72].Value; var 현재봉4 = candleData.movingAverageDataList[4].Value; var 현재봉12 = candleData.movingAverageDataList[12].Value; var 현재봉24 = candleData.movingAverageDataList[24].Value; + var 현재봉48 = candleData.movingAverageDataList[48].Value; var 현재봉72 = candleData.movingAverageDataList[72].Value; var 전봉Bol4 = candleData_전봉.movingAverageDataList[4].BolangerValue; @@ -288,40 +294,40 @@ namespace BitgetAPI.IndicatorConditionSetup //var buyFlag = 전봉Bol12 - 전봉Bol24 > Bol12 - Bol24 && 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24; - //var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_74_24; + //var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_72_24; 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 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) + // 전전봉의 4가 72, 21 보다 높고 + candleData_전전봉.movingAverageDataList[4].Value <= 높은값_72_24_전전봉 && + // 전봉의 4가 72,21 보다 작고나서 + candleData_전봉.movingAverageDataList[4].Value > 높은값_72_24_전봉 && + // 현재 시가도 4가 72,21 보다 작고, 고가도 + candleData.movingAverageDataList[4].Value > 높은값_72_24) { - var indicatorPrice = candleData.Open; - var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; + var price = candleData.Close; + var rate = (candleData.Close / candleData.Open) * 100 - 100; - 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; + + 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) + { + var indicatorPrice = candleData.Open; + var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; + + 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); } @@ -335,151 +341,158 @@ namespace BitgetAPI.IndicatorConditionSetup var description = string.Format("{0} 72,24,4 하락", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); - + try { - if ((int)interval != 5) + if ((int)interval != 60) { continue; } - #region 15분봉 처리 - //15분봉 관련 처리 - var candleDatas15 = findedMarket.candleDataList[MCandleTimeType.M15]; - var candleDatas15_정렬 = candleDatas15.OrderBy(i => i.Argument).ToList(); + #region 240분봉 처리 + //60분봉 관련 처리 + var candleDatas240 = findedMarket.candleDataList[MCandleTimeType.H4]; + var candleDatas240_정렬 = candleDatas240.OrderBy(i => i.Argument).ToList(); - var candleData15 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); - if (candleData15 == null) continue; - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15); - ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15); + var candleData240 = candleDatas240.Find(i => i.Argument == candleDatas240_정렬.Last().Argument); + if (candleData240 == null) continue; + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas240_정렬, candleData240); + ichimokuConditionSetup.calIchimokuData(candleDatas240_정렬, candleData240); - candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1); - var candleData15_전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전봉); - ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전봉); + candleDatas240_정렬.RemoveAt(candleDatas240_정렬.Count - 1); + var candleData240_전봉 = candleDatas240.Find(i => i.Argument == candleDatas240_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas240_정렬, candleData240_전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas240_정렬, candleData240_전봉); - candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1); - var candleData15_전전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전전봉); - ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전전봉); + candleDatas240_정렬.RemoveAt(candleDatas240_정렬.Count - 1); + var candleData240_전전봉 = candleDatas240.Find(i => i.Argument == candleDatas240_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas240_정렬, candleData240_전전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas240_정렬, candleData240_전전봉); - candleDatas15_정렬.RemoveAt(candleDatas15_정렬.Count - 1); - var candleData15_전전전봉 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전전봉); - ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전전봉); + candleDatas240_정렬.RemoveAt(candleDatas240_정렬.Count - 1); + var candleData240_전전전봉 = candleDatas240.Find(i => i.Argument == candleDatas240_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas240_정렬, candleData240_전전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas240_정렬, candleData240_전전봉); - var 낮은값15_74_24 = Math.Min(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value); - var 높은값15_74_24 = Math.Max(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value); + var 낮은값240_72_24 = Math.Min(candleData240.movingAverageDataList[72].Value, candleData240.movingAverageDataList[24].Value); + var 높은값240_72_24 = Math.Max(candleData240.movingAverageDataList[72].Value, candleData240.movingAverageDataList[24].Value); - var 전봉낮은값15_74_24 = Math.Min(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); - var 전봉높은값15_74_24 = Math.Max(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); - var 전전봉낮은값15_74_24 = Math.Min(candleData15_전전봉.movingAverageDataList[72].Value, candleData15_전전봉.movingAverageDataList[24].Value); - var 전전봉높은값15_74_24 = Math.Max(candleData15_전전봉.movingAverageDataList[72].Value, candleData15_전전봉.movingAverageDataList[24].Value); + var 전봉낮은값240_72_24 = Math.Min(candleData240_전봉.movingAverageDataList[72].Value, candleData240_전봉.movingAverageDataList[24].Value); + var 전봉높은값240_72_24 = Math.Max(candleData240_전봉.movingAverageDataList[72].Value, candleData240_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값240_72_24 = Math.Min(candleData240_전봉.movingAverageDataList[72].Value, candleData240_전봉.movingAverageDataList[24].Value); + var 전전봉높은값240_72_24 = Math.Max(candleData240_전봉.movingAverageDataList[72].Value, candleData240_전봉.movingAverageDataList[24].Value); - var 현재봉15_12 = candleData15.movingAverageDataList[12].Value; - var 전봉15_12 = candleData15_전봉.movingAverageDataList[12].Value; - var 전전봉15_12 = candleData15_전전봉.movingAverageDataList[12].Value; + var 현재봉240_12 = candleData240.movingAverageDataList[12].Value; + var 전봉240_12 = candleData240_전봉.movingAverageDataList[12].Value; + var 전전봉240_12 = candleData240_전전봉.movingAverageDataList[12].Value; - var 현재봉15_4 = candleData15.movingAverageDataList[4].Value; - var 전봉15_4 = candleData15_전봉.movingAverageDataList[4].Value; - var 전전봉15_4 = candleData15_전전봉.movingAverageDataList[4].Value; + var 현재봉240_4 = candleData240.movingAverageDataList[4].Value; + var 전봉240_4 = candleData240_전봉.movingAverageDataList[4].Value; + var 전전봉240_4 = candleData240_전전봉.movingAverageDataList[4].Value; - var 전봉15Bol4 = candleData15_전봉.movingAverageDataList[4].BolangerValue; - var 전봉15Bol12 = candleData15_전봉.movingAverageDataList[12].BolangerValue; - var 전봉15Bol24 = candleData15_전봉.movingAverageDataList[24].BolangerValue; + var 전봉240Bol4 = candleData240_전봉.movingAverageDataList[4].BolangerValue; + var 전봉240Bol12 = candleData240_전봉.movingAverageDataList[12].BolangerValue; + var 전봉240Bol24 = candleData240_전봉.movingAverageDataList[24].BolangerValue; - var 전전봉15Bol4 = candleData15_전전봉.movingAverageDataList[4].BolangerValue; - var 전전봉15Bol12 = candleData15_전전봉.movingAverageDataList[12].BolangerValue; - var 전전봉15Bol24 = candleData15_전전봉.movingAverageDataList[24].BolangerValue; - var 현재봉15Bol4 = candleData15.movingAverageDataList[4].BolangerValue; - var 현재봉15Bol12 = candleData15.movingAverageDataList[12].BolangerValue; - var 현재봉15Bol24 = candleData15.movingAverageDataList[24].BolangerValue; + var 전전봉240Bol4 = candleData240_전전봉.movingAverageDataList[4].BolangerValue; + var 전전봉240Bol12 = candleData240_전전봉.movingAverageDataList[12].BolangerValue; + var 전전봉240Bol24 = candleData240_전전봉.movingAverageDataList[24].BolangerValue; + var 현재봉240Bol4 = candleData240.movingAverageDataList[4].BolangerValue; + var 현재봉240Bol12 = candleData240.movingAverageDataList[12].BolangerValue; + var 현재봉240Bol24 = candleData240.movingAverageDataList[24].BolangerValue; - var candle15Flag = 현재봉15_4 < 높은값15_74_24 && - candleData15.Open > candleData15.Close && - 현재봉15_4 < 전봉15_4 && 전봉15_4 < 전전봉15_4 && - 현재봉15_12 < 전봉15_12 && 전봉15_12 < 전전봉15_12 && - 전봉15Bol12 - 전봉15Bol24 > 현재봉15Bol12 - 현재봉15Bol24; + var candle240Flag = 현재봉240_4 < 높은값240_72_24 && + 현재봉240_4 < 전봉240_4 && + 현재봉240_12 < 전봉240_12 && + 전봉240Bol12 - 전봉240Bol24 > 현재봉240Bol12 - 현재봉240Bol24; + #endregion - #region 1분봉 처리 - var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M1]; - var candleDatas1_정렬 = candleDatas1.OrderBy(i => i.Argument).ToList(); + #region 3분봉 처리 + /* + var candleDatas3 = findedMarket.candleDataList[MCandleTimeType.M3]; + var candleDatas3_정렬 = candleDatas3.OrderBy(i => i.Argument).ToList(); - var candleData1 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument); - if (candleData1 == null) continue; - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1); - ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1); + var candleData3 = candleDatas3.Find(i => i.Argument == candleDatas3_정렬.Last().Argument); + if (candleData3 == null) continue; + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas3_정렬, candleData3); + ichimokuConditionSetup.calIchimokuData(candleDatas3_정렬, candleData3); + + candleDatas3_정렬.RemoveAt(candleDatas3_정렬.Count - 1); + var candleData3_전봉 = candleDatas3.Find(i => i.Argument == candleDatas3_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas3_정렬, candleData3_전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas3_정렬, candleData3_전봉); + + candleDatas3_정렬.RemoveAt(candleDatas3_정렬.Count - 1); + var candleData3_전전봉 = candleDatas3.Find(i => i.Argument == candleDatas3_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas3_정렬, candleData3_전전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas3_정렬, candleData3_전전봉); - candleDatas1_정렬.RemoveAt(candleDatas1_정렬.Count - 1); - var candleData1_전봉 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1_전봉); - ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1_전봉); + var 높은값3_48_24 = Math.Max(candleData3.movingAverageDataList[48].Value, candleData3.movingAverageDataList[24].Value); + var 낮은값3_72_24 = Math.Min(candleData3.movingAverageDataList[72].Value, candleData3.movingAverageDataList[24].Value); + var 높은값3_72_24 = Math.Max(candleData3.movingAverageDataList[72].Value, candleData3.movingAverageDataList[24].Value); - candleDatas1_정렬.RemoveAt(candleDatas1_정렬.Count - 1); - var candleData1_전전봉 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1_전전봉); - ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1_전전봉); + var 전봉낮은값3_72_24 = Math.Min(candleData3_전봉.movingAverageDataList[72].Value, candleData3_전봉.movingAverageDataList[24].Value); + var 전봉높은값3_72_24 = Math.Max(candleData3_전봉.movingAverageDataList[72].Value, candleData3_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값3_72_24 = Math.Min(candleData3_전전봉.movingAverageDataList[72].Value, candleData3_전전봉.movingAverageDataList[24].Value); + var 전전봉높은값3_72_24 = Math.Max(candleData3_전전봉.movingAverageDataList[72].Value, candleData3_전전봉.movingAverageDataList[24].Value); + var 현재봉3_12 = candleData3.movingAverageDataList[12].Value; + var 전봉3_12 = candleData3_전봉.movingAverageDataList[12].Value; + var 전전봉3_12 = candleData3_전전봉.movingAverageDataList[12].Value; - var 낮은값1_74_24 = Math.Min(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); - var 높은값1_74_24 = Math.Max(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); + var 현재봉3_4 = candleData3.movingAverageDataList[4].Value; + var 전봉3_4 = candleData3_전봉.movingAverageDataList[4].Value; + var 전전봉3_4 = candleData3_전전봉.movingAverageDataList[4].Value; - var 전봉낮은값1_74_24 = Math.Min(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); - var 전봉높은값1_74_24 = Math.Max(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); - var 전전봉낮은값1_74_24 = Math.Min(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value); - var 전전봉높은값1_74_24 = Math.Max(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value); + var 전봉3Bol4 = candleData3_전봉.movingAverageDataList[4].BolangerValue; + var 전봉3Bol12 = candleData3_전봉.movingAverageDataList[12].BolangerValue; + var 전봉3Bol24 = candleData3_전봉.movingAverageDataList[24].BolangerValue; - var 현재봉1_12 = candleData1.movingAverageDataList[12].Value; - var 전봉1_12 = candleData1_전봉.movingAverageDataList[12].Value; - var 전전봉1_12 = candleData1_전전봉.movingAverageDataList[12].Value; + var 전전봉3Bol4 = candleData3_전전봉.movingAverageDataList[4].BolangerValue; + var 전전봉3Bol12 = candleData3_전전봉.movingAverageDataList[12].BolangerValue; + var 전전봉3Bol24 = candleData3_전전봉.movingAverageDataList[24].BolangerValue; + var 현재봉3Bol4 = candleData3.movingAverageDataList[4].BolangerValue; + var 현재봉3Bol12 = candleData3.movingAverageDataList[12].BolangerValue; + var 현재봉3Bol24 = candleData3.movingAverageDataList[24].BolangerValue; - var 현재봉1_4 = candleData1.movingAverageDataList[4].Value; - var 전봉1_4 = candleData1_전봉.movingAverageDataList[4].Value; - var 전전봉1_4 = candleData1_전전봉.movingAverageDataList[4].Value; - - var 전봉1Bol4 = candleData1_전봉.movingAverageDataList[4].BolangerValue; - var 전봉1Bol12 = candleData1_전봉.movingAverageDataList[12].BolangerValue; - var 전봉1Bol24 = candleData1_전봉.movingAverageDataList[24].BolangerValue; - - var 전전봉1Bol4 = candleData1_전전봉.movingAverageDataList[4].BolangerValue; - var 전전봉1Bol12 = candleData1_전전봉.movingAverageDataList[12].BolangerValue; - var 전전봉1Bol24 = candleData1_전전봉.movingAverageDataList[24].BolangerValue; - var 현재봉1Bol4 = candleData1.movingAverageDataList[4].BolangerValue; - var 현재봉1Bol12 = candleData1.movingAverageDataList[12].BolangerValue; - var 현재봉1Bol24 = candleData1.movingAverageDataList[24].BolangerValue; - - var candle1Flag = 현재봉1_4 < 낮은값1_74_24 && 전봉1_4 > 현재봉1_4 && 전전봉1_4 > 전봉1_4 && - candleData1.Close < candleData1.Open && - candleData1.Close < candleData1.IchimokData.하한선 && - 현재봉1_4 < candleData1.IchimokData.하한선 && - 전봉1_4 > 현재봉1_4 && - 현재봉1_12 < 전봉1_12;// && - //전봉1Bol12 - 전봉1Bol24 > 현재봉1Bol12 - 현재봉1Bol24; + //var candle3Flag = 현재봉3_4 < 낮은값3_72_24 && 전봉3_4 > 현재봉3_4 && 전전봉3_4 > 전봉3_4 && candleData3.Close < candleData3.IchimokData.상한선 && candleData3.Close < candleData3.Open; + */ #endregion var buyFlag = 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24 && 전전봉Bol4 > 전봉Bol4; //파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜 - //var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_74_24; - //var sellFlag = 현재봉4 > 낮은값_74_24 || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24; - var sellFlag = 현재봉1_4 > 높은값1_74_24;// 현재봉4 > 낮은값_74_24 || 전봉12 < 전봉4 || (전봉4 > 전전봉4 && 전봉12 > 전전봉12) || 현재봉15_4 > 전봉15_4;// || 전봉4 - 전전봉4 > 0;// || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24; + //var sellFlag = 전봉Bol12 - 전봉Bol24 < Bol12 - Bol24 || 현재봉4 > 낮은값_72_24; + //var sellFlag = 현재봉4 > 낮은값_72_24 || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24; + var sellFlag = 현재봉4 > 높은값_48_24;// 현재봉4 > 낮은값_72_24 || 전봉12 < 전봉4 || (전봉4 > 전전봉4 && 전봉12 > 전전봉12) || 현재봉60_4 > 전봉60_4;// || 전봉4 - 전전봉4 > 0;// || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24; //파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜 //var buyFlag = candleData_전봉.movingAverageDataList[12].BolangerValue > candleData_전봉.movingAverageDataList[24].BolangerValue && 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24; ////파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜 - //var sellFlag = 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24 || 현재봉4 > 낮은값_74_24; + //var sellFlag = 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24 || 현재봉4 > 낮은값_72_24; var 전저점Data = 전저점[market + strInterval]; double.TryParse(전저점Data["val"].ToString(), out var val); bool.TryParse(전저점Data["flag"].ToString(), out var flag); bool.TryParse(전저점Data["firstFlag"].ToString(), out var firstFlag); - bool.TryParse(전저점Data["clearFlag"].ToString(), out var clearFlag); + bool.TryParse(전저점Data["breakFlag"].ToString(), out var breakFlag); - if (!flag) + if (현재봉4 > 높은값_72_24) + { + if (firstFlag) + 전저점Data["firstFlag"] = false; + + 전저점Data["flag"] = true; + 전저점Data["clearFlag"] = true; + 전저점Data["val"] = 0; + 전저점Data["breakFlag"] = false; + } + + if (!flag || !breakFlag) { if (val == 0) { @@ -487,20 +500,13 @@ namespace BitgetAPI.IndicatorConditionSetup val = 전봉4; } - if (현재봉4 > 높은값_74_24) - { - 전저점Data["flag"] = true; - 전저점Data["clearFlag"] = true; - 전저점Data["val"] = 0; - 전저점Data["firstFlag"] = false; - } - - if(전봉4 > 전전봉4 && clearFlag) + if (전봉4 > 전전봉4 && clearFlag) { 전저점Data["clearFlag"] = false; - if(전전봉4 > val) + if (전전봉4 > val) { 전저점Data["flag"] = false; + 전저점Data["breakFlag"] = true; } else { @@ -508,47 +514,45 @@ namespace BitgetAPI.IndicatorConditionSetup } } - if(전봉4 < 전전봉4) + else if (전봉4 < 전전봉4) { 전저점Data["clearFlag"] = true; if (val > 전봉4) { 전저점Data["val"] = 전봉4; - if (!clearFlag) - 전저점Data["clearFlag"] = true; - } + } } } - + //사는 시점 if (!BuyList.ContainsKey(market + interval)) { if ( ( - 전전봉4 > 낮은값_74_24_전전봉 - && 전전봉4 < 높은값_74_24_전전봉 && - 전봉4 < 낮은값_74_24_전봉 && - 전봉12 > 낮은값_74_24_전봉 && + 전전봉4 > 낮은값_72_24_전전봉 + && 전전봉4 < 높은값_72_24_전전봉 && + 전봉4 < 낮은값_72_24_전봉 && + //전봉12 > 낮은값_72_24_전봉 && 전봉24 < 전전봉24 && - 낮은값_74_24_전봉 < candleData_전봉.IchimokData.하한선 && - candleData_전봉.Close < candleData_전봉.IchimokData.하한선 && - candleData_전봉.Open > candleData_전봉.Close && + 낮은값_72_24_전봉 < candleData_전봉.IchimokData.상한선 && + candleData_전봉.Close < candleData_전봉.IchimokData.상한선 && + //candleData_전봉.Open > candleData_전봉.Close && (flag && !firstFlag) ) - //|| - //( - // 전봉4 < 전전봉4 && 전봉12 < 전전봉12 && - // 전봉24 < 전전봉24 && 전봉72 < 전전봉72 && - // 현재봉4 < 낮은값_74_24 && 현재봉12 > 현재봉4 && - // candleData_전봉.Open > candleData_전봉.Close && - // candleData.Open > candleData.Close - //) + //|| + //( + // 전봉4 < 전전봉4 && 전봉12 < 전전봉12 && + // 전봉24 < 전전봉24 && 전봉72 < 전전봉72 && + // 현재봉4 < 낮은값_72_24 && 현재봉12 > 현재봉4 && + // candleData_전봉.Open > candleData_전봉.Close && + && candleData.Open > candleData.Close + //) && //최초조건Flag.ContainsKey(market + interval) && 최초조건Flag[market + interval] == true && //볼랜저 12 24중 12가 크고 전전봉 전봉 12 차이보다 전전봉 전봉 24가 작아야함(하향) buyFlag && - candle15Flag && - candle1Flag + candle240Flag + //&& candle3Flag ) { // 없으면 생성 @@ -585,7 +589,7 @@ namespace BitgetAPI.IndicatorConditionSetup { 판매조건Flag[market + interval] = true; } - if (val == 0) + if (val == 0) 전저점Data["val"] = 전봉4; 전저점Data["flag"] = false; @@ -593,7 +597,7 @@ namespace BitgetAPI.IndicatorConditionSetup } else { - if(현재봉15_12 > 전봉15_12) + if (현재봉240_12 > 전봉240_12) 최초조건Flag[market + interval] = true; } } @@ -616,14 +620,14 @@ namespace BitgetAPI.IndicatorConditionSetup continue; } } - if(현재봉4 < 현재봉12 && !판매조건Flag[market + interval]) + if (현재봉4 < 현재봉12 && !판매조건Flag[market + interval]) { 판매조건Flag[market + interval] = true; } - if(!판매조건Flag[market + interval]) + if (!판매조건Flag[market + interval]) { - sellFlag = 현재봉4 > 낮은값_74_24; + sellFlag = 현재봉4 > 낮은값_72_24; } if (sellFlag) @@ -659,9 +663,9 @@ namespace BitgetAPI.IndicatorConditionSetup } } } - catch (Exception e) + catch (Exception e) { - + } } } diff --git a/BitgetApi/IndicatorConditionSetup/MovingAverageConditionSetup.cs b/BitgetApi/IndicatorConditionSetup/MovingAverageConditionSetup.cs index 0333a82..17e37b2 100644 --- a/BitgetApi/IndicatorConditionSetup/MovingAverageConditionSetup.cs +++ b/BitgetApi/IndicatorConditionSetup/MovingAverageConditionSetup.cs @@ -18,6 +18,7 @@ namespace BitgetAPI.IndicatorConditionSetup public CommonProperty.MovingAverageType MovingAverageType { get; set; } // 기간 public int CandleLegnth24 { get; set; } = 24; + public int CandleLegnth48 { get; set; } = 48; // 기간 public int CandleLegnth4 { get; set; } = 4; // 기간 @@ -44,6 +45,7 @@ namespace BitgetAPI.IndicatorConditionSetup candleData.movingAverageDataList.Add(CandleLegnth4, new MovingAverageData()); candleData.movingAverageDataList.Add(CandleLegnth12, new MovingAverageData()); candleData.movingAverageDataList.Add(CandleLegnth24, new MovingAverageData()); + candleData.movingAverageDataList.Add(CandleLegnth48, new MovingAverageData()); candleData.movingAverageDataList.Add(CandleLegnth72, new MovingAverageData()); }