Browse Source

Formatting

master
Denis Tereshkin 7 years ago
parent
commit
a026e8ac60
  1. 2
      src/ATrade/Driver/Backtest.hs
  2. 10
      src/ATrade/Driver/Real/BrokerClientThread.hs
  3. 5
      src/ATrade/Driver/Real/QuoteSourceThread.hs
  4. 2
      src/ATrade/Driver/Real/Types.hs
  5. 4
      src/ATrade/Forums/Smartlab.hs
  6. 8
      src/ATrade/Quotes/HAP.hs
  7. 6
      src/ATrade/Quotes/QHP.hs
  8. 4
      src/ATrade/Quotes/QTIS.hs
  9. 1
      src/ATrade/RoboCom/Indicators.hs
  10. 15
      src/ATrade/RoboCom/Monad.hs
  11. 10
      src/ATrade/RoboCom/Positions.hs
  12. 14
      src/ATrade/RoboCom/Types.hs
  13. 8
      src/ATrade/RoboCom/Utils.hs
  14. 8
      test/Test/RoboCom/Indicators.hs
  15. 8
      test/Test/RoboCom/Utils.hs

2
src/ATrade/Driver/Backtest.hs

@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
module ATrade.Driver.Backtest (
backtestMain

10
src/ATrade/Driver/Real/BrokerClientThread.hs

@ -7,21 +7,23 @@ module ATrade.Driver.Real.BrokerClientThread ( @@ -7,21 +7,23 @@ module ATrade.Driver.Real.BrokerClientThread (
import ATrade.Broker.Client
import ATrade.Broker.Protocol
import ATrade.RoboCom.Monad hiding (submitOrder, cancelOrder)
import ATrade.RoboCom.Monad hiding (cancelOrder,
submitOrder)
import ATrade.RoboCom.Types
import ATrade.Types
import Control.Concurrent hiding (readChan, writeChan,
writeList2Chan, yield)
import Control.Concurrent.BoundedChan
import Control.Concurrent hiding (writeChan, readChan, writeList2Chan, yield)
import Control.Exception
import Control.Monad.Loops
import Control.Monad
import Control.Monad.Loops
import Data.IORef
import Data.Maybe
import qualified Data.Text as T
import Data.Text.Encoding
import Data.Time.Clock
import Data.Maybe
import System.Log.Logger
import System.ZMQ4 hiding (Event)

5
src/ATrade/Driver/Real/QuoteSourceThread.hs

@ -6,17 +6,18 @@ module ATrade.Driver.Real.QuoteSourceThread @@ -6,17 +6,18 @@ module ATrade.Driver.Real.QuoteSourceThread
) where
import ATrade.BarAggregator
import ATrade.Driver.Real.Types
import ATrade.QuoteSource.Client
import ATrade.RoboCom.Monad
import ATrade.RoboCom.Types
import ATrade.Types
import ATrade.Driver.Real.Types
import Data.IORef
import qualified Data.Text as T
import Control.Concurrent hiding (readChan, writeChan,
writeList2Chan, yield)
import Control.Concurrent.BoundedChan
import Control.Concurrent hiding (writeChan, readChan, writeList2Chan, yield)
import Control.Exception
import Control.Monad

2
src/ATrade/Driver/Real/Types.hs

@ -9,8 +9,8 @@ module ATrade.Driver.Real.Types ( @@ -9,8 +9,8 @@ module ATrade.Driver.Real.Types (
import ATrade.RoboCom.Monad
import ATrade.RoboCom.Types
import Data.Time.Clock
import qualified Data.Text as T
import Data.Time.Clock
-- | Top-level strategy configuration and state
data Strategy c s = BarStrategy {

4
src/ATrade/Forums/Smartlab.hs

@ -8,12 +8,12 @@ module ATrade.Forums.Smartlab ( @@ -8,12 +8,12 @@ module ATrade.Forums.Smartlab (
) where
import qualified Data.ByteString.Lazy as BL
import qualified Data.List as L
import Data.Maybe
import qualified Data.Text as T
import Data.Text.Encoding
import qualified Data.List as L
import Data.Time.Calendar
import Data.Time.Clock
import Data.Maybe
import Network.HTTP.Simple
import Safe
import Text.HTML.TagSoup

8
src/ATrade/Quotes/HAP.hs

@ -8,15 +8,15 @@ module ATrade.Quotes.HAP ( @@ -8,15 +8,15 @@ module ATrade.Quotes.HAP (
import ATrade.Types
import Data.Aeson
import qualified Data.Text as T
import qualified Data.ByteString.Lazy as BL
import Data.Binary.Get
import Data.Binary.IEEE754
import Data.Time.Clock
import qualified Data.ByteString.Lazy as BL
import qualified Data.Text as T
import Data.Time.Calendar
import Data.Time.Clock
import Data.Time.Clock.POSIX
import System.ZMQ4
import System.Log.Logger
import System.ZMQ4
data Period =
Period1Min |

6
src/ATrade/Quotes/QHP.hs

@ -8,14 +8,14 @@ module ATrade.Quotes.QHP ( @@ -8,14 +8,14 @@ module ATrade.Quotes.QHP (
import ATrade.Types
import Data.Aeson
import qualified Data.Text as T
import qualified Data.ByteString.Lazy as BL
import Data.Binary.Get
import Data.Binary.IEEE754
import qualified Data.ByteString.Lazy as BL
import qualified Data.Text as T
import Data.Time.Calendar
import Data.Time.Clock.POSIX
import System.ZMQ4
import System.Log.Logger
import System.ZMQ4
data Period =
Period1Min |

4
src/ATrade/Quotes/QTIS.hs

@ -10,12 +10,12 @@ module ATrade.Quotes.QTIS @@ -10,12 +10,12 @@ module ATrade.Quotes.QTIS
import ATrade.Types
import Control.Monad
import Data.Aeson
import Data.Maybe
import qualified Data.ByteString.Char8 as BC8
import qualified Data.ByteString.Lazy as BL
import Data.Maybe
import qualified Data.Text as T
import System.ZMQ4
import System.Log.Logger
import System.ZMQ4
data TickerInfo = TickerInfo {
tiTicker :: T.Text,

1
src/ATrade/RoboCom/Indicators.hs

@ -23,7 +23,6 @@ import ATrade.Types @@ -23,7 +23,6 @@ import ATrade.Types
import qualified Data.List as L
import Data.Time.Clock
import Safe
import Debug.Trace
cmf :: Int -> [Bar] -> Double
cmf period bars = sum (toDouble . clv <$> take period bars) / toDouble (sum (fromInteger . barVolume <$> bars))

15
src/ATrade/RoboCom/Monad.hs

@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TypeSynonymInstances #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeSynonymInstances #-}
module ATrade.RoboCom.Monad (
RState,
@ -27,14 +26,14 @@ module ATrade.RoboCom.Monad ( @@ -27,14 +26,14 @@ module ATrade.RoboCom.Monad (
st
) where
import ATrade.Types
import ATrade.RoboCom.Types
import ATrade.Types
import Ether
import Data.Time.Clock
import Data.Aeson.Types
import qualified Data.Text as T
import Data.Time.Clock
import Text.Printf.TH

10
src/ATrade/RoboCom/Positions.hs

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE TypeApplications #-}
{-|
- Module : ATrade.RoboCom.Combinators
@ -69,16 +69,16 @@ module ATrade.RoboCom.Positions @@ -69,16 +69,16 @@ module ATrade.RoboCom.Positions
import GHC.Generics
import ATrade.Types
import ATrade.RoboCom.Monad
import ATrade.RoboCom.Types
import ATrade.Types
import Control.Monad
import Ether
import Data.Aeson
import qualified Data.Map as M
import qualified Data.List as L
import qualified Data.Map as M
import qualified Data.Text as T
import Data.Time.Clock

14
src/ATrade/RoboCom/Types.hs

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TypeSynonymInstances #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeSynonymInstances #-}
module ATrade.RoboCom.Types (
Bar(..),
@ -13,13 +13,13 @@ module ATrade.RoboCom.Types ( @@ -13,13 +13,13 @@ module ATrade.RoboCom.Types (
Bars
) where
import qualified Data.Text as T
import qualified Data.Text.Lazy as TL
import qualified Data.Map.Strict as M
import qualified Data.HashMap.Strict as HM
import ATrade.Types
import Data.Aeson
import Data.Aeson.Types
import ATrade.Types
import qualified Data.HashMap.Strict as HM
import qualified Data.Map.Strict as M
import qualified Data.Text as T
import qualified Data.Text.Lazy as TL
import Data.Time.Clock
import Text.Read hiding (String)

8
src/ATrade/RoboCom/Utils.hs

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{-# LANGUAGE TypeSynonymInstances #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE TypeSynonymInstances #-}
module ATrade.RoboCom.Utils (
barStartTime,
@ -15,10 +15,10 @@ module ATrade.RoboCom.Utils ( @@ -15,10 +15,10 @@ module ATrade.RoboCom.Utils (
import ATrade.Types
import Data.Time.Clock
import Data.Time.Calendar
import qualified Data.Text as T
import Data.Text.Lazy.Builder
import Data.Time.Calendar
import Data.Time.Clock
import Text.Read hiding (String)

8
test/Test/RoboCom/Indicators.hs

@ -6,14 +6,14 @@ module Test.RoboCom.Indicators @@ -6,14 +6,14 @@ module Test.RoboCom.Indicators
) where
import Test.Tasty
import Test.Tasty.SmallCheck as SC
import Test.Tasty.QuickCheck as QC
import Test.Tasty.HUnit
import Test.Tasty.QuickCheck as QC
import Test.Tasty.SmallCheck as SC
import qualified Data.Text as T
import ATrade.Types
import Data.Time.Clock
import qualified Data.Text as T
import Data.Time.Calendar
import Data.Time.Clock
import ATrade.RoboCom.Indicators

8
test/Test/RoboCom/Utils.hs

@ -6,14 +6,14 @@ module Test.RoboCom.Utils @@ -6,14 +6,14 @@ module Test.RoboCom.Utils
) where
import Test.Tasty
import Test.Tasty.SmallCheck as SC
import Test.Tasty.QuickCheck as QC
import Test.Tasty.HUnit
import Test.Tasty.QuickCheck as QC
import Test.Tasty.SmallCheck as SC
import qualified Data.Text as T
import ATrade.Types
import Data.Time.Clock
import qualified Data.Text as T
import Data.Time.Calendar
import Data.Time.Clock
import ATrade.RoboCom.Utils

Loading…
Cancel
Save