파는 로직에 추가함
This commit is contained in:
@@ -409,7 +409,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "MarketName", market },
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "Flag", false },
|
||||
{ "Flag", 저고점["전저가"] > 저고점["전전저가"] },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "CandleTime", candleData_5.Argument },
|
||||
{ "Candle", candleData_5 }
|
||||
@@ -459,18 +459,10 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var flag = (bool)buyItem["Flag"];
|
||||
if (interval < MCandleTimeType.H1)
|
||||
{
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(1);
|
||||
var buyTwoTime = buyTime.AddMinutes(5);
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
|
||||
if (nowTime < buyTime)
|
||||
continue;
|
||||
else if (nowTime < buyTwoTime)
|
||||
{
|
||||
if (!(sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongBuy, market, true) &&
|
||||
!sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell, market, true)))
|
||||
{
|
||||
buyItem["Flag"] = true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//임시로 처리
|
||||
else
|
||||
@@ -480,13 +472,17 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
continue;
|
||||
}
|
||||
|
||||
var sellFlag = false;
|
||||
var sellFlag = false;
|
||||
|
||||
if (flag)
|
||||
if (!flag)
|
||||
{
|
||||
var buyPrice = (double)buyItem["Price"];
|
||||
if(candleData_5.Close > buyPrice)
|
||||
sellFlag= true;
|
||||
if (저고점["전저가"] > 저고점["전전저가"])
|
||||
buyItem["Flag"] = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (저고점["전저가"] < 저고점["전전저가"] || 저고점["전저가"] > candleData_5_전봉.Close)
|
||||
sellFlag = true;
|
||||
}
|
||||
|
||||
if (sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.LongSell, market, true) || sellFlag)
|
||||
@@ -614,7 +610,7 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
{ "MarketName", market },
|
||||
{ "BuyDate", nowTime },
|
||||
{ "Price", price },
|
||||
{ "Flag", false },
|
||||
{ "Flag", 저고점["전고가"] < 저고점["전전고가"] },
|
||||
{ "MCandleTimeType", (int)interval },
|
||||
{ "CandleTime", candleData_5.Argument },
|
||||
{ "Candle", candleData_5 }
|
||||
@@ -664,19 +660,11 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
var flag = (bool)buyItem["Flag"];
|
||||
if (interval < MCandleTimeType.H1)
|
||||
{
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(1);
|
||||
var buyTwoTime = buyTime.AddMinutes(5);
|
||||
|
||||
var buyTime = ((DateTime)buyItem["BuyDate"]).AddMinutes(5);
|
||||
|
||||
if (nowTime < buyTime)
|
||||
continue;
|
||||
else if (nowTime < buyTwoTime)
|
||||
{
|
||||
if (!(sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortBuy, market, true) &&
|
||||
!sMABandConditionSetup.Calculate(candleDatas_5_TempList, SMABandType.ShortSell, market, true)))
|
||||
{
|
||||
buyItem["Flag"] = true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//임시로 처리
|
||||
else
|
||||
@@ -690,10 +678,14 @@ namespace BitgetAPI.IndicatorConditionSetup
|
||||
|
||||
var sellFlag = false;
|
||||
|
||||
if (flag)
|
||||
if (!flag)
|
||||
{
|
||||
var buyPrice = (double)buyItem["Price"];
|
||||
if (candleData_5.Close > buyPrice)
|
||||
if (저고점["전고가"] < 저고점["전전고가"])
|
||||
buyItem["Flag"] = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (저고점["전고가"] > 저고점["전전고가"] || 저고점["전고가"] < candleData_5_전봉.Close)
|
||||
sellFlag = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -123,12 +123,12 @@ namespace BitgetApi.IndicatorConditionSetup
|
||||
bool redCandle = open[i] > close[i];
|
||||
|
||||
// 진입/청산 조건
|
||||
bool rawNewLong = sma4 == sma4High && prevSma4<sma4High && sma4Middle> sma72 && sma4 > cloudTopNow && ichmok.SenkouSpanA > ichmok.SenkouSpanB; // sma4 > cloudBottomNow && IsSideways(high, low, i, true) && isSma4AboveCloud && (sma4 == sma4High && prevSma4 <= prevSma4High && prev2Sma4 <= prev2Sma4High) && (sma4 >= prevSma4 && prevSma4 >= prev2Sma4 && prev2Sma4 >= prev3Sma4);
|
||||
bool rawNewLong = sma4 == sma4High && prevSma4 < sma4High && sma4Middle > sma72 && sma4 > cloudTopNow && ichmok.SenkouSpanA >= ichmok.SenkouSpanB; // sma4 > cloudBottomNow && IsSideways(high, low, i, true) && isSma4AboveCloud && (sma4 == sma4High && prevSma4 <= prevSma4High && prev2Sma4 <= prev2Sma4High) && (sma4 >= prevSma4 && prevSma4 >= prev2Sma4 && prev2Sma4 >= prev3Sma4);
|
||||
|
||||
bool rawLongSell = (sma4Middle < sma72 && prevSma4Middle > prevSma72) || (sma4 < cloudBottomNow);// (sma4 <= prevSma4 && prevSma4 <= prev2Sma4 && sma4 < sma4Middle);
|
||||
|
||||
//cloudFlag &&
|
||||
bool rawNewShort = sma4High < sma72 && prevSma4High > prevSma72;//sma4 < cloudTopNow && IsSideways(high, low, i, false) && isSma4BelowCloud && (sma4 == sma4Low && prevSma4 >= prevSma4Low && prev2Sma4 >= prev2Sma4Low) && (sma4 <= prevSma4 && prevSma4 <= prev2Sma4 && prev2Sma4 <= prev3Sma4);
|
||||
bool rawNewShort = sma4 == sma4Low && prevSma4 > sma4Low && sma4Middle < sma72 && sma4 < cloudBottomNow;// sma4High < sma72 && prevSma4High > prevSma72;//sma4 < cloudTopNow && IsSideways(high, low, i, false) && isSma4BelowCloud && (sma4 == sma4Low && prevSma4 >= prevSma4Low && prev2Sma4 >= prev2Sma4Low) && (sma4 <= prevSma4 && prevSma4 <= prev2Sma4 && prev2Sma4 <= prev3Sma4);
|
||||
|
||||
bool rawShortSell = (sma4Middle > sma72 && prevSma4Middle < prevSma72) || (sma4 > cloudTopNow);//(sma4 >= prevSma4 && prevSma4 >= prev2Sma4 && sma4 > sma4Middle);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user