diff --git a/KLHZ.Trader.Core/Exchange/Services/Trader.cs b/KLHZ.Trader.Core/Exchange/Services/Trader.cs index a22de26..3d5300e 100644 --- a/KLHZ.Trader.Core/Exchange/Services/Trader.cs +++ b/KLHZ.Trader.Core/Exchange/Services/Trader.cs @@ -412,12 +412,12 @@ namespace KLHZ.Trader.Core.Exchange.Services //} - var buys5min = await _tradeDataProvider.GetDataFrom5MinuteWindowCache(message.Figi, Constants._5minBuyCacheKey); - var sells5min = await _tradeDataProvider.GetDataFrom5MinuteWindowCache(message.Figi, Constants._5minSellCacheKey); - var buysSpeed5min = buys5min.Sum(p => p.Value) / 300; - var sellsSpeed5min = sells5min.Sum(p => p.Value) / 300; - var diff5min = buysSpeed5min - sellsSpeed5min; - await LogPrice(message, "speed_diff_5min", diff5min); + //var buys5min = await _tradeDataProvider.GetDataFrom5MinuteWindowCache(message.Figi, Constants._5minBuyCacheKey); + //var sells5min = await _tradeDataProvider.GetDataFrom5MinuteWindowCache(message.Figi, Constants._5minSellCacheKey); + //var buysSpeed5min = buys5min.Sum(p => p.Value) / 300; + //var sellsSpeed5min = sells5min.Sum(p => p.Value) / 300; + //var diff5min = buysSpeed5min - sellsSpeed5min; + //await LogPrice(message, "speed_diff_5min", diff5min); //var buys1min = await _tradeDataProvider.GetDataFrom1MinuteWindowCache(message.Figi, Constants._1minBuyCacheKey); //var sells1min = await _tradeDataProvider.GetDataFrom1MinuteWindowCache(message.Figi, Constants._1minSellCacheKey); @@ -718,12 +718,12 @@ INewPrice message, int windowMaxSize, decimal uptrendStartingDetectionMeanfullSt //result = MergeResults(result, resTask2.Result.ToImmutableDictionary()); //result = MergeResults(result, resTask3.Result.ToImmutableDictionary()); - //result = MergeResultsMax(result, changeModeData); - //result = MergeResultsMax(result, getLocalTrendsModsTask.Result); - //result = MergeResultsMult(result, getFFTModsTask.Result); - //result = MergeResultsMult(result, getSellsDiffsModsTask.Result); - //result = MergeResultsMult(result, getTradingModeModsTask.Result); - //result = MergeResultsMult(result, getSpeedResultantModsTask.Result); + result = MergeResultsMax(result, changeModeData); + result = MergeResultsMax(result, getLocalTrendsModsTask.Result); + result = MergeResultsMult(result, getFFTModsTask.Result); + result = MergeResultsMult(result, getSellsDiffsModsTask.Result); + result = MergeResultsMult(result, getTradingModeModsTask.Result); + result = MergeResultsMult(result, getSpeedResultantModsTask.Result); if (result[TradingEvent.UptrendStart] >= Constants.UppingCoefficient && !LongOpeningStops.ContainsKey(message.Figi) diff --git a/KLHZ.Trader.Core/Exchange/Utils/ExchangeScheduler.cs b/KLHZ.Trader.Core/Exchange/Utils/ExchangeScheduler.cs index 6433efd..8efe354 100644 --- a/KLHZ.Trader.Core/Exchange/Utils/ExchangeScheduler.cs +++ b/KLHZ.Trader.Core/Exchange/Utils/ExchangeScheduler.cs @@ -4,7 +4,7 @@ namespace KLHZ.Trader.Core.Exchange.Utils { internal static class ExchangeScheduler { - private readonly static TimeOnly _openTimeMain = new(6, 0); + private readonly static TimeOnly _openTimeMain = new(6, 10); private readonly static TimeOnly _closeTimeMain = new(20, 45); private readonly static TimeOnly _openTimeHoliday = new(7, 10);