데이터 수정
This commit is contained in:
kyh
@@ -30,7 +30,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
return options.SelectAPI.AccessKey;
|
||||
}
|
||||
}
|
||||
// = "bg_f93aa530288b6ec9d62095994c51972a";
|
||||
// = "bg_f93aa55288b6ec9d62095994c51972a";
|
||||
private string YHKIM_SecreteKey
|
||||
{
|
||||
get
|
||||
@@ -133,6 +133,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
IchimokuConditionSetup ichimokuConditionSetup = new IchimokuConditionSetup();
|
||||
MovingAverageConditionSetup movingAverageConditionSetup = new MovingAverageConditionSetup();
|
||||
TradingViewConditionSetup tradingViewConditionSetup = new TradingViewConditionSetup();
|
||||
SMABandConditionSetup sMABandConditionSetup = new SMABandConditionSetup();
|
||||
signals_LU.Clear();
|
||||
signals_SD.Clear();
|
||||
signals_LD.Clear();
|
||||
@@ -305,59 +306,59 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
BuyShortStep[market] = 0;
|
||||
BuyLongStep[market] = 0;
|
||||
}
|
||||
if (!(전저고점.ContainsKey(market + "30m")))
|
||||
if (!(전저고점.ContainsKey(market + "5m")))
|
||||
continue;
|
||||
|
||||
#region 30분봉 처리
|
||||
#region 5분봉 처리
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
if (candleData_30 == null) continue;
|
||||
if (candleData_5 == null) continue;
|
||||
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30);
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5);
|
||||
|
||||
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1);
|
||||
var candleData_30_전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument);
|
||||
candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
|
||||
var candleData_5_전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument);
|
||||
|
||||
if (candleData_30_전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전봉);
|
||||
if (candleData_5_전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전봉);
|
||||
|
||||
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1);
|
||||
var candleData_30_전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument);
|
||||
candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
|
||||
var candleData_5_전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument);
|
||||
|
||||
if (candleData_30_전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전봉);
|
||||
if (candleData_5_전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전봉);
|
||||
|
||||
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1);
|
||||
var candleData_30_전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument);
|
||||
candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
|
||||
var candleData_5_전전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument);
|
||||
|
||||
if (candleData_30_전전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전봉);
|
||||
if (candleData_5_전전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전봉);
|
||||
|
||||
|
||||
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1);
|
||||
var candleData_30_전전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument);
|
||||
candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
|
||||
var candleData_5_전전전전봉 = candleDatas_5.Find(i => i.Argument == candleDatas_5_정렬.Last().Argument);
|
||||
|
||||
if (candleData_30_전전전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_30_정렬, candleData_30_전전전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전전봉);
|
||||
if (candleData_5_전전전전봉 == null) continue;
|
||||
ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전전봉);
|
||||
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전전봉);
|
||||
#endregion
|
||||
|
||||
if (영호조건식_상향돌파 || 영호조건식_하향돌파)
|
||||
{
|
||||
if (영호조건식_상향돌파)
|
||||
{
|
||||
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 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 description = string.Format("{0} 72,24,4 상승", strInterval);
|
||||
var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
@@ -369,12 +370,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
//사는 시점
|
||||
if (!UpBuyList.ContainsKey(market))
|
||||
{
|
||||
|
||||
var buyFlag = false;
|
||||
|
||||
|
||||
|
||||
if (buyFlag)
|
||||
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongBuy))
|
||||
{
|
||||
BuyLongStep[market] = 0;
|
||||
// 없으면 생성
|
||||
@@ -399,8 +395,8 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "CandleTime", candleData_30.Argument },
|
||||
{ "Candle", candleData_30 }
|
||||
{ "CandleTime", candleData_5.Argument },
|
||||
{ "Candle", candleData_5 }
|
||||
};
|
||||
|
||||
UpBuyList.Add(market, buyDic);
|
||||
@@ -428,7 +424,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "Candle", candleData_30 },
|
||||
{ "Candle", candleData_5 },
|
||||
{ "Size", size },
|
||||
{ "orderId", orderDic["orderId"] }
|
||||
};
|
||||
@@ -447,7 +443,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var flag = (bool)buyItem["Flag"];
|
||||
if (interval < MCandleTimeType.H1)
|
||||
{
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30);
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
|
||||
if (nowTime < buyTime)
|
||||
continue;
|
||||
}
|
||||
@@ -459,10 +455,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
continue;
|
||||
}
|
||||
|
||||
var sellFlag = false;
|
||||
|
||||
|
||||
if (sellFlag)
|
||||
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell))
|
||||
{
|
||||
double.TryParse(buyItem["Price"].ToString(), out var buyPrice);
|
||||
var resultRate = ((price - buyPrice) / buyPrice) * 100;
|
||||
@@ -477,7 +470,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyCandle", buyItem["Candle"] },
|
||||
{ "SellDate", nowTime},
|
||||
{ "SellPrice", price },
|
||||
{ "SellCandle", candleData_30 },
|
||||
{ "SellCandle", candleData_5 },
|
||||
{ "Rate", resultRate }
|
||||
};
|
||||
|
||||
@@ -518,7 +511,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyCandle", buyItem["Candle"] },
|
||||
{ "SellDate", nowTime},
|
||||
{ "SellPrice", price},
|
||||
{ "SellCandle", candleData_30 },
|
||||
{ "SellCandle", candleData_5 },
|
||||
{ "Rate", resultRateData }
|
||||
};
|
||||
ResultList.Add(orderResult);
|
||||
@@ -538,10 +531,10 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
}
|
||||
if (영호조건식_하향돌파)
|
||||
{
|
||||
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 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 description = string.Format("{0} 72,24,4 하락", strInterval);
|
||||
var signalData = signals_SD.Find(i => i.MarketName.Equals(market) && i.Description.Equals(description));
|
||||
@@ -551,11 +544,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
//사는 시점
|
||||
if (!DownBuyList.ContainsKey(market))
|
||||
{
|
||||
|
||||
var buyFlag = false;
|
||||
|
||||
|
||||
if (buyFlag)
|
||||
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortBuy))
|
||||
{
|
||||
BuyShortStep[market] = 0;
|
||||
// 없으면 생성
|
||||
@@ -579,8 +568,8 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "CandleTime", candleData_30.Argument },
|
||||
{ "Candle", candleData_30 }
|
||||
{ "CandleTime", candleData_5.Argument },
|
||||
{ "Candle", candleData_5 }
|
||||
};
|
||||
|
||||
DownBuyList.Add(market, buyDic);
|
||||
@@ -608,7 +597,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "Candle", candleData_30 },
|
||||
{ "Candle", candleData_5 },
|
||||
{ "Size", size },
|
||||
{ "orderId", orderDic["orderId"] }
|
||||
};
|
||||
@@ -627,7 +616,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var flag = (bool)buyItem["Flag"];
|
||||
if (interval < MCandleTimeType.H1)
|
||||
{
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30);
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
|
||||
if (nowTime < buyTime)
|
||||
continue;
|
||||
}
|
||||
@@ -638,10 +627,8 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
if (nowTime < buyTime)
|
||||
continue;
|
||||
}
|
||||
var sellFlag = false;
|
||||
|
||||
|
||||
if (sellFlag)
|
||||
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortSell))
|
||||
{
|
||||
BuyShortStep[market] = 0;
|
||||
double.TryParse(buyItem["Price"].ToString(), out var buyPrice);
|
||||
@@ -657,7 +644,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyCandle", buyItem["Candle"] },
|
||||
{ "SellDate", nowTime},
|
||||
{ "SellPrice", price },
|
||||
{ "SellCandle", candleData_30 },
|
||||
{ "SellCandle", candleData_5 },
|
||||
{ "Rate", resultRate }
|
||||
};
|
||||
|
||||
@@ -699,7 +686,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "BuyCandle", buyItem["Candle"] },
|
||||
{ "SellDate", nowTime},
|
||||
{ "SellPrice", price },
|
||||
{ "SellCandle", candleData_30 },
|
||||
{ "SellCandle", candleData_5 },
|
||||
{ "Rate", resultRateData }
|
||||
};
|
||||
ResultList.Add(orderResult);
|
||||
|
||||
Reference in New Issue
Block a user