million/BitGet_API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

데이터 수정

Browse Source
This commit is contained in:
kyh
2025-05-23 12:44:23 +09:00
parent b7cf26b8fc
commit f70aff1a1e
4 changed files with 173 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitgetApi/BitgetApi.csproj
View File

@@ -112,6 +112,7 @@
<Compile Include="IndicatorConditionSetup\IchimokuConditionSetup.cs" /> <Compile Include="IndicatorConditionSetup\IchimokuConditionSetup.cs" />
<Compile Include="IndicatorConditionSetup\ImpulseMacdConditionSetup.cs" /> <Compile Include="IndicatorConditionSetup\ImpulseMacdConditionSetup.cs" />
<Compile Include="IndicatorConditionSetup\MovingAverageConditionSetup.cs" /> <Compile Include="IndicatorConditionSetup\MovingAverageConditionSetup.cs" />
<Compile Include="IndicatorConditionSetup\SMABandConditionSetup.cs" />
<Compile Include="IndicatorConditionSetup\TradingViewConditionSetup.cs" /> <Compile Include="IndicatorConditionSetup\TradingViewConditionSetup.cs" />
<Compile Include="IndicatorData\IchimokData.cs" /> <Compile Include="IndicatorData\IchimokData.cs" />
<Compile Include="IndicatorConditionSetup\IndicatorProcess.cs" /> <Compile Include="IndicatorConditionSetup\IndicatorProcess.cs" />

9
BitgetApi/CommonProperty.cs
View File

@@ -48,6 +48,15 @@ namespace BitgetAPI
MARGIN_보류 = 2 MARGIN_보류 = 2
} }
// SMA Band Type
public enum SMABandType
{
LongBuy = 0,
LongSell = 1,
ShortBuy = 2,
ShortSell = 3
}
public ExchangePlace selectedChangePlace; public ExchangePlace selectedChangePlace;
public PaymentType selectedPaymentType; public PaymentType selectedPaymentType;
public BitgetProductType selectedBitgetProductType; public BitgetProductType selectedBitgetProductType;

123
BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs
View File

@@ -30,7 +30,7 @@ namespace BitgetAPI.IndicatorConditionSetup
return options.SelectAPI.AccessKey; return options.SelectAPI.AccessKey;
} }
} }
// = "bg_f93aa530288b6ec9d62095994c51972a"; // = "bg_f93aa55288b6ec9d62095994c51972a";
private string YHKIM_SecreteKey private string YHKIM_SecreteKey
{ {
get get
@@ -133,6 +133,7 @@ namespace BitgetAPI.IndicatorConditionSetup
IchimokuConditionSetup ichimokuConditionSetup = new IchimokuConditionSetup(); IchimokuConditionSetup ichimokuConditionSetup = new IchimokuConditionSetup();
MovingAverageConditionSetup movingAverageConditionSetup = new MovingAverageConditionSetup(); MovingAverageConditionSetup movingAverageConditionSetup = new MovingAverageConditionSetup();
TradingViewConditionSetup tradingViewConditionSetup = new TradingViewConditionSetup(); TradingViewConditionSetup tradingViewConditionSetup = new TradingViewConditionSetup();
SMABandConditionSetup sMABandConditionSetup = new SMABandConditionSetup();
signals_LU.Clear(); signals_LU.Clear();
signals_SD.Clear(); signals_SD.Clear();
signals_LD.Clear(); signals_LD.Clear();
@@ -305,59 +306,59 @@ namespace BitgetAPI.IndicatorConditionSetup
BuyShortStep[market] = 0; BuyShortStep[market] = 0;
BuyLongStep[market] = 0; BuyLongStep[market] = 0;
} }
if (!(전저고점.ContainsKey(market + "30m"))) if (!(전저고점.ContainsKey(market + "5m")))
continue; continue;
#region 30분봉 처리 #region 5분봉 처리
var candleDatas_30 = findedMarket.candleDataList[MCandleTimeType.M30]; var candleDatas_5 = findedMarket.candleDataList[MCandleTimeType.M5];
var candleDatas_30_정렬 = candleDatas_30.OrderBy(i => i.Argument).ToList(); var candleDatas_5_정렬 = candleDatas_5.OrderBy(i => i.Argument).ToList();
var candleDatas_30_TempList = candleDatas_30.OrderBy(i => i.Argument).ToList(); var candleDatas_5_TempList = candleDatas_5.OrderBy(i => i.Argument).ToList();
var candleData_30 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); 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); ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5);
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
var candleData_30_전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); 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_전봉); ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전봉);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전봉); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전봉);
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
var candleData_30_전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); 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_전전봉); ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전봉);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전봉); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전봉);
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
var candleData_30_전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); 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_전전전봉); ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전봉);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전봉); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전봉);
candleDatas_30_정렬.RemoveAt(candleDatas_30_정렬.Count - 1); candleDatas_5_정렬.RemoveAt(candleDatas_5_정렬.Count - 1);
var candleData_30_전전전전봉 = candleDatas_30.Find(i => i.Argument == candleDatas_30_정렬.Last().Argument); 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_전전전전봉); ichimokuConditionSetup.calIchimokuData(candleDatas_5_정렬, candleData_5_전전전전봉);
movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_30_정렬, candleData_30_전전전전봉); movingAverageConditionSetup.Cal_YHK_Downpublic(candleDatas_5_정렬, candleData_5_전전전전봉);
#endregion #endregion
if (영호조건식_상향돌파 || 영호조건식_하향돌파) if (영호조건식_상향돌파 || 영호조건식_하향돌파)
{ {
if (영호조건식_상향돌파) if (영호조건식_상향돌파)
{ {
var price = candleData_30.Close; var price = candleData_5.Close;
var rate = (candleData_30.Close / candleData_30.Open) * 100 - 100; var rate = (candleData_5.Close / candleData_5.Open) * 100 - 100;
var indicatorPrice = candleData_30.Open; var indicatorPrice = candleData_5.Open;
var indicatorRate = (candleData_30.Close / indicatorPrice) * 100 - 100; var indicatorRate = (candleData_5.Close / indicatorPrice) * 100 - 100;
var description = string.Format("{0} 72,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)); 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)) if (!UpBuyList.ContainsKey(market))
{ {
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongBuy))
var buyFlag = false;
if (buyFlag)
{ {
BuyLongStep[market] = 0; BuyLongStep[market] = 0;
// 없으면 생성 // 없으면 생성
@@ -399,8 +395,8 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyDate", nowTime }, { "BuyDate", nowTime },
{ "Price", price }, { "Price", price },
{ "MCandleTimeType", (int)interval }, { "MCandleTimeType", (int)interval },
{ "CandleTime", candleData_30.Argument }, { "CandleTime", candleData_5.Argument },
{ "Candle", candleData_30 } { "Candle", candleData_5 }
}; };
UpBuyList.Add(market, buyDic); UpBuyList.Add(market, buyDic);
@@ -428,7 +424,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyDate", nowTime }, { "BuyDate", nowTime },
{ "Price", price }, { "Price", price },
{ "MCandleTimeType", (int)interval }, { "MCandleTimeType", (int)interval },
{ "Candle", candleData_30 }, { "Candle", candleData_5 },
{ "Size", size }, { "Size", size },
{ "orderId", orderDic["orderId"] } { "orderId", orderDic["orderId"] }
}; };
@@ -447,7 +443,7 @@ namespace BitgetAPI.IndicatorConditionSetup
var flag = (bool)buyItem["Flag"]; var flag = (bool)buyItem["Flag"];
if (interval < MCandleTimeType.H1) if (interval < MCandleTimeType.H1)
{ {
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30); var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
if (nowTime < buyTime) if (nowTime < buyTime)
continue; continue;
} }
@@ -459,10 +455,7 @@ namespace BitgetAPI.IndicatorConditionSetup
continue; continue;
} }
var sellFlag = false; if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell))
if (sellFlag)
{ {
double.TryParse(buyItem["Price"].ToString(), out var buyPrice); double.TryParse(buyItem["Price"].ToString(), out var buyPrice);
var resultRate = ((price - buyPrice) / buyPrice) * 100; var resultRate = ((price - buyPrice) / buyPrice) * 100;
@@ -477,7 +470,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyCandle", buyItem["Candle"] }, { "BuyCandle", buyItem["Candle"] },
{ "SellDate", nowTime}, { "SellDate", nowTime},
{ "SellPrice", price }, { "SellPrice", price },
{ "SellCandle", candleData_30 }, { "SellCandle", candleData_5 },
{ "Rate", resultRate } { "Rate", resultRate }
}; };
@@ -518,7 +511,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyCandle", buyItem["Candle"] }, { "BuyCandle", buyItem["Candle"] },
{ "SellDate", nowTime}, { "SellDate", nowTime},
{ "SellPrice", price}, { "SellPrice", price},
{ "SellCandle", candleData_30 }, { "SellCandle", candleData_5 },
{ "Rate", resultRateData } { "Rate", resultRateData }
}; };
ResultList.Add(orderResult); ResultList.Add(orderResult);
@@ -538,10 +531,10 @@ namespace BitgetAPI.IndicatorConditionSetup
} }
if (영호조건식_하향돌파) if (영호조건식_하향돌파)
{ {
var price = candleData_30.Close; var price = candleData_5.Close;
var rate = (candleData_30.Close / candleData_30.Open) * 100 - 100; var rate = (candleData_5.Close / candleData_5.Open) * 100 - 100;
var indicatorPrice = candleData_30.Open; var indicatorPrice = candleData_5.Open;
var indicatorRate = (candleData_30.Close / indicatorPrice) * 100 - 100; var indicatorRate = (candleData_5.Close / indicatorPrice) * 100 - 100;
var description = string.Format("{0} 72,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)); 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)) if (!DownBuyList.ContainsKey(market))
{ {
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortBuy))
var buyFlag = false;
if (buyFlag)
{ {
BuyShortStep[market] = 0; BuyShortStep[market] = 0;
// 없으면 생성 // 없으면 생성
@@ -579,8 +568,8 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyDate", nowTime }, { "BuyDate", nowTime },
{ "Price", price }, { "Price", price },
{ "MCandleTimeType", (int)interval }, { "MCandleTimeType", (int)interval },
{ "CandleTime", candleData_30.Argument }, { "CandleTime", candleData_5.Argument },
{ "Candle", candleData_30 } { "Candle", candleData_5 }
}; };
DownBuyList.Add(market, buyDic); DownBuyList.Add(market, buyDic);
@@ -608,7 +597,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyDate", nowTime }, { "BuyDate", nowTime },
{ "Price", price }, { "Price", price },
{ "MCandleTimeType", (int)interval }, { "MCandleTimeType", (int)interval },
{ "Candle", candleData_30 }, { "Candle", candleData_5 },
{ "Size", size }, { "Size", size },
{ "orderId", orderDic["orderId"] } { "orderId", orderDic["orderId"] }
}; };
@@ -627,7 +616,7 @@ namespace BitgetAPI.IndicatorConditionSetup
var flag = (bool)buyItem["Flag"]; var flag = (bool)buyItem["Flag"];
if (interval < MCandleTimeType.H1) if (interval < MCandleTimeType.H1)
{ {
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(30); var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
if (nowTime < buyTime) if (nowTime < buyTime)
continue; continue;
} }
@@ -638,10 +627,8 @@ namespace BitgetAPI.IndicatorConditionSetup
if (nowTime < buyTime) if (nowTime < buyTime)
continue; continue;
} }
var sellFlag = false;
if (sellFlag) if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortSell))
{ {
BuyShortStep[market] = 0; BuyShortStep[market] = 0;
double.TryParse(buyItem["Price"].ToString(), out var buyPrice); double.TryParse(buyItem["Price"].ToString(), out var buyPrice);
@@ -657,7 +644,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyCandle", buyItem["Candle"] }, { "BuyCandle", buyItem["Candle"] },
{ "SellDate", nowTime}, { "SellDate", nowTime},
{ "SellPrice", price }, { "SellPrice", price },
{ "SellCandle", candleData_30 }, { "SellCandle", candleData_5 },
{ "Rate", resultRate } { "Rate", resultRate }
}; };
@@ -699,7 +686,7 @@ namespace BitgetAPI.IndicatorConditionSetup
{ "BuyCandle", buyItem["Candle"] }, { "BuyCandle", buyItem["Candle"] },
{ "SellDate", nowTime}, { "SellDate", nowTime},
{ "SellPrice", price }, { "SellPrice", price },
{ "SellCandle", candleData_30 }, { "SellCandle", candleData_5 },
{ "Rate", resultRateData } { "Rate", resultRateData }
}; };
ResultList.Add(orderResult); ResultList.Add(orderResult);

108
BitgetApi/IndicatorConditionSetup/SMABandConditionSetup.cs Normal file
View File

@@ -0,0 +1,108 @@
using BitgetAPI.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static BitgetAPI.CommonProperty;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip;
namespace BitgetApi.IndicatorConditionSetup
{
public class SMABandConditionSetup
{
private readonly int rangeLookback = 10;
private readonly double rangeThresholdPercent = 1.0;
private readonly int bandLength = 12;
private readonly int recentTouchLookback = 5;
private int? sma4LongTouchBar = null;
private int? sma4ShortTouchBar = null;
public bool Calculate(List<CandleData> candles, SMABandType type)
{
var currentIndex = candles.Count - 1;
var close = candles.Select(t => t.Close).ToList();
var high = candles.Select(t=>t.High).ToList();
var low = candles.Select(t => t.Low).ToList();
if (currentIndex < 72 || close.Count <= currentIndex || high.Count <= currentIndex || low.Count <= currentIndex)
return false;
// === SMA(4) 계산 ===
double sma4 = close.GetRange(currentIndex - 3, 4).Average();
double prevSma4 = new[] { close[currentIndex - 4], close[currentIndex - 1], close[currentIndex - 2], close[currentIndex - 3] }.Average();
double prev2Sma4 = new[] { close[currentIndex - 4], close[currentIndex - 5], close[currentIndex - 2], close[currentIndex - 3] }.Average();
// === SMA(4) 밴드 계산 ===
List<double> sma4Series = new List<double>();
for (int i = currentIndex - bandLength + 1; i <= currentIndex; i++)
{
var s = close.GetRange(i - 3, 4).Average();
sma4Series.Add(s);
}
double sma4High = sma4Series.Max();
double sma4Low = sma4Series.Min();
double sma4Middle = sma4Series.Average();
// 이전 SMA4 밴드
List<double> prevSma4Series = new List<double>();
for (int i = currentIndex - bandLength + 1; i <= currentIndex; i++)
{
var s = new[] { close[i - 4], close[i - 1], close[i - 2], close[i - 3] }.Average();
prevSma4Series.Add(s);
}
double prevSma4High = prevSma4Series.Max();
double prevSma4Low = prevSma4Series.Min();
double prevSma4Middle = prevSma4Series.Average();
List<double> prev2Sma4Series = new List<double>();
for (int i = currentIndex - bandLength + 1; i <= currentIndex; i++)
{
var s = new[] { close[i - 4], close[i - 5], close[i - 2], close[i - 3] }.Average();
prev2Sma4Series.Add(s);
}
double prev2Sma4Middle = prev2Sma4Series.Average();
double prev2Sma4High = prev2Sma4Series.Max();
double prev2Sma4Low = prev2Sma4Series.Min();
// === 횡보 구간 ===
double highestHigh = high.Skip(currentIndex - rangeLookback + 1).Take(rangeLookback).Max();
double lowestLow = low.Skip(currentIndex - rangeLookback + 1).Take(rangeLookback).Min();
double priceRange = highestHigh - lowestLow;
bool isSideways = priceRange > (highestHigh * rangeThresholdPercent / 100.0);
// === 최근 터치 ===
if (sma4 == sma4Low)
sma4LongTouchBar = currentIndex;
bool isLongRecentTouch = sma4LongTouchBar.HasValue && currentIndex - sma4LongTouchBar.Value >= recentTouchLookback;
if (sma4 == sma4High)
sma4ShortTouchBar = currentIndex;
bool isShortRecentTouch = sma4ShortTouchBar.HasValue && currentIndex - sma4ShortTouchBar.Value >= recentTouchLookback;
// === 시그널 계산 ===
if (type == SMABandType.LongBuy)
{
return isLongRecentTouch && isSideways && prevSma4 < sma4 && sma4High == sma4 &&
prevSma4High > prevSma4 && (prev2Sma4Middle - prevSma4Middle) > (prevSma4Middle - sma4Middle);
}
else if(type == SMABandType.ShortBuy)
{
return isShortRecentTouch && prevSma4 < sma4 && sma4High == sma4 &&
prevSma4High > prevSma4 && (prev2Sma4Middle - prevSma4Middle) > (prevSma4Middle - sma4Middle);
}
else if(type == SMABandType.LongSell)
{
return (!isSideways && prevSma4High > prevSma4) || (isSideways && prev2Sma4High > prev2Sma4 && prevSma4High > prevSma4);
}
else if(type == SMABandType.ShortSell)
{
return (!isSideways && prevSma4Low < prevSma4) || (isSideways && prev2Sma4Low < prev2Sma4 && prevSma4Low < prevSma4);
}
return false;
}
}
}