git.iko.soy/stackage
on bf52f1d help sign in
stackage/patching/patches/criterion-0.8.0.2.patch
171 lines 5.7 kB history raw
1diff -ru orig/Criterion/Analysis/Types.hs new/Criterion/Analysis/Types.hs
2--- orig/Criterion/Analysis/Types.hs 2014-04-10 08:02:35.383848688 +0300
3+++ new/Criterion/Analysis/Types.hs 2014-04-10 08:02:34.000000000 +0300
4@@ -19,10 +19,12 @@
5 , SampleAnalysis(..)
6 ) where
7
8+import Control.Applicative ((<$>), (<*>))
9 import Control.DeepSeq (NFData(rnf))
10-import Data.Binary (Binary)
11+import Data.Binary (Binary, put, get)
12 import Data.Data (Data, Typeable)
13 import Data.Int (Int64)
14+import Data.Word (Word8)
15 import Data.Monoid (Monoid(..))
16 import GHC.Generics (Generic)
17 import qualified Statistics.Resampling.Bootstrap as B
18@@ -42,7 +44,14 @@
19 -- ^ More than 3 times the IQR above the third quartile.
20 } deriving (Eq, Read, Show, Typeable, Data, Generic)
22-instance Binary Outliers
23+instance Binary Outliers where
24+ put (Outliers a b c d e) = do
25+ put a
26+ put b
27+ put c
28+ put d
29+ put e
30+ get = Outliers <$> get <*> get <*> get <*> get <*> get
31 instance NFData Outliers
33 -- | A description of the extent to which outliers in the sample data
34@@ -54,7 +63,19 @@
35 -- are useless).
36 deriving (Eq, Ord, Read, Show, Typeable, Data, Generic)
38-instance Binary OutlierEffect
39+instance Binary OutlierEffect where
40+ put Unaffected = put (0 :: Word8)
41+ put Slight = put (1 :: Word8)
42+ put Moderate = put (2 :: Word8)
43+ put Severe = put (3 :: Word8)
44+ get = do
45+ w <- get
46+ case w :: Word8 of
47+ 0 -> return Unaffected
48+ 1 -> return Slight
49+ 2 -> return Moderate
50+ 3 -> return Severe
51+ _ -> error "Binary.get for OutlierEffect failed"
52 instance NFData OutlierEffect
54 instance Monoid Outliers where
55@@ -77,7 +98,9 @@
56 -- ^ Quantitative description of effect (a fraction between 0 and 1).
57 } deriving (Eq, Read, Show, Typeable, Data, Generic)
59-instance Binary OutlierVariance
60+instance Binary OutlierVariance where
61+ put (OutlierVariance a b c) = put a >> put b >> put c
62+ get = OutlierVariance <$> get <*> get <*> get
64 instance NFData OutlierVariance where
65 rnf OutlierVariance{..} = rnf ovEffect `seq` rnf ovDesc `seq` rnf ovFraction
66@@ -89,7 +112,9 @@
67 , anOutlierVar :: OutlierVariance
68 } deriving (Eq, Read, Show, Typeable, Data, Generic)
70-instance Binary SampleAnalysis
71+instance Binary SampleAnalysis where
72+ put (SampleAnalysis a b c) = put a >> put b >> put c
73+ get = SampleAnalysis <$> get <*> get <*> get
75 instance NFData SampleAnalysis where
76 rnf SampleAnalysis{..} =
77diff -ru orig/Criterion/IO.hs new/Criterion/IO.hs
78--- orig/Criterion/IO.hs 2014-04-10 08:02:35.383848688 +0300
79+++ new/Criterion/IO.hs 2014-04-10 08:02:34.000000000 +0300
80@@ -1,3 +1,4 @@
81+{-# LANGUAGE CPP #-}
82 {-# LANGUAGE OverloadedStrings #-}
83 -- |
84 -- Module : Criterion.IO
85@@ -21,7 +22,11 @@
87 import Criterion.Types (ResultForest, ResultTree(..))
88 import Data.Binary (Binary(..), encode)
89+#if MIN_VERSION_binary(0,6,3)
90 import Data.Binary.Get (runGetOrFail)
91+#else
92+import Data.Binary.Get (runGetState)
93+#endif
94 import Data.Binary.Put (putByteString, putWord16be, runPut)
95 import Data.ByteString.Char8 ()
96 import Data.Version (Version(..))
97@@ -58,6 +63,7 @@
98 writeResults path rs = withFile path WriteMode (flip hPutResults rs)
100 readAll :: Binary a => Handle -> IO [a]
101+#if MIN_VERSION_binary(0,6,3)
102 readAll handle = do
103 let go bs
104 | L.null bs = return []
105@@ -65,3 +71,12 @@
106 Left (_, _, err) -> fail err
107 Right (bs', _, a) -> (a:) `fmap` go bs'
108 go =<< L.hGetContents handle
109+#else
110+readAll handle = do
111+ let go i bs
112+ | L.null bs = return []
113+ | otherwise =
114+ let (a, bs', i') = runGetState get bs i
115+ in (a:) `fmap` go i' bs'
116+ go 0 =<< L.hGetContents handle
117+#endif
118diff -ru orig/Criterion/Types.hs new/Criterion/Types.hs
119--- orig/Criterion/Types.hs 2014-04-10 08:02:35.383848688 +0300
120+++ new/Criterion/Types.hs 2014-04-10 08:02:34.000000000 +0300
121@@ -45,11 +45,13 @@
122 , ResultTree(..)
123 ) where
125+import Control.Applicative ((<$>), (<*>))
126 import Control.DeepSeq (NFData, rnf)
127 import Control.Exception (evaluate)
128 import Criterion.Analysis.Types (Outliers(..), SampleAnalysis(..))
129-import Data.Binary (Binary)
130+import Data.Binary (Binary (get, put))
131 import Data.Data (Data, Typeable)
132+import Data.Word (Word8)
133 import GHC.Generics (Generic)
134 import Statistics.Types (Sample)
136@@ -161,11 +163,21 @@
137 , outliers :: Outliers
138 } deriving (Eq, Read, Show, Typeable, Data, Generic)
140-instance Binary Result
141+instance Binary Result where
142+ put (Result a b c d) = put a >> put b >> put c >> put d
143+ get = Result <$> get <*> get <*> get <*> get
145 type ResultForest = [ResultTree]
146 data ResultTree = Single Result
147 | Compare !Int ResultForest
148 deriving (Eq, Read, Show, Typeable, Data, Generic)
150-instance Binary ResultTree
151+instance Binary ResultTree where
152+ put (Single x) = put (0 :: Word8) >> put x
153+ put (Compare x y) = put (1 :: Word8) >> put x >> put y
154+ get = do
155+ w <- get
156+ case w :: Word8 of
157+ 0 -> Single <$> get
158+ 1 -> Compare <$> get <*> get
159+ _ -> error "Binary.get for ResultTree failed"
160diff -ru orig/criterion.cabal new/criterion.cabal
161--- orig/criterion.cabal 2014-04-10 08:02:35.387848687 +0300
162+++ new/criterion.cabal 2014-04-10 08:02:34.000000000 +0300
163@@ -58,7 +58,7 @@
164 build-depends:
165 aeson >= 0.3.2.12,
166 base < 5,
167- binary >= 0.6.3.0,
168+ binary >= 0.5.1,
169 bytestring >= 0.9 && < 1.0,
170 containers,
171 deepseq >= 1.1.0.0,