From 06674ed145de67f330420c2aada07d95d589a6fe Mon Sep 17 00:00:00 2001 From: kyh <1329522@naver.com> Date: Wed, 11 Sep 2024 10:47:38 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EA=B2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndicatorProcess.cs | 526 +++++++++++++----- 1 file changed, 387 insertions(+), 139 deletions(-) diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 625db28..00cad58 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -10,6 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using static BitgetAPI.CommonProperty; +using static DevExpress.Utils.Drawing.Helpers.NativeMethods; namespace BitgetAPI.IndicatorConditionSetup { @@ -52,6 +53,18 @@ namespace BitgetAPI.IndicatorConditionSetup //결과 리스트 public List> DownResultList = new List>(); + + //구매 리스트 + public Dictionary> DownTempBuyList = new Dictionary>(); + //결과 리스트 + public List> DownTempResultList = new List>(); + + //구매 리스트 + public Dictionary> UpTempBuyList = new Dictionary>(); + //결과 리스트 + public List> UpTempResultList = new List>(); + + public Dictionary 판매조건Flag = new Dictionary(); public Dictionary 최초조건Flag = new Dictionary(); // 전봉이 구름떼 돌파후 시가가 구름떼 위에서 시작하는 것 @@ -151,6 +164,7 @@ namespace BitgetAPI.IndicatorConditionSetup dic.Add("clearFlag", true); dic.Add("firstFlag", true); dic.Add("flag", false); + dic.Add("tempFirstFlag", true); dic.Add("breakFlag", false); 전저점.Add(market + strInterval, dic); } @@ -160,6 +174,7 @@ namespace BitgetAPI.IndicatorConditionSetup dic.Add("val", 0); dic.Add("clearFlag", true); dic.Add("firstFlag", true); + dic.Add("tempFirstFlag", true); dic.Add("flag", false); dic.Add("breakFlag", false); 전고점.Add(market + strInterval, dic); @@ -167,7 +182,7 @@ namespace BitgetAPI.IndicatorConditionSetup // 시간별로 정렬하기 (임시 리스트) var candleDatas = findedMarket.candleDataList[interval]; - var candleDatas_정렬 = candleDatas.OrderBy(i => i.Argument).ToList(); + var candleDatas_정렬 = candleDatas.ToList().OrderBy(i => i.Argument).ToList(); var candleData = candleDatas.Find(i => i.Argument == candleDatas_정렬.Last().Argument); @@ -254,45 +269,36 @@ namespace BitgetAPI.IndicatorConditionSetup movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전전봉); - // 24,48 높은값 - var 높은값_48_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[48].Value, candleData_전전봉.movingAverageDataList[24].Value); + // 24,72 높은값 var 높은값_72_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); - // 24,48 낮은값 - var 낮은값_48_24_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[48].Value, candleData_전전봉.movingAverageDataList[24].Value); + // 24,72 낮은값 var 낮은값_72_24_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); - // 24,48 높은값 - var 높은값_48_24_전봉 = Math.Max(candleData_전봉.movingAverageDataList[48].Value, candleData_전봉.movingAverageDataList[24].Value); + // 24,72 높은값 var 높은값_72_24_전봉 = Math.Max(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); - // 24,48 낮은값 - var 낮은값_48_24_전봉 = Math.Min(candleData_전봉.movingAverageDataList[48].Value, candleData_전봉.movingAverageDataList[24].Value); + // 24,72 낮은값 var 낮은값_72_24_전봉 = Math.Min(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); - // 24,48 높은값 - var 높은값_48_24 = Math.Max(candleData.movingAverageDataList[48].Value, candleData.movingAverageDataList[24].Value); + // 24,72 높은값 var 높은값_72_24 = Math.Max(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); - // 24,48 낮은값 - var 낮은값_48_24 = Math.Min(candleData.movingAverageDataList[48].Value, candleData.movingAverageDataList[24].Value); + // 24,72 낮은값 var 낮은값_72_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); - var 높은값_12_낮은값48_24 = Math.Max(candleData.movingAverageDataList[12].Value, 낮은값_48_24); + var 높은값_12_낮은값72_24 = Math.Max(candleData.movingAverageDataList[12].Value, 낮은값_72_24); var 낮은값_12_높은값72_24 = Math.Min(candleData.movingAverageDataList[12].Value, 높은값_72_24); 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; @@ -308,84 +314,142 @@ namespace BitgetAPI.IndicatorConditionSetup var Bol24 = candleData.movingAverageDataList[24].BolangerValue; - if ((int)interval != 60) + if ((int)interval != 5) { continue; } - #region 240분봉 처리 + #region 15분봉 처리 //60분봉 관련 처리 - var candleDatas240 = findedMarket.candleDataList[MCandleTimeType.H4]; - var candleDatas240_정렬 = candleDatas240.OrderBy(i => i.Argument).ToList(); + var candleDatas15 = findedMarket.candleDataList[MCandleTimeType.M15]; + var candleDatas15_정렬 = candleDatas15.ToList().OrderBy(i => i.Argument).ToList(); - var candleData240 = candleDatas240.Find(i => i.Argument == candleDatas240_정렬.Last().Argument); - if (candleData240 == null) continue; - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas240_정렬, candleData240); - ichimokuConditionSetup.calIchimokuData(candleDatas240_정렬, candleData240); + var candleData15 = candleDatas15.Find(i => i.Argument == candleDatas15_정렬.Last().Argument); + if (candleData15 == null) continue; + 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_전전봉); + 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_전전봉); - var 낮은값240_48_24 = Math.Min(candleData240.movingAverageDataList[48].Value, candleData240.movingAverageDataList[24].Value); - var 높은값240_48_24 = Math.Max(candleData240.movingAverageDataList[48].Value, candleData240.movingAverageDataList[24].Value); + + var 낮은값15_72_24 = Math.Min(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value); + var 높은값15_72_24 = Math.Max(candleData15.movingAverageDataList[72].Value, candleData15.movingAverageDataList[24].Value); - var 전봉낮은값240_48_24 = Math.Min(candleData240_전봉.movingAverageDataList[48].Value, candleData240_전봉.movingAverageDataList[24].Value); - var 전봉높은값240_48_24 = Math.Max(candleData240_전봉.movingAverageDataList[48].Value, candleData240_전봉.movingAverageDataList[24].Value); - var 전전봉낮은값240_48_24 = Math.Min(candleData240_전봉.movingAverageDataList[48].Value, candleData240_전봉.movingAverageDataList[24].Value); - var 전전봉높은값240_48_24 = Math.Max(candleData240_전봉.movingAverageDataList[48].Value, candleData240_전봉.movingAverageDataList[24].Value); + var 전봉낮은값15_72_24 = Math.Min(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); + var 전봉높은값15_72_24 = Math.Max(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값15_72_24 = Math.Min(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); + var 전전봉높은값15_72_24 = Math.Max(candleData15_전봉.movingAverageDataList[72].Value, candleData15_전봉.movingAverageDataList[24].Value); - var 현재봉240_12 = candleData240.movingAverageDataList[12].Value; - var 전봉240_12 = candleData240_전봉.movingAverageDataList[12].Value; - var 전전봉240_12 = candleData240_전전봉.movingAverageDataList[12].Value; + var 현재봉15_12 = candleData15.movingAverageDataList[12].Value; + var 전봉15_12 = candleData15_전봉.movingAverageDataList[12].Value; + var 전전봉15_12 = candleData15_전전봉.movingAverageDataList[12].Value; - var 현재봉240_4 = candleData240.movingAverageDataList[4].Value; - var 전봉240_4 = candleData240_전봉.movingAverageDataList[4].Value; - var 전전봉240_4 = candleData240_전전봉.movingAverageDataList[4].Value; + var 현재봉15_4 = candleData15.movingAverageDataList[4].Value; + var 전봉15_4 = candleData15_전봉.movingAverageDataList[4].Value; + var 전전봉15_4 = candleData15_전전봉.movingAverageDataList[4].Value; - 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 전전봉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 전전봉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; #endregion if (영호조건식_상향돌파) { var price = candleData.Close; - var rate = (candleData.Close / candleData.Open) * 100 - 100; + var rate = (candleData.Close / candleData.Open) * 100 - 100; var indicatorPrice = candleData.Open; var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; - var description = string.Format("{0} 48,24,4 상승", strInterval); + var description = string.Format("{0} 72,24,4 상승", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); try { - var candle240Flag = 현재봉240_4 > 낮은값240_48_24 && - 현재봉240_4 > 전봉240_4 && - 현재봉240_12 > 전봉240_12 && - 전봉240Bol12 - 전봉240Bol24 > 현재봉240Bol12 - 현재봉240Bol24; + var candle15Flag = 현재봉15_4 > 낮은값15_72_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; + + #region 1분봉 처리 + + var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M1]; + var candleDatas1_정렬 = candleDatas1.ToList().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); + + 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_전봉); + + 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 높은값1_72_24 = Math.Max(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); + var 낮은값1_72_24 = Math.Min(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); + + var 전봉낮은값1_72_24 = Math.Min(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); + var 전봉높은값1_72_24 = Math.Max(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값1_72_24 = Math.Min(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value); + var 전전봉높은값1_72_24 = Math.Max(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value); + + var 현재봉1_12 = candleData1.movingAverageDataList[12].Value; + var 전봉1_12 = candleData1_전봉.movingAverageDataList[12].Value; + var 전전봉1_12 = candleData1_전전봉.movingAverageDataList[12].Value; + + 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_72_24 && 전봉1_4 < 현재봉1_4 && 전전봉1_4 < 전봉1_4 && + candleData1.Close > candleData1.Open && + candleData1.Close > candleData1.IchimokData.하한선 && + 현재봉1_4 > candleData1.IchimokData.하한선 && + 현재봉1_12 > 전봉1_12; + + #endregion var buyFlag = 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24 && 전전봉Bol4 > 전봉Bol4; - var sellFlag = 현재봉4 < 낮은값_12_높은값72_24; + var sellFlag = 현재봉1_4 < 높은값1_72_24; var 전고점Data = 전고점[market + strInterval]; double.TryParse(전고점Data["val"].ToString(), out var val); @@ -393,8 +457,14 @@ namespace BitgetAPI.IndicatorConditionSetup bool.TryParse(전고점Data["firstFlag"].ToString(), out var firstFlag); bool.TryParse(전고점Data["clearFlag"].ToString(), out var clearFlag); bool.TryParse(전고점Data["breakFlag"].ToString(), out var breakFlag); + bool.TryParse(전고점Data["tempFirstFlag"].ToString(), out var tempFirstFlag); - if (현재봉4 < 낮은값_72_24) + if (전봉4 < 전봉12 && 전봉12 < 전봉24 && 전봉24 < 전봉72 && candleData.IchimokData.하한선 > 전봉4 && 전봉4 < 전전봉4) + if (tempFirstFlag) + 전고점Data["tempFirstFlag"] = false; + + + if (현재봉4 < 낮은값_72_24 && candleData.IchimokData.하한선 > candleData.Close) { if (firstFlag) 전고점Data["firstFlag"] = false; @@ -437,20 +507,110 @@ namespace BitgetAPI.IndicatorConditionSetup } } + //사는 시점 + if (!UpTempBuyList.ContainsKey(market + interval)) + { + if (!tempFirstFlag && 전봉4 > 전봉12 && 전봉12 > 전봉24 && 전봉24 > 전봉72 && candleData.IchimokData.상한선 < candleData.Close && 전봉4 > 전전봉4) + { + // 없으면 생성 + 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); + } + var buyDic = new Dictionary + { + { "MarketName", market }, + { "BuyDate", nowTime }, + { "Price", price }, + { "MCandleTimeType", (int)interval }, + { "Candle", candleData } + }; + + UpTempBuyList.Add(market + interval, buyDic); + } + } + //파는 시점 + else + { + var buyItem = UpTempBuyList[market + interval]; + + if (interval < MCandleTimeType.H1) + { + if (nowTime < ((DateTime)buyItem["BuyDate"]).AddMinutes((int)interval)) + { + continue; + } + } + //임시로 처리 + else + { + if (nowTime < ((DateTime)buyItem["BuyDate"]).AddHours(((int)interval) / 60)) + { + continue; + } + } + if (!(현재봉4 > 현재봉12 && 현재봉12 > 현재봉24 && 현재봉24 > 현재봉72 && 현재봉72 > 현재봉72)) + { + + double.TryParse(buyItem["Price"].ToString(), out var buyPrice); + var resultRate = ((price - buyPrice) / buyPrice) * 100; + + var result = new Dictionary() + { + { "MarketName", market }, + { "BuyDate", buyItem["BuyDate"]}, + { "BuyPrice", buyPrice }, + { "Type", "하향"}, + { "MCandleTimeType", (int)interval }, + { "BuyCandle", buyItem["Candle"] }, + { "SellDate", nowTime}, + { "SellPrice", price }, + { "SellCandle", candleData }, + { "Rate", resultRate } + }; + + // UpTempResultList.Add(result); + UpTempBuyList.Remove(market + interval); + } + } + + //사는 시점 if (!UpBuyList.ContainsKey(market + interval)) { if ( ( - 전전봉4 < 높은값_72_24_전전봉 && - 전봉4 > 높은값_72_24_전봉 && - 전봉12 > 전전봉12 && - ((전봉4 < candleData_전봉.IchimokData.하한선 && 높은값_72_24_전봉 < candleData_전봉.IchimokData.하한선) - || (전봉4 > candleData_전봉.IchimokData.상한선 && 높은값_72_24_전봉 > candleData_전봉.IchimokData.상한선)) && - 전봉4 - 전전봉4 > 전봉12 - 전전봉12 && - 전봉12 - 전전봉12 > 전봉24 - 전전봉24 + 전전봉4 < 높은값_72_24_전전봉 + && 전전봉4 > 낮은값_72_24_전전봉 + && 전봉4 > 높은값_72_24_전봉 + && 전봉12 < 높은값_72_24_전봉 + && 전봉24 > 전전봉24 + && 높은값_72_24_전봉 > candleData_전봉.IchimokData.하한선 + && candleData_전봉.Close > candleData_전봉.IchimokData.하한선 + && candleData_전봉.Open < candleData_전봉.Close ) - && flag && !firstFlag && buyFlag && candle240Flag + && flag && !firstFlag && buyFlag && candle15Flag// && candle1Flag + + //4 < 높은값_72_24_전전봉 && + //전봉4 > 높은값_72_24_전봉 && + //전봉12 > 전전봉12 && + //((전봉4 < candleData_전봉.IchimokData.하한선 && 높은값_72_24_전봉 < candleData_전봉.IchimokData.하한선) + //|| (전봉4 > candleData_전봉.IchimokData.하한선 && 높은값_72_24_전봉 > candleData_전봉.IchimokData.하한선)) && + //전봉4 - 전전봉4 > 전봉12 - 전전봉12 && + //전봉12 - 전전봉12 > 전봉24 - 전전봉24 + //) + //&& flag && !firstFlag && buyFlag && candle15Flag + ) { // 없으면 생성 @@ -495,7 +655,7 @@ namespace BitgetAPI.IndicatorConditionSetup } else { - if (현재봉240_12 > 전봉240_12) + if (현재봉15_12 > 전봉15_12) 최초조건Flag[market + interval] = true; } } @@ -525,7 +685,7 @@ namespace BitgetAPI.IndicatorConditionSetup if (!판매조건Flag[market + interval]) { - sellFlag = 현재봉4 < 높은값_48_24; + sellFlag = 현재봉4 < 높은값_72_24; } if (sellFlag) @@ -566,82 +726,86 @@ namespace BitgetAPI.IndicatorConditionSetup var indicatorPrice = candleData.Open; var indicatorRate = (candleData.Close / indicatorPrice) * 100 - 100; - var description = string.Format("{0} 48,24,4 하락", strInterval); + var description = string.Format("{0} 72,24,4 하락", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); try { - var candle240Flag = 현재봉240_4 < 높은값240_48_24 && - 현재봉240_4 < 전봉240_4 && - 현재봉240_12 < 전봉240_12 && - 전봉240Bol12 - 전봉240Bol24 > 현재봉240Bol12 - 현재봉240Bol24; + var candle15Flag = 현재봉15_4 < 높은값15_72_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; - #region 3분봉 처리 - /* - var candleDatas3 = findedMarket.candleDataList[MCandleTimeType.M3]; - var candleDatas3_정렬 = candleDatas3.OrderBy(i => i.Argument).ToList(); + #region 1분봉 처리 + + var candleDatas1 = findedMarket.candleDataList[MCandleTimeType.M1]; + var candleDatas1_정렬 = candleDatas1.ToList().OrderBy(i => i.Argument).ToList(); - var candleData3 = candleDatas3.Find(i => i.Argument == candleDatas3_정렬.Last().Argument); - if (candleData3 == null) continue; - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas3_정렬, candleData3); - ichimokuConditionSetup.calIchimokuData(candleDatas3_정렬, candleData3); + var candleData1 = candleDatas1.Find(i => i.Argument == candleDatas1_정렬.Last().Argument); + if (candleData1 == null) continue; + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas1_정렬, candleData1); + ichimokuConditionSetup.calIchimokuData(candleDatas1_정렬, candleData1); - 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_전봉); - 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_48_24 = Math.Min(candleData3.movingAverageDataList[48].Value, candleData3.movingAverageDataList[24].Value); - var 높은값3_48_24 = Math.Max(candleData3.movingAverageDataList[48].Value, candleData3.movingAverageDataList[24].Value); + var 높은값1_72_24 = Math.Max(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); + var 낮은값1_72_24 = Math.Min(candleData1.movingAverageDataList[72].Value, candleData1.movingAverageDataList[24].Value); - var 전봉낮은값3_48_24 = Math.Min(candleData3_전봉.movingAverageDataList[48].Value, candleData3_전봉.movingAverageDataList[24].Value); - var 전봉높은값3_48_24 = Math.Max(candleData3_전봉.movingAverageDataList[48].Value, candleData3_전봉.movingAverageDataList[24].Value); - var 전전봉낮은값3_48_24 = Math.Min(candleData3_전전봉.movingAverageDataList[48].Value, candleData3_전전봉.movingAverageDataList[24].Value); - var 전전봉높은값3_48_24 = Math.Max(candleData3_전전봉.movingAverageDataList[48].Value, candleData3_전전봉.movingAverageDataList[24].Value); + var 전봉낮은값1_72_24 = Math.Min(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); + var 전봉높은값1_72_24 = Math.Max(candleData1_전봉.movingAverageDataList[72].Value, candleData1_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값1_72_24 = Math.Min(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.movingAverageDataList[24].Value); + var 전전봉높은값1_72_24 = Math.Max(candleData1_전전봉.movingAverageDataList[72].Value, candleData1_전전봉.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_12 = candleData1.movingAverageDataList[12].Value; + var 전봉1_12 = candleData1_전봉.movingAverageDataList[12].Value; + var 전전봉1_12 = candleData1_전전봉.movingAverageDataList[12].Value; - var 현재봉3_4 = candleData3.movingAverageDataList[4].Value; - var 전봉3_4 = candleData3_전봉.movingAverageDataList[4].Value; - var 전전봉3_4 = candleData3_전전봉.movingAverageDataList[4].Value; + var 현재봉1_4 = candleData1.movingAverageDataList[4].Value; + var 전봉1_4 = candleData1_전봉.movingAverageDataList[4].Value; + var 전전봉1_4 = candleData1_전전봉.movingAverageDataList[4].Value; - var 전봉3Bol4 = candleData3_전봉.movingAverageDataList[4].BolangerValue; - var 전봉3Bol12 = candleData3_전봉.movingAverageDataList[12].BolangerValue; - var 전봉3Bol24 = candleData3_전봉.movingAverageDataList[24].BolangerValue; + var 전봉1Bol4 = candleData1_전봉.movingAverageDataList[4].BolangerValue; + var 전봉1Bol12 = candleData1_전봉.movingAverageDataList[12].BolangerValue; + var 전봉1Bol24 = candleData1_전봉.movingAverageDataList[24].BolangerValue; - 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 전전봉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_72_24 && 전봉1_4 > 현재봉1_4 && 전전봉1_4 > 전봉1_4 && + candleData1.Close < candleData1.Open && + candleData1.Close < candleData1.IchimokData.상한선 && + 현재봉1_4 < candleData1.IchimokData.상한선 && + 현재봉1_12 < 전봉1_12; - //var candle3Flag = 현재봉3_4 < 낮은값3_48_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 > 낮은값_48_24; - //var sellFlag = 현재봉4 > 낮은값_48_24 || 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24; - var sellFlag = 현재봉4 > 높은값_12_낮은값48_24;// 현재봉4 > 낮은값_48_24 || 전봉12 < 전봉4 || (전봉4 > 전전봉4 && 전봉12 > 전전봉12) || 현재봉60_4 > 전봉60_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 = 현재봉1_4 > 높은값1_72_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 > 낮은값_48_24; + //var sellFlag = 전전봉Bol12 - 전전봉Bol24 < 전봉Bol12 - 전봉Bol24 || 현재봉4 > 낮은값_72_24; var 전저점Data = 전저점[market + strInterval]; double.TryParse(전저점Data["val"].ToString(), out var val); @@ -649,8 +813,13 @@ namespace BitgetAPI.IndicatorConditionSetup bool.TryParse(전저점Data["firstFlag"].ToString(), out var firstFlag); bool.TryParse(전저점Data["clearFlag"].ToString(), out var clearFlag); bool.TryParse(전저점Data["breakFlag"].ToString(), out var breakFlag); + bool.TryParse(전저점Data["tempFirstFlag"].ToString(), out var tempFirstFlag); + + if(전봉4 > 전봉12 && 전봉12 > 전봉24 && 전봉24 > 전봉72 && candleData.IchimokData.상한선 < candleData.Close && 전봉4 > 전전봉4) + if (tempFirstFlag) + 전저점Data["tempFirstFlag"] = false; - if (현재봉4 > 높은값_48_24) + if (현재봉4 > 높은값_72_24 && candleData.IchimokData.상한선 < candleData.Close) { if (firstFlag) 전저점Data["firstFlag"] = false; @@ -693,20 +862,99 @@ namespace BitgetAPI.IndicatorConditionSetup } } + //사는 시점 + if (!DownTempBuyList.ContainsKey(market + interval)) + { + if (!tempFirstFlag && 전봉4 < 전봉12 && 전봉12 < 전봉24 && 전봉24 < 전봉72 && candleData.IchimokData.하한선 > 전봉4 && 전봉4 < 전전봉4) + { + // 없으면 생성 + 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); + } + var buyDic = new Dictionary + { + { "MarketName", market }, + { "BuyDate", nowTime }, + { "Price", price }, + { "MCandleTimeType", (int)interval }, + { "Candle", candleData } + }; + + DownTempBuyList.Add(market + interval, buyDic); + } + } + //파는 시점 + else + { + var buyItem = DownTempBuyList[market + interval]; + + if (interval < MCandleTimeType.H1) + { + if (nowTime < ((DateTime)buyItem["BuyDate"]).AddMinutes((int)interval)) + { + continue; + } + } + //임시로 처리 + else + { + if (nowTime < ((DateTime)buyItem["BuyDate"]).AddHours(((int)interval) / 60)) + { + continue; + } + } + + + if (!(현재봉4 < 현재봉12 && 현재봉12 < 현재봉24 && 현재봉24 < 현재봉72 && 현재봉72 < 전봉72)) + { + + double.TryParse(buyItem["Price"].ToString(), out var buyPrice); + var resultRate = ((price - buyPrice) / buyPrice) * 100; + + var result = new Dictionary() + { + { "MarketName", market }, + { "BuyDate", buyItem["BuyDate"]}, + { "BuyPrice", buyPrice }, + { "Type", "하향"}, + { "MCandleTimeType", (int)interval }, + { "BuyCandle", buyItem["Candle"] }, + { "SellDate", nowTime}, + { "SellPrice", price }, + { "SellCandle", candleData }, + { "Rate", resultRate } + }; + + //DownTempResultList.Add(result); + DownTempBuyList.Remove(market + interval); + } + } + //사는 시점 if (!DownBuyList.ContainsKey(market + interval)) { - if ( - ( - 전전봉4 > 낮은값_48_24_전전봉 && - 전봉4 < 낮은값_48_24_전봉 && - 전봉12 < 전전봉12 && - ((전봉4 > candleData_전봉.IchimokData.상한선 && 낮은값_48_24_전봉 > candleData_전봉.IchimokData.상한선) - ||(전봉4 < candleData_전봉.IchimokData.하한선 && 낮은값_48_24_전봉 < candleData_전봉.IchimokData.하한선)) && - 전봉4 - 전전봉4 < 전봉12 - 전전봉12 && - 전봉12 - 전전봉12 < 전봉24 - 전전봉24 + if (( + 전전봉4 > 낮은값_72_24_전전봉 + && 전전봉4 < 높은값_72_24_전전봉 + && 전봉4 < 낮은값_72_24_전봉 + && 전봉12 > 낮은값_72_24_전봉 + && 전봉24 < 전전봉24 + && 낮은값_72_24_전봉 < candleData_전봉.IchimokData.상한선 + && candleData_전봉.Close < candleData_전봉.IchimokData.상한선 + && candleData_전봉.Open > candleData_전봉.Close ) - && flag && !firstFlag && buyFlag && candle240Flag + && flag && !firstFlag && buyFlag && candle15Flag// && candle1Flag ) { // 없으면 생성 @@ -751,7 +999,7 @@ namespace BitgetAPI.IndicatorConditionSetup } else { - if (현재봉240_12 > 전봉240_12) + if (현재봉15_12 > 전봉15_12) 최초조건Flag[market + interval] = true; } } @@ -781,14 +1029,14 @@ namespace BitgetAPI.IndicatorConditionSetup if (!판매조건Flag[market + interval]) { - sellFlag = 현재봉4 > 낮은값_48_24; + sellFlag = 현재봉4 > 낮은값_72_24; } if (sellFlag) { double.TryParse(buyItem["Price"].ToString(), out var buyPrice); - var resultRate = ((price - buyPrice) / buyPrice) * 100 * -1; + var resultRate = ((price - buyPrice) / buyPrice) * 100; var result = new Dictionary() {