diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index f8d1ae9..8fbe616 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -306,59 +306,59 @@ namespace BitgetAPI.IndicatorConditionSetup BuyShortStep[market] = 0; BuyLongStep[market] = 0; } - if (!(전저고점.ContainsKey(market + "5m"))) + if (!(전저고점.ContainsKey(market + "30m"))) continue; #region 5분봉 처리 - var candleDatas_5 = findedMarket.candleDataList[MCandleTimeType.M5]; - var candleDatas_5_정렬 = candleDatas_5.OrderBy(i => i.Argument).ToList(); - var candleDatas_5_TempList = candleDatas_5.OrderBy(i => i.Argument).ToList(); - var candleData_5 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument); + var candleDatas_30 = findedMarket.candleDataList[MCandleTimeType.M30]; + var candleDatas_30_정렬 = candleDatas_30.OrderBy(i => i.Argument).ToList(); + var candleDatas_30_TempList = candleDatas_30.OrderBy(i => i.Argument).ToList(); + var candleData_30 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); - if (candleData_5 == null) continue; + if (candleData_30 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5); + ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30); - candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1); - var candleData_5_전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument); + candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); + var candleData_30_전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); - if (candleData_5_전봉 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전봉); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전봉); + if (candleData_30_전봉 == null) continue; + ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전봉); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전봉); - candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1); - var candleData_5_전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument); + candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); + var candleData_30_전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); - if (candleData_5_전전봉 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전봉); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전봉); + if (candleData_30_전전봉 == null) continue; + ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전봉); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전봉); - candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1); - var candleData_5_전전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument); + candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); + var candleData_30_전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); - if (candleData_5_전전전봉 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전봉); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전봉); + if (candleData_30_전전전봉 == null) continue; + ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전전봉); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전봉); - candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1); - var candleData_5_전전전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument); + candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); + var candleData_30_전전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); - if (candleData_5_전전전전봉 == null) continue; - ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전전봉); - movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전전봉); + if (candleData_30_전전전전봉 == null) continue; + ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전전전봉); + movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전전봉); #endregion if (영호조건식_상향돌파 || 영호조건식_하향돌파) { if (영호조건식_상향돌파) { - var price = candleData_5.Close; - var rate = (candleData_5.Close / candleData_5.Open) * 100 - 100; - var indicatorPrice = candleData_5.Open; - var indicatorRate = (candleData_5.Close / indicatorPrice) * 100 - 100; + var price = candleData_30.Close; + var rate = (candleData_30.Close / candleData_30.Open) * 100 - 100; + var indicatorPrice = candleData_30.Open; + var indicatorRate = (candleData_30.Close / indicatorPrice) * 100 - 100; var description = string.Format("{0} 72,24,4 상승", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); @@ -370,8 +370,8 @@ namespace BitgetAPI.IndicatorConditionSetup //사는 시점 if (!UpBuyList.ContainsKey(market)) { - if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongBuy) && - !sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell)) + if (sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.LongBuy) && + !sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.LongSell)) { BuyLongStep[market] = 0; // 없으면 생성 @@ -396,8 +396,8 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyDate", nowTime }, { "Price", price }, { "MCandleTimeType", (int)interval }, - { "CandleTime", candleData_5.Argument }, - { "Candle", candleData_5 } + { "CandleTime", candleData_30.Argument }, + { "Candle", candleData_30 } }; UpBuyList.Add(market, buyDic); @@ -425,7 +425,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyDate", nowTime }, { "Price", price }, { "MCandleTimeType", (int)interval }, - { "Candle", candleData_5 }, + { "Candle", candleData_30 }, { "Size", size }, { "orderId", orderDic["orderId"] } }; @@ -456,7 +456,7 @@ namespace BitgetAPI.IndicatorConditionSetup continue; } - if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell)) + if (sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.LongSell)) { double.TryParse(buyItem["Price"].ToString(), out var buyPrice); var resultRate = ((price - buyPrice) / buyPrice) * 100; @@ -471,7 +471,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyCandle", buyItem["Candle"] }, { "SellDate", nowTime}, { "SellPrice", price }, - { "SellCandle", candleData_5 }, + { "SellCandle", candleData_30 }, { "Rate", resultRate } }; @@ -512,7 +512,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyCandle", buyItem["Candle"] }, { "SellDate", nowTime}, { "SellPrice", price}, - { "SellCandle", candleData_5 }, + { "SellCandle", candleData_30 }, { "Rate", resultRateData } }; ResultList.Add(orderResult); @@ -532,10 +532,10 @@ namespace BitgetAPI.IndicatorConditionSetup } if (영호조건식_하향돌파) { - var price = candleData_5.Close; - var rate = (candleData_5.Close / candleData_5.Open) * 100 - 100; - var indicatorPrice = candleData_5.Open; - var indicatorRate = (candleData_5.Close / indicatorPrice) * 100 - 100; + var price = candleData_30.Close; + var rate = (candleData_30.Close / candleData_30.Open) * 100 - 100; + var indicatorPrice = candleData_30.Open; + var indicatorRate = (candleData_30.Close / indicatorPrice) * 100 - 100; var description = string.Format("{0} 72,24,4 하락", strInterval); var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description)); @@ -545,8 +545,8 @@ namespace BitgetAPI.IndicatorConditionSetup //사는 시점 if (!DownBuyList.ContainsKey(market)) { - if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortBuy) && - !sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortSell)) + if (sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.ShortBuy) && + !sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.ShortSell)) { BuyShortStep[market] = 0; // 없으면 생성 @@ -570,8 +570,8 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyDate", nowTime }, { "Price", price }, { "MCandleTimeType", (int)interval }, - { "CandleTime", candleData_5.Argument }, - { "Candle", candleData_5 } + { "CandleTime", candleData_30.Argument }, + { "Candle", candleData_30 } }; DownBuyList.Add(market, buyDic); @@ -599,7 +599,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyDate", nowTime }, { "Price", price }, { "MCandleTimeType", (int)interval }, - { "Candle", candleData_5 }, + { "Candle", candleData_30 }, { "Size", size }, { "orderId", orderDic["orderId"] } }; @@ -630,7 +630,7 @@ namespace BitgetAPI.IndicatorConditionSetup continue; } - if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortSell)) + if (sMABandConditionSetup.Calculate(candleDatas_30_TempList, SMABandType.ShortSell)) { BuyShortStep[market] = 0; double.TryParse(buyItem["Price"].ToString(), out var buyPrice); @@ -646,7 +646,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyCandle", buyItem["Candle"] }, { "SellDate", nowTime}, { "SellPrice", price }, - { "SellCandle", candleData_5 }, + { "SellCandle", candleData_30 }, { "Rate", resultRate } }; @@ -688,7 +688,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "BuyCandle", buyItem["Candle"] }, { "SellDate", nowTime}, { "SellPrice", price }, - { "SellCandle", candleData_5 }, + { "SellCandle", candleData_30 }, { "Rate", resultRateData } }; ResultList.Add(orderResult); diff --git a/BitgetApi/IndicatorConditionSetup/SMABandConditionSetup.cs b/BitgetApi/IndicatorConditionSetup/SMABandConditionSetup.cs index 7c84a28..9831f08 100644 --- a/BitgetApi/IndicatorConditionSetup/SMABandConditionSetup.cs +++ b/BitgetApi/IndicatorConditionSetup/SMABandConditionSetup.cs @@ -27,7 +27,7 @@ namespace BitgetApi.IndicatorConditionSetup public class SMABandConditionSetup { private readonly int rangeLookback = 12; - private readonly double rangeThresholdPercent = 0.7; + private readonly double rangeThresholdPercent = 2; /// /// false 는 구매 전, true는 판매 후 /// @@ -77,8 +77,8 @@ namespace BitgetApi.IndicatorConditionSetup var cloudTopNow = Math.Max(ichmok.SenkouSpanA, ichmok.SenkouSpanB); var cloudBottomNow = Math.Min(ichmok.SenkouSpanA, ichmok.SenkouSpanB); - bool isSma4BelowCloud = sma4 < cloudBottomNow; - bool isSma4AboveCloud = sma4 > cloudTopNow; + bool isSma4BelowCloud = low[i] < cloudBottomNow; + bool isSma4AboveCloud = high[i] > cloudTopNow; bool cloudFlag = false; if (!firstCloudFlag) diff --git a/BitgetApi/WebService/WebConnection.cs b/BitgetApi/WebService/WebConnection.cs index b374dcc..8f6f569 100644 --- a/BitgetApi/WebService/WebConnection.cs +++ b/BitgetApi/WebService/WebConnection.cs @@ -1107,6 +1107,7 @@ namespace BitgetAPI.WebService foreach (var min in timeList) { var minDataList = temp.Where(t => t.reciveTime.Minute == min).OrderBy(t => t.reciveTime).ToList(); + var lastData = minDataList[minDataList.Count - 1]; var candleData = new CandleData(); @@ -1150,7 +1151,7 @@ namespace BitgetAPI.WebService { var max = candleDataList.Max(t => t.Argument); lastCandleData = candleDataList.Find(t => t.Argument == max); - + lastCandleData.Open = 0; var flag = false; if (((int)mCandleTimeType) < 60) {