diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs index 47cc0d6..2b1e09d 100644 --- a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs +++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs @@ -554,6 +554,21 @@ namespace BitgetAPI.IndicatorConditionSetup } } } + if (전전봉4 > 낮은값_48_24_전전봉 + && 전전봉4 < 높은값_48_24_전전봉 + && 전봉4 < 낮은값_48_24_전봉 + && 전봉12 > 낮은값_48_24_전봉) + { + if (UpList.ContainsKey(market + strInterval)) + { + if(UpList[market + strInterval]) + UpList[market + strInterval] = false; + } + else + { + UpList.Add(market + strInterval, false); + } + } if (( 전전봉4 > 낮은값_48_24_전전봉 @@ -562,22 +577,13 @@ namespace BitgetAPI.IndicatorConditionSetup && 전봉12 > 낮은값_48_24_전봉 && 전봉24 < 전전봉24 && 전봉12 < 전전봉12 - && 전봉4 < 전전봉4 + && 전봉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 (UpList.ContainsKey(market + strInterval)) - { - UpList[market + strInterval] = false; - } - else - { - UpList.Add(market + strInterval, false); - } - if (UpBuyValue.ContainsKey(market + strInterval) && UpBuyValue[market + strInterval] == 0) { UpBuyValue[market + strInterval] = candleData.Open; @@ -605,7 +611,6 @@ namespace BitgetAPI.IndicatorConditionSetup UpBuyValue[market + strInterval] = 0; } - //사는 시점 if (!UpBuyList.ContainsKey(market + interval)) { @@ -716,7 +721,7 @@ namespace BitgetAPI.IndicatorConditionSetup }; UpResultList.Add(result); - UpBuyList.Remove(market + interval); + UpBuyList.Remove(market + interval); } } @@ -810,6 +815,22 @@ namespace BitgetAPI.IndicatorConditionSetup } } } + if (전전봉4 < 높은값_48_24_전전봉 + && 전전봉4 > 낮은값_48_24_전전봉 + && 전봉4 > 높은값_48_24_전봉 + && 전봉12 < 높은값_48_24_전봉) + { + + if (DownList.ContainsKey(market + strInterval)) + { + if(DownList[market + strInterval]) + DownList[market + strInterval] = false; + } + else + { + DownList.Add(market + strInterval, false); + } + } if (( 전전봉4 < 높은값_48_24_전전봉 @@ -817,22 +838,13 @@ namespace BitgetAPI.IndicatorConditionSetup && 전봉4 > 높은값_48_24_전봉 && 전봉12 < 높은값_48_24_전봉 && 전봉24 > 전전봉24 && 전봉12 > 전전봉12 - && 전봉4 > 전전봉4 + && 전봉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 (DownList.ContainsKey(market + strInterval)) - { - DownList[market + strInterval] = false; - } - else - { - DownList.Add(market + strInterval, false); - } - if (DownBuyValue.ContainsKey(market + strInterval) && DownBuyValue[market + strInterval] == 0) { DownBuyValue[market + strInterval] = candleData.Open; @@ -860,7 +872,6 @@ namespace BitgetAPI.IndicatorConditionSetup DownBuyValue[market + strInterval] = 0; } - //사는 시점 if (!DownBuyList.ContainsKey(market + interval)) { @@ -869,7 +880,9 @@ namespace BitgetAPI.IndicatorConditionSetup && 전전봉4 < 높은값_48_24_전전봉 && 전봉4 < 낮은값_48_24_전봉 && 전봉12 > 낮은값_48_24_전봉 - && 전봉24 < 전전봉24 && 전봉12 < 전전봉12 && 전봉4 < 전전봉4 + && 전봉24 < 전전봉24 + && 전봉12 < 전전봉12 + && 전봉4 < 전전봉4 && 낮은값_48_24_전봉 < candleData_전봉.IchimokData.상한선 && candleData_전봉.Close < candleData_전봉.IchimokData.상한선 && candleData_전봉.Open > candleData_전봉.Close @@ -955,7 +968,7 @@ namespace BitgetAPI.IndicatorConditionSetup { "SellPrice", price }, { "SellCandle", candleData }, { "Rate", resultRate } - }; + }; DownResultList.Add(result); DownBuyList.Remove(market + interval);