фикс опреедения пересечений
parent
f76564ab27
commit
a2e58c9a12
|
@ -172,16 +172,16 @@ namespace KLHZ.Trader.Core.Exchange.Services
|
||||||
&& !OpeningStops.TryGetValue(message.Figi, out _)
|
&& !OpeningStops.TryGetValue(message.Figi, out _)
|
||||||
&& state == ExchangeState.Open
|
&& state == ExchangeState.Open
|
||||||
&& data.timestamps.Length > 1
|
&& data.timestamps.Length > 1
|
||||||
//&& (data.timestamps[data.timestamps.Length - 1] - data.timestamps[data.timestamps.Length - 2] < TimeSpan.FromMinutes(1))
|
&& (data.timestamps[data.timestamps.Length - 1] - data.timestamps[data.timestamps.Length - 2] < TimeSpan.FromMinutes(1))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
var fullData = await _tradeDataProvider.GetData(message.Figi, TimeSpan.FromMinutes(60));
|
var fullData = await _tradeDataProvider.GetData(message.Figi, TimeSpan.FromMinutes(30));
|
||||||
if (fullData.isFullIntervalExists)
|
if (fullData.isFullIntervalExists)
|
||||||
{
|
{
|
||||||
var max = fullData.prices.Max();
|
var max = fullData.prices.Max();
|
||||||
var min = fullData.prices.Min();
|
var min = fullData.prices.Min();
|
||||||
|
|
||||||
//if (max - min < 15 && fullData.prices.Last() - fullData.prices.First() < 4)
|
if (max - min < 15 && fullData.prices.Last() - fullData.prices.First() < 4 && fullData.prices.Last() - fullData.prices.First()>-4)
|
||||||
{
|
{
|
||||||
if (!message.IsHistoricalData && BotModeSwitcher.CanPurchase())
|
if (!message.IsHistoricalData && BotModeSwitcher.CanPurchase())
|
||||||
{
|
{
|
||||||
|
@ -210,10 +210,9 @@ namespace KLHZ.Trader.Core.Exchange.Services
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// await LogDeclision(DeclisionTradeAction.OpenLong, message);
|
await LogDeclision(DeclisionTradeAction.OpenLong, message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await LogDeclision(DeclisionTradeAction.OpenLong, message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue