From 2e0802a2fdad2ab7cbdb1760d45a2cc663afa388 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Sat, 7 Sep 2019 11:49:23 +0700 Subject: [PATCH] BarAggregator: increased max time --- src/ATrade/Driver/Real.hs | 2 +- src/ATrade/Driver/Real/QuoteSourceThread.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ATrade/Driver/Real.hs b/src/ATrade/Driver/Real.hs index 8877cdc..2653176 100644 --- a/src/ATrade/Driver/Real.hs +++ b/src/ATrade/Driver/Real.hs @@ -311,7 +311,7 @@ barStrategyDriver mbSourceTimeframe tickFilter strategy stateRef timersRef shutd M.fromList <$> mapM (loadTickerFromHAP ctx ((strategyHistoryProvider . strategyInstanceParams) strategy)) (tickers . strategyInstanceParams $ strategy) | otherwise -> M.fromList <$> mapM (loadTickerFromQHP ctx ((strategyHistoryProvider . strategyInstanceParams) strategy)) (tickers . strategyInstanceParams $ strategy) - agg <- newIORef $ mkAggregatorFromBars historyBars [(hmsToDiffTime 6 50 0, hmsToDiffTime 21 0 0)] + agg <- newIORef $ mkAggregatorFromBars historyBars [(hmsToDiffTime 6 50 0, hmsToDiffTime 21 10 0)] bracket (startQuoteSourceThread ctx qsEp strategy eventChan agg tickFilter mbSourceTimeframe) killThread (\_ -> do debugM "Strategy" "QuoteSource thread forked" bracket (startBrokerClientThread (strategyInstanceId . strategyInstanceParams $ strategy) ctx brEp ordersChan eventChan shutdownVar) killThread (\_ -> do diff --git a/src/ATrade/Driver/Real/QuoteSourceThread.hs b/src/ATrade/Driver/Real/QuoteSourceThread.hs index cd23dbb..7cad432 100644 --- a/src/ATrade/Driver/Real/QuoteSourceThread.hs +++ b/src/ATrade/Driver/Real/QuoteSourceThread.hs @@ -46,7 +46,7 @@ startQuoteSourceThread ctx qsEp strategy eventChan agg tickFilter maybeSourceTim Just _ -> return () QDBar (incomingTf, bar) -> do aggValue <- readIORef agg - debugM "QSThread" $ "Incoming bar: " ++ show incomingTf ++ ": " ++ show bar + -- debugM "QSThread" $ "Incoming bar: " ++ show incomingTf ++ ": " ++ show bar case maybeSourceTimeframe of Just tf -> when (tf == unBarTimeframe incomingTf) $ case handleBar bar aggValue of