From 1f790aacef63aa976e51dab92873ceec0ff3a8c6 Mon Sep 17 00:00:00 2001 From: kyh <1329522@naver.com> Date: Mon, 30 Sep 2024 15:32:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndicatorProcess.cs | 633 ++++++++---------- 1 file changed, 269 insertions(+), 364 deletions(-) diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 00cad58..47cc0d6 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -1,7 +1,9 @@ using BitgetApi.Data; +using BitgetAPI.Data; using BitgetAPI.IndicatorConditionSetup; using DevExpress.Utils.IoC; using DevExpress.XtraPrinting.Native; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; @@ -53,20 +55,12 @@ namespace BitgetAPI.IndicatorConditionSetup //결과 리스트 public List> DownResultList = new List>(); + public Dictionary UpList = new Dictionary(); + public Dictionary UpBuyValue = new Dictionary(); - //구매 리스트 - public Dictionary> DownTempBuyList = new Dictionary>(); - //결과 리스트 - public List> DownTempResultList = new List>(); + public Dictionary DownList = new Dictionary(); + public Dictionary DownBuyValue = new Dictionary(); - //구매 리스트 - public Dictionary> UpTempBuyList = new Dictionary>(); - //결과 리스트 - public List> UpTempResultList = new List>(); - - - public Dictionary 판매조건Flag = new Dictionary(); - public Dictionary 최초조건Flag = new Dictionary(); // 전봉이 구름떼 돌파후 시가가 구름떼 위에서 시작하는 것 // 전봉이 구름떼 하락후 시가가 구름떼 밑에서 시작하는 것 @@ -164,7 +158,7 @@ namespace BitgetAPI.IndicatorConditionSetup dic.Add("clearFlag", true); dic.Add("firstFlag", true); dic.Add("flag", false); - dic.Add("tempFirstFlag", true); + dic.Add("tempBuyFlag", true); dic.Add("breakFlag", false); 전저점.Add(market + strInterval, dic); } @@ -174,7 +168,7 @@ namespace BitgetAPI.IndicatorConditionSetup dic.Add("val", 0); dic.Add("clearFlag", true); dic.Add("firstFlag", true); - dic.Add("tempFirstFlag", true); + dic.Add("tempBuyFlag", true); dic.Add("flag", false); dic.Add("breakFlag", false); 전고점.Add(market + strInterval, dic); @@ -270,21 +264,21 @@ namespace BitgetAPI.IndicatorConditionSetup movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_정렬, candleData_전전봉); // 24,72 높은값 - var 높은값_72_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); + var 높은값_48_24_전전봉 = Math.Max(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); // 24,72 낮은값 - var 낮은값_72_24_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); + var 낮은값_48_24_전전봉 = Math.Min(candleData_전전봉.movingAverageDataList[72].Value, candleData_전전봉.movingAverageDataList[24].Value); // 24,72 높은값 - var 높은값_72_24_전봉 = Math.Max(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); + var 높은값_48_24_전봉 = Math.Max(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); // 24,72 낮은값 - var 낮은값_72_24_전봉 = Math.Min(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); + var 낮은값_48_24_전봉 = Math.Min(candleData_전봉.movingAverageDataList[72].Value, candleData_전봉.movingAverageDataList[24].Value); // 24,72 높은값 - var 높은값_72_24 = Math.Max(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); + var 높은값_48_24 = Math.Max(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); // 24,72 낮은값 - var 낮은값_72_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); + var 낮은값_48_24 = Math.Min(candleData.movingAverageDataList[72].Value, candleData.movingAverageDataList[24].Value); - 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 높은값_12_낮은값72_24 = Math.Max(candleData.movingAverageDataList[12].Value, 낮은값_48_24); + var 낮은값_12_높은값72_24 = Math.Min(candleData.movingAverageDataList[12].Value, 높은값_48_24); var 전전봉4 = candleData_전전봉.movingAverageDataList[4].Value; var 전전봉12 = candleData_전전봉.movingAverageDataList[12].Value; @@ -312,7 +306,7 @@ namespace BitgetAPI.IndicatorConditionSetup var Bol4 = candleData.movingAverageDataList[4].BolangerValue; var Bol12 = candleData.movingAverageDataList[12].BolangerValue; var Bol24 = candleData.movingAverageDataList[24].BolangerValue; - + if ((int)interval != 5) { @@ -345,7 +339,7 @@ namespace BitgetAPI.IndicatorConditionSetup movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas15_정렬, candleData15_전전봉); ichimokuConditionSetup.calIchimokuData(candleDatas15_정렬, candleData15_전전봉); - + 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); @@ -374,10 +368,113 @@ namespace BitgetAPI.IndicatorConditionSetup var 현재봉15Bol24 = candleData15.movingAverageDataList[24].BolangerValue; #endregion + #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; + #endregion + + #region 60분봉 처리 + var candleDatas60 = findedMarket.candleDataList[MCandleTimeType.H1]; + var candleDatas60_정렬 = candleDatas60.ToList().OrderBy(i => i.Argument).ToList(); + + var candleData60 = candleDatas60.Find(i => i.Argument == candleDatas60_정렬.Last().Argument); + if (candleData60 == null) continue; + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas60_정렬, candleData60); + ichimokuConditionSetup.calIchimokuData(candleDatas60_정렬, candleData60); + + + candleDatas60_정렬.RemoveAt(candleDatas60_정렬.Count - 1); + var candleData60_전봉 = candleDatas60.Find(i => i.Argument == candleDatas60_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas60_정렬, candleData60_전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas60_정렬, candleData60_전봉); + + candleDatas60_정렬.RemoveAt(candleDatas60_정렬.Count - 1); + var candleData60_전전봉 = candleDatas60.Find(i => i.Argument == candleDatas60_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas60_정렬, candleData60_전전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas60_정렬, candleData60_전전봉); + + candleDatas60_정렬.RemoveAt(candleDatas60_정렬.Count - 1); + var candleData60_전전전봉 = candleDatas60.Find(i => i.Argument == candleDatas60_정렬.Last().Argument); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas60_정렬, candleData60_전전전봉); + ichimokuConditionSetup.calIchimokuData(candleDatas60_정렬, candleData60_전전전봉); + + + var 낮은값60_72_24 = Math.Min(candleData60.movingAverageDataList[72].Value, candleData60.movingAverageDataList[24].Value); + var 높은값60_72_24 = Math.Max(candleData60.movingAverageDataList[72].Value, candleData60.movingAverageDataList[24].Value); + + var 전봉낮은값60_72_24 = Math.Min(candleData60_전봉.movingAverageDataList[72].Value, candleData60_전봉.movingAverageDataList[24].Value); + var 전봉높은값60_72_24 = Math.Max(candleData60_전봉.movingAverageDataList[72].Value, candleData60_전봉.movingAverageDataList[24].Value); + var 전전봉낮은값60_72_24 = Math.Min(candleData60_전봉.movingAverageDataList[72].Value, candleData60_전봉.movingAverageDataList[24].Value); + var 전전봉높은값60_72_24 = Math.Max(candleData60_전봉.movingAverageDataList[72].Value, candleData60_전봉.movingAverageDataList[24].Value); + + var 현재봉60_12 = candleData60.movingAverageDataList[12].Value; + var 전봉60_12 = candleData60_전봉.movingAverageDataList[12].Value; + var 전전봉60_12 = candleData60_전전봉.movingAverageDataList[12].Value; + + var 현재봉60_4 = candleData60.movingAverageDataList[4].Value; + var 전봉60_4 = candleData60_전봉.movingAverageDataList[4].Value; + var 전전봉60_4 = candleData60_전전봉.movingAverageDataList[4].Value; + + var 전봉60Bol4 = candleData60_전봉.movingAverageDataList[4].BolangerValue; + var 전봉60Bol12 = candleData60_전봉.movingAverageDataList[12].BolangerValue; + var 전봉60Bol24 = candleData60_전봉.movingAverageDataList[24].BolangerValue; + + var 전전봉60Bol4 = candleData60_전전봉.movingAverageDataList[4].BolangerValue; + var 전전봉60Bol12 = candleData60_전전봉.movingAverageDataList[12].BolangerValue; + var 전전봉60Bol24 = candleData60_전전봉.movingAverageDataList[24].BolangerValue; + var 현재봉60Bol4 = candleData60.movingAverageDataList[4].BolangerValue; + var 현재봉60Bol12 = candleData60.movingAverageDataList[12].BolangerValue; + var 현재봉60Bol24 = candleData60.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; @@ -386,67 +483,22 @@ namespace BitgetAPI.IndicatorConditionSetup try { - 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; + var candle15Flag = 현재봉15_4 > 현재봉15_12 + && 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 candle60Flag = 현재봉60_4 > 현재봉60_12 + // && candleData60.Open < candleData60.Close + && 현재봉60_4 > 전봉60_4 + // && 전봉60_4 > 전전봉60_4 + && 현재봉60_12 > 전봉60_12 + // && 전봉60_12 > 전전봉60_12 + && 전봉60Bol12 - 전봉60Bol24 > 현재봉60Bol12 - 현재봉60Bol24; - 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 = 현재봉1_4 < 높은값1_72_24; @@ -457,14 +509,9 @@ 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); + bool.TryParse(전고점Data["tempBuyFlag"].ToString(), out var tempBuyFlag); - 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 (현재봉4 < 낮은값_48_24 && candleData.IchimokData.하한선 > candleData.Close) { if (firstFlag) 전고점Data["firstFlag"] = false; @@ -473,6 +520,7 @@ namespace BitgetAPI.IndicatorConditionSetup 전고점Data["clearFlag"] = true; 전고점Data["val"] = 0; 전고점Data["breakFlag"] = false; + 전고점Data["tempBuyFlag"] = true; } if (!flag || !breakFlag) @@ -507,81 +555,54 @@ namespace BitgetAPI.IndicatorConditionSetup } } - //사는 시점 - if (!UpTempBuyList.ContainsKey(market + interval)) + if (( + 전전봉4 > 낮은값_48_24_전전봉 + && 전전봉4 < 높은값_48_24_전전봉 + && 전봉4 < 낮은값_48_24_전봉 + && 전봉12 > 낮은값_48_24_전봉 + && 전봉24 < 전전봉24 + && 전봉12 < 전전봉12 + && 전봉4 < 전전봉4 + && (!UpBuyValue.ContainsKey(market + strInterval) || (UpBuyValue.ContainsKey(market + strInterval) && UpBuyValue[market + strInterval] == 0)) + //&& 낮은값_48_24_전봉 < candleData_전봉.IchimokData.상한선 + //&& candleData_전봉.Close < candleData_전봉.IchimokData.상한선 + //&& candleData_전봉.Open > candleData_전봉.Close + )) { - if (!tempFirstFlag && 전봉4 > 전봉12 && 전봉12 > 전봉24 && 전봉24 > 전봉72 && candleData.IchimokData.상한선 < candleData.Close && 전봉4 > 전전봉4) + if (UpList.ContainsKey(market + strInterval)) { - // 없으면 생성 - 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); + UpList[market + strInterval] = false; } - } - //파는 시점 - 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; - } + UpList.Add(market + strInterval, false); } - if (!(현재봉4 > 현재봉12 && 현재봉12 > 현재봉24 && 현재봉24 > 현재봉72 && 현재봉72 > 현재봉72)) + + if (UpBuyValue.ContainsKey(market + strInterval) && UpBuyValue[market + strInterval] == 0) { - - 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); + UpBuyValue[market + strInterval] = candleData.Open; } + else + { + UpBuyValue.Add(market + strInterval, candleData.Open); + } + } + else if (UpBuyValue.ContainsKey(market + strInterval) && UpBuyValue[market + strInterval] != 0 && 현재봉1_4 > 높은값1_72_24 && UpList.ContainsKey(market + strInterval) && !UpList[market + strInterval]) + { + if (UpBuyValue[market + strInterval] < candleData.Close) + { + if (UpList.ContainsKey(market + strInterval)) + { + UpList[market + strInterval] = true; + } + else + { + UpList.Add(market + strInterval, true); + } + + } + + UpBuyValue[market + strInterval] = 0; } @@ -590,16 +611,19 @@ namespace BitgetAPI.IndicatorConditionSetup { if ( ( - 전전봉4 < 높은값_72_24_전전봉 - && 전전봉4 > 낮은값_72_24_전전봉 - && 전봉4 > 높은값_72_24_전봉 - && 전봉12 < 높은값_72_24_전봉 + 전전봉4 < 높은값_48_24_전전봉 + && 전전봉4 > 낮은값_48_24_전전봉 + && 전봉4 > 높은값_48_24_전봉 + && 전봉12 < 높은값_48_24_전봉 && 전봉24 > 전전봉24 - && 높은값_72_24_전봉 > candleData_전봉.IchimokData.하한선 + && 전봉12 > 전전봉12 + && 전봉4 > 전전봉4 + && 높은값_48_24_전봉 > candleData_전봉.IchimokData.하한선 && candleData_전봉.Close > candleData_전봉.IchimokData.하한선 && candleData_전봉.Open < candleData_전봉.Close ) - && flag && !firstFlag && buyFlag && candle15Flag// && candle1Flag + && flag && !firstFlag && buyFlag && tempBuyFlag + && UpList.ContainsKey(market + strInterval) && UpList[market + strInterval] //4 < 높은값_72_24_전전봉 && //전봉4 > 높은값_72_24_전봉 && @@ -613,6 +637,11 @@ namespace BitgetAPI.IndicatorConditionSetup ) { + 전고점Data["tempBuyFlag"] = false; + + if (!(candle15Flag && candle60Flag)) + continue; + // 없으면 생성 if (signalData == null) { @@ -638,26 +667,13 @@ namespace BitgetAPI.IndicatorConditionSetup }; UpBuyList.Add(market + interval, buyDic); - 최초조건Flag[market + interval] = false; - if (현재봉4 > 현재봉12) - { - 판매조건Flag[market + interval] = false; - } - else - { - 판매조건Flag[market + interval] = true; - } + if (val == 0) 전고점Data["val"] = 전봉4; 전고점Data["flag"] = false; 전고점Data["clearFlag"] = false; } - else - { - if (현재봉15_12 > 전봉15_12) - 최초조건Flag[market + interval] = true; - } } //파는 시점 else @@ -678,15 +694,6 @@ namespace BitgetAPI.IndicatorConditionSetup continue; } } - if (현재봉4 > 현재봉12 && !판매조건Flag[market + interval]) - { - 판매조건Flag[market + interval] = true; - } - - if (!판매조건Flag[market + interval]) - { - sellFlag = 현재봉4 < 높은값_72_24; - } if (sellFlag) { @@ -694,7 +701,7 @@ namespace BitgetAPI.IndicatorConditionSetup double.TryParse(buyItem["Price"].ToString(), out var buyPrice); var resultRate = ((price - buyPrice) / buyPrice) * 100; - var result = new Dictionary() + var result = new Dictionary() { { "MarketName", market }, { "BuyDate", buyItem["BuyDate"]}, @@ -731,81 +738,26 @@ namespace BitgetAPI.IndicatorConditionSetup try { - 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; + var candle15Flag = 현재봉15_4 < 현재봉15_12 + && 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 candle60Flag = 현재봉60_4 < 현재봉12 + // && candleData60.Open > candleData60.Close + && 현재봉60_4 < 전봉60_4 + //&& 전봉60_4 < 전전봉60_4 + && 현재봉60_12 < 전봉60_12 + //&& 전봉60_12 < 전전봉60_12 + && 전봉60Bol12 - 전봉60Bol24 > 현재봉60Bol12 - 현재봉60Bol24; var buyFlag = 전전봉Bol12 - 전전봉Bol24 > 전봉Bol12 - 전봉Bol24 && 전전봉Bol4 > 전봉Bol4; - //파는 시점 볼랜저 전전봉 12 - 24 값이 전봉 12 - 24보다 클경우 팜 - //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 > 낮은값_72_24; + var sellFlag = 현재봉1_4 > 높은값1_72_24; var 전저점Data = 전저점[market + strInterval]; double.TryParse(전저점Data["val"].ToString(), out var val); @@ -813,13 +765,9 @@ 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; + bool.TryParse(전저점Data["tempBuyFlag"].ToString(), out var tempBuyFlag); - if (현재봉4 > 높은값_72_24 && candleData.IchimokData.상한선 < candleData.Close) + if (현재봉4 > 높은값_48_24 && candleData.IchimokData.상한선 < candleData.Close) { if (firstFlag) 전저점Data["firstFlag"] = false; @@ -828,6 +776,7 @@ namespace BitgetAPI.IndicatorConditionSetup 전저점Data["clearFlag"] = true; 전저점Data["val"] = 0; 전저점Data["breakFlag"] = false; + 전저점Data["tempBuyFlag"] = true; } if (!flag || !breakFlag) @@ -862,101 +811,77 @@ namespace BitgetAPI.IndicatorConditionSetup } } - //사는 시점 - if (!DownTempBuyList.ContainsKey(market + interval)) + if (( + 전전봉4 < 높은값_48_24_전전봉 + && 전전봉4 > 낮은값_48_24_전전봉 + && 전봉4 > 높은값_48_24_전봉 + && 전봉12 < 높은값_48_24_전봉 + && 전봉24 > 전전봉24 && 전봉12 > 전전봉12 + && 전봉4 > 전전봉4 + && (!DownBuyValue.ContainsKey(market + strInterval) || (DownBuyValue.ContainsKey(market + strInterval) && DownBuyValue[market + strInterval] == 0)) + //&& 높은값_48_24_전봉 > candleData_전봉.IchimokData.하한선 + //&& candleData_전봉.Close > candleData_전봉.IchimokData.하한선 + //&& candleData_전봉.Open < candleData_전봉.Close + )) { - if (!tempFirstFlag && 전봉4 < 전봉12 && 전봉12 < 전봉24 && 전봉24 < 전봉72 && candleData.IchimokData.하한선 > 전봉4 && 전봉4 < 전전봉4) + if (DownList.ContainsKey(market + strInterval)) { - // 없으면 생성 - 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); + DownList[market + strInterval] = false; } - } - //파는 시점 - 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; - } + DownList.Add(market + strInterval, false); } - - if (!(현재봉4 < 현재봉12 && 현재봉12 < 현재봉24 && 현재봉24 < 현재봉72 && 현재봉72 < 전봉72)) + if (DownBuyValue.ContainsKey(market + strInterval) && DownBuyValue[market + strInterval] == 0) { - - 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); + DownBuyValue[market + strInterval] = candleData.Open; + } + else + { + DownBuyValue.Add(market + strInterval, candleData.Open); } } + else if (DownBuyValue.ContainsKey(market + strInterval) && DownBuyValue[market + strInterval] != 0 && 현재봉1_4 < 낮은값1_72_24 && DownList.ContainsKey(market + strInterval) && !DownList[market + strInterval]) + { + if (DownBuyValue[market + strInterval] > candleData.Close) + { + if (DownList.ContainsKey(market + strInterval)) + { + DownList[market + strInterval] = true; + } + else + { + DownList.Add(market + strInterval, true); + } + + } + + DownBuyValue[market + strInterval] = 0; + } + //사는 시점 if (!DownBuyList.ContainsKey(market + interval)) { - if (( - 전전봉4 > 낮은값_72_24_전전봉 - && 전전봉4 < 높은값_72_24_전전봉 - && 전봉4 < 낮은값_72_24_전봉 - && 전봉12 > 낮은값_72_24_전봉 - && 전봉24 < 전전봉24 - && 낮은값_72_24_전봉 < candleData_전봉.IchimokData.상한선 - && candleData_전봉.Close < candleData_전봉.IchimokData.상한선 + if (( + 전전봉4 > 낮은값_48_24_전전봉 + && 전전봉4 < 높은값_48_24_전전봉 + && 전봉4 < 낮은값_48_24_전봉 + && 전봉12 > 낮은값_48_24_전봉 + && 전봉24 < 전전봉24 && 전봉12 < 전전봉12 && 전봉4 < 전전봉4 + && 낮은값_48_24_전봉 < candleData_전봉.IchimokData.상한선 + && candleData_전봉.Close < candleData_전봉.IchimokData.상한선 && candleData_전봉.Open > candleData_전봉.Close - ) - && flag && !firstFlag && buyFlag && candle15Flag// && candle1Flag + ) + && flag && !firstFlag && buyFlag && tempBuyFlag + && DownList.ContainsKey(market + strInterval) && DownList[market + strInterval] ) { + 전저점Data["tempBuyFlag"] = false; + if (!(candle15Flag && candle60Flag)) + continue; + // 없으면 생성 if (signalData == null) { @@ -982,26 +907,14 @@ namespace BitgetAPI.IndicatorConditionSetup }; DownBuyList.Add(market + interval, buyDic); - 최초조건Flag[market + interval] = false; - if (현재봉4 > 현재봉12) - { - 판매조건Flag[market + interval] = false; - } - else - { - 판매조건Flag[market + interval] = true; - } + if (val == 0) 전저점Data["val"] = 전봉4; 전저점Data["flag"] = false; 전저점Data["clearFlag"] = false; } - else - { - if (현재봉15_12 > 전봉15_12) - 최초조건Flag[market + interval] = true; - } + } //파는 시점 else @@ -1022,15 +935,7 @@ namespace BitgetAPI.IndicatorConditionSetup continue; } } - if (현재봉4 < 현재봉12 && !판매조건Flag[market + interval]) - { - 판매조건Flag[market + interval] = true; - } - if (!판매조건Flag[market + interval]) - { - sellFlag = 현재봉4 > 낮은값_72_24; - } if (sellFlag) {