@@ -1,6 +1,6 @@
11diff -ru orig/Statistics/Distribution/Beta.hs new/Statistics/Distribution/Beta.hs
2−--- orig/Statistics/Distribution/Beta.hs 2014-02-19 18:51:48.636768606 +0200
3−+++ new/Statistics/Distribution/Beta.hs 2014-02-19 18:51:48.000000000 +0200
2+--- orig/Statistics/Distribution/Beta.hs 2014-04-14 09:04:31.421509375 +0300
3++++ new/Statistics/Distribution/Beta.hs 2014-04-14 09:04:31.000000000 +0300
44@@ -1,4 +1,4 @@
55-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
66+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -32,8 +32,8 @@ diff -ru orig/Statistics/Distribution/Beta.hs new/Statistics/Distribution/Beta.h
3232 -- | Create beta distribution. Both shape parameters must be positive.
3333 betaDistr :: Double -- ^ Shape parameter alpha
3434diff -ru orig/Statistics/Distribution/Binomial.hs new/Statistics/Distribution/Binomial.hs
35−--- orig/Statistics/Distribution/Binomial.hs 2014-02-19 18:51:48.636768606 +0200
36−+++ new/Statistics/Distribution/Binomial.hs 2014-02-19 18:51:48.000000000 +0200
35+--- orig/Statistics/Distribution/Binomial.hs 2014-04-14 09:04:31.421509375 +0300
36++++ new/Statistics/Distribution/Binomial.hs 2014-04-14 09:04:31.000000000 +0300
3737@@ -1,4 +1,4 @@
3838-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
3939+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -65,8 +65,8 @@ diff -ru orig/Statistics/Distribution/Binomial.hs new/Statistics/Distribution/Bi
6565 instance D.Distribution BinomialDistribution where
6666 cumulative = cumulative
6767diff -ru orig/Statistics/Distribution/CauchyLorentz.hs new/Statistics/Distribution/CauchyLorentz.hs
68−--- orig/Statistics/Distribution/CauchyLorentz.hs 2014-02-19 18:51:48.636768606 +0200
69−+++ new/Statistics/Distribution/CauchyLorentz.hs 2014-02-19 18:51:48.000000000 +0200
68+--- orig/Statistics/Distribution/CauchyLorentz.hs 2014-04-14 09:04:31.421509375 +0300
69++++ new/Statistics/Distribution/CauchyLorentz.hs 2014-04-14 09:04:31.000000000 +0300
7070@@ -1,4 +1,4 @@
7171-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
7272+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -98,8 +98,8 @@ diff -ru orig/Statistics/Distribution/CauchyLorentz.hs new/Statistics/Distributi
9898 -- | Cauchy distribution
9999 cauchyDistribution :: Double -- ^ Central point
100100diff -ru orig/Statistics/Distribution/ChiSquared.hs new/Statistics/Distribution/ChiSquared.hs
101−--- orig/Statistics/Distribution/ChiSquared.hs 2014-02-19 18:51:48.636768606 +0200
102−+++ new/Statistics/Distribution/ChiSquared.hs 2014-02-19 18:51:48.000000000 +0200
101+--- orig/Statistics/Distribution/ChiSquared.hs 2014-04-14 09:04:31.421509375 +0300
102++++ new/Statistics/Distribution/ChiSquared.hs 2014-04-14 09:04:31.000000000 +0300
103103@@ -1,4 +1,4 @@
104104-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
105105+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -129,8 +129,8 @@ diff -ru orig/Statistics/Distribution/ChiSquared.hs new/Statistics/Distribution/
129129 -- | Get number of degrees of freedom
130130 chiSquaredNDF :: ChiSquared -> Int
131131diff -ru orig/Statistics/Distribution/Exponential.hs new/Statistics/Distribution/Exponential.hs
132−--- orig/Statistics/Distribution/Exponential.hs 2014-02-19 18:51:48.636768606 +0200
133−+++ new/Statistics/Distribution/Exponential.hs 2014-02-19 18:51:48.000000000 +0200
132+--- orig/Statistics/Distribution/Exponential.hs 2014-04-14 09:04:31.421509375 +0300
133++++ new/Statistics/Distribution/Exponential.hs 2014-04-14 09:04:31.000000000 +0300
134134@@ -1,4 +1,4 @@
135135-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
136136+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -160,8 +160,8 @@ diff -ru orig/Statistics/Distribution/Exponential.hs new/Statistics/Distribution
160160 instance D.Distribution ExponentialDistribution where
161161 cumulative = cumulative
162162diff -ru orig/Statistics/Distribution/FDistribution.hs new/Statistics/Distribution/FDistribution.hs
163−--- orig/Statistics/Distribution/FDistribution.hs 2014-02-19 18:51:48.636768606 +0200
164−+++ new/Statistics/Distribution/FDistribution.hs 2014-02-19 18:51:48.000000000 +0200
163+--- orig/Statistics/Distribution/FDistribution.hs 2014-04-14 09:04:31.421509375 +0300
164++++ new/Statistics/Distribution/FDistribution.hs 2014-04-14 09:04:31.000000000 +0300
165165@@ -1,4 +1,4 @@
166166-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
167167+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -193,8 +193,8 @@ diff -ru orig/Statistics/Distribution/FDistribution.hs new/Statistics/Distributi
193193 fDistribution :: Int -> Int -> FDistribution
194194 fDistribution n m
195195diff -ru orig/Statistics/Distribution/Gamma.hs new/Statistics/Distribution/Gamma.hs
196−--- orig/Statistics/Distribution/Gamma.hs 2014-02-19 18:51:48.636768606 +0200
197−+++ new/Statistics/Distribution/Gamma.hs 2014-02-19 18:51:48.000000000 +0200
196+--- orig/Statistics/Distribution/Gamma.hs 2014-04-14 09:04:31.421509375 +0300
197++++ new/Statistics/Distribution/Gamma.hs 2014-04-14 09:04:31.000000000 +0300
198198@@ -1,4 +1,4 @@
199199-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
200200+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -226,8 +226,8 @@ diff -ru orig/Statistics/Distribution/Gamma.hs new/Statistics/Distribution/Gamma
226226 -- | Create gamma distribution. Both shape and scale parameters must
227227 -- be positive.
228228diff -ru orig/Statistics/Distribution/Geometric.hs new/Statistics/Distribution/Geometric.hs
229−--- orig/Statistics/Distribution/Geometric.hs 2014-02-19 18:51:48.636768606 +0200
230−+++ new/Statistics/Distribution/Geometric.hs 2014-02-19 18:51:48.000000000 +0200
229+--- orig/Statistics/Distribution/Geometric.hs 2014-04-14 09:04:31.421509375 +0300
230++++ new/Statistics/Distribution/Geometric.hs 2014-04-14 09:04:31.000000000 +0300
231231@@ -1,4 +1,4 @@
232232-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
233233+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -272,8 +272,8 @@ diff -ru orig/Statistics/Distribution/Geometric.hs new/Statistics/Distribution/G
272272 instance D.Distribution GeometricDistribution0 where
273273 cumulative (GD0 s) x = cumulative (GD s) (x + 1)
274274diff -ru orig/Statistics/Distribution/Hypergeometric.hs new/Statistics/Distribution/Hypergeometric.hs
275−--- orig/Statistics/Distribution/Hypergeometric.hs 2014-02-19 18:51:48.636768606 +0200
276−+++ new/Statistics/Distribution/Hypergeometric.hs 2014-02-19 18:51:48.000000000 +0200
275+--- orig/Statistics/Distribution/Hypergeometric.hs 2014-04-14 09:04:31.421509375 +0300
276++++ new/Statistics/Distribution/Hypergeometric.hs 2014-04-14 09:04:31.000000000 +0300
277277@@ -1,4 +1,4 @@
278278-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
279279+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -305,26 +305,24 @@ diff -ru orig/Statistics/Distribution/Hypergeometric.hs new/Statistics/Distribut
305305 instance D.Distribution HypergeometricDistribution where
306306 cumulative = cumulative
307307diff -ru orig/Statistics/Distribution/Normal.hs new/Statistics/Distribution/Normal.hs
308−--- orig/Statistics/Distribution/Normal.hs 2014-02-19 18:51:48.636768606 +0200
309−+++ new/Statistics/Distribution/Normal.hs 2014-02-19 18:51:48.000000000 +0200
308+--- orig/Statistics/Distribution/Normal.hs 2014-04-14 09:04:31.421509375 +0300
309++++ new/Statistics/Distribution/Normal.hs 2014-04-14 09:04:31.000000000 +0300
310310@@ -1,4 +1,4 @@
311311-{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric #-}
312312+{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric, CPP #-}
313313 -- |
314314 -- Module : Statistics.Distribution.Normal
315315 -- Copyright : (c) 2009 Bryan O'Sullivan
316−@@ -28,6 +28,10 @@
316+@@ -28,6 +28,8 @@
317317 import qualified Statistics.Distribution as D
318318 import qualified Statistics.Sample as S
319319 import qualified System.Random.MWC.Distributions as MWC
320−+#if !MIN_VERSION_binary(0, 6, 0)
321320+import Data.Binary (put, get)
322321+import Control.Applicative ((<$>), (<*>))
323−+#endif
324322
325323
326324
327−@@ -39,7 +43,9 @@
325+@@ -39,7 +41,9 @@
328326 , ndCdfDenom :: {-# UNPACK #-} !Double
329327 } deriving (Eq, Read, Show, Typeable, Data, Generic)
330328
@@ -336,8 +334,8 @@ diff -ru orig/Statistics/Distribution/Normal.hs new/Statistics/Distribution/Norm
336334 instance D.Distribution NormalDistribution where
337335 cumulative = cumulative
338336diff -ru orig/Statistics/Distribution/Poisson/Internal.hs new/Statistics/Distribution/Poisson/Internal.hs
339−--- orig/Statistics/Distribution/Poisson/Internal.hs 2014-02-19 18:51:48.636768606 +0200
340−+++ new/Statistics/Distribution/Poisson/Internal.hs 2014-02-19 18:51:48.000000000 +0200
337+--- orig/Statistics/Distribution/Poisson/Internal.hs 2014-04-14 09:04:31.421509375 +0300
338++++ new/Statistics/Distribution/Poisson/Internal.hs 2014-04-14 09:04:31.000000000 +0300
341339@@ -36,8 +36,8 @@
342340 -- | Compute entropy using Theorem 1 from "Sharp Bounds on the Entropy
343341 -- of the Poisson Law". This function is unused because 'directEntorpy'
@@ -357,8 +355,8 @@ diff -ru orig/Statistics/Distribution/Poisson/Internal.hs new/Statistics/Distrib
357355\ No newline at end of file
358356+ | otherwise = alyThm2 lambda upperCoefficients12 lowerCoefficients12
359357diff -ru orig/Statistics/Distribution/Poisson.hs new/Statistics/Distribution/Poisson.hs
360−--- orig/Statistics/Distribution/Poisson.hs 2014-02-19 18:51:48.636768606 +0200
361−+++ new/Statistics/Distribution/Poisson.hs 2014-02-19 18:51:48.000000000 +0200
358+--- orig/Statistics/Distribution/Poisson.hs 2014-04-14 09:04:31.421509375 +0300
359++++ new/Statistics/Distribution/Poisson.hs 2014-04-14 09:04:31.000000000 +0300
362360@@ -1,4 +1,4 @@
363361-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
364362+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -400,8 +398,8 @@ diff -ru orig/Statistics/Distribution/Poisson.hs new/Statistics/Distribution/Poi
400398
401399 -- $references
402400diff -ru orig/Statistics/Distribution/StudentT.hs new/Statistics/Distribution/StudentT.hs
403−--- orig/Statistics/Distribution/StudentT.hs 2014-02-19 18:51:48.636768606 +0200
404−+++ new/Statistics/Distribution/StudentT.hs 2014-02-19 18:51:48.000000000 +0200
401+--- orig/Statistics/Distribution/StudentT.hs 2014-04-14 09:04:31.421509375 +0300
402++++ new/Statistics/Distribution/StudentT.hs 2014-04-14 09:04:31.000000000 +0300
405403@@ -1,4 +1,4 @@
406404-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
407405+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -430,8 +428,8 @@ diff -ru orig/Statistics/Distribution/StudentT.hs new/Statistics/Distribution/St
430428 -- | Create Student-T distribution. Number of parameters must be positive.
431429 studentT :: Double -> StudentT
432430diff -ru orig/Statistics/Distribution/Transform.hs new/Statistics/Distribution/Transform.hs
433−--- orig/Statistics/Distribution/Transform.hs 2014-02-19 18:51:48.636768606 +0200
434−+++ new/Statistics/Distribution/Transform.hs 2014-02-19 18:51:48.000000000 +0200
431+--- orig/Statistics/Distribution/Transform.hs 2014-04-14 09:04:31.421509375 +0300
432++++ new/Statistics/Distribution/Transform.hs 2014-04-14 09:04:31.000000000 +0300
435433@@ -1,5 +1,5 @@
436434 {-# LANGUAGE DeriveDataTypeable, DeriveGeneric, FlexibleContexts,
437435- FlexibleInstances, UndecidableInstances #-}
@@ -464,8 +462,8 @@ diff -ru orig/Statistics/Distribution/Transform.hs new/Statistics/Distribution/T
464462 -- | Apply linear transformation to distribution.
465463 scaleAround :: Double -- ^ Fixed point
466464diff -ru orig/Statistics/Distribution/Uniform.hs new/Statistics/Distribution/Uniform.hs
467−--- orig/Statistics/Distribution/Uniform.hs 2014-02-19 18:51:48.636768606 +0200
468−+++ new/Statistics/Distribution/Uniform.hs 2014-02-19 18:51:48.000000000 +0200
465+--- orig/Statistics/Distribution/Uniform.hs 2014-04-14 09:04:31.421509375 +0300
466++++ new/Statistics/Distribution/Uniform.hs 2014-04-14 09:04:31.000000000 +0300
469467@@ -1,4 +1,4 @@
470468-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-}
471469+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -497,8 +495,8 @@ diff -ru orig/Statistics/Distribution/Uniform.hs new/Statistics/Distribution/Uni
497495 -- | Create uniform distribution.
498496 uniformDistr :: Double -> Double -> UniformDistribution
499497diff -ru orig/Statistics/Math/RootFinding.hs new/Statistics/Math/RootFinding.hs
500−--- orig/Statistics/Math/RootFinding.hs 2014-02-19 18:51:48.636768606 +0200
501−+++ new/Statistics/Math/RootFinding.hs 2014-02-19 18:51:48.000000000 +0200
498+--- orig/Statistics/Math/RootFinding.hs 2014-04-14 09:04:31.421509375 +0300
499++++ new/Statistics/Math/RootFinding.hs 2014-04-14 09:04:31.000000000 +0300
502500@@ -1,4 +1,4 @@
503501-{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric #-}
504502+{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -540,8 +538,8 @@ diff -ru orig/Statistics/Math/RootFinding.hs new/Statistics/Math/RootFinding.hs
540538 instance Functor Root where
541539 fmap _ NotBracketed = NotBracketed
542540diff -ru orig/Statistics/Resampling/Bootstrap.hs new/Statistics/Resampling/Bootstrap.hs
543−--- orig/Statistics/Resampling/Bootstrap.hs 2014-02-19 18:51:48.636768606 +0200
544−+++ new/Statistics/Resampling/Bootstrap.hs 2014-02-19 18:51:48.000000000 +0200
541+--- orig/Statistics/Resampling/Bootstrap.hs 2014-04-14 09:04:31.421509375 +0300
542++++ new/Statistics/Resampling/Bootstrap.hs 2014-04-14 09:04:31.000000000 +0300
545543@@ -1,5 +1,5 @@
546544 {-# LANGUAGE DeriveDataTypeable, DeriveGeneric, OverloadedStrings,
547545- RecordWildCards #-}
@@ -574,8 +572,8 @@ diff -ru orig/Statistics/Resampling/Bootstrap.hs new/Statistics/Resampling/Boots
574572
575573 -- | Multiply the point, lower bound, and upper bound in an 'Estimate'
576574diff -ru orig/Statistics/Resampling.hs new/Statistics/Resampling.hs
577−--- orig/Statistics/Resampling.hs 2014-02-19 18:51:48.636768606 +0200
578−+++ new/Statistics/Resampling.hs 2014-02-19 18:51:48.000000000 +0200
575+--- orig/Statistics/Resampling.hs 2014-04-14 09:04:31.421509375 +0300
576++++ new/Statistics/Resampling.hs 2014-04-14 09:04:31.000000000 +0300
579577@@ -1,4 +1,4 @@
580578-{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric #-}
581579+{-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric, CPP #-}
@@ -596,8 +594,8 @@ diff -ru orig/Statistics/Resampling.hs new/Statistics/Resampling.hs
596594 -- | /O(e*r*s)/ Resample a data set repeatedly, with replacement,
597595 -- computing each estimate over the resampled data.
598596diff -ru orig/Statistics/Sample/KernelDensity/Simple.hs new/Statistics/Sample/KernelDensity/Simple.hs
599−--- orig/Statistics/Sample/KernelDensity/Simple.hs 2014-02-19 18:51:48.640768606 +0200
600−+++ new/Statistics/Sample/KernelDensity/Simple.hs 2014-02-19 18:51:48.000000000 +0200
597+--- orig/Statistics/Sample/KernelDensity/Simple.hs 2014-04-14 09:04:31.425509375 +0300
598++++ new/Statistics/Sample/KernelDensity/Simple.hs 2014-04-14 09:04:31.000000000 +0300
601599@@ -1,4 +1,4 @@
602600-{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, FlexibleContexts #-}
603601+{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, FlexibleContexts, CPP #-}
@@ -618,8 +616,8 @@ diff -ru orig/Statistics/Sample/KernelDensity/Simple.hs new/Statistics/Sample/Ke
618616 -- | Bandwidth estimator for an Epanechnikov kernel.
619617 epanechnikovBW :: Double -> Bandwidth
620618diff -ru orig/Statistics/Sample/Powers.hs new/Statistics/Sample/Powers.hs
621−--- orig/Statistics/Sample/Powers.hs 2014-02-19 18:51:48.636768606 +0200
622−+++ new/Statistics/Sample/Powers.hs 2014-02-19 18:51:48.000000000 +0200
619+--- orig/Statistics/Sample/Powers.hs 2014-04-14 09:04:31.421509375 +0300
620++++ new/Statistics/Sample/Powers.hs 2014-04-14 09:04:31.000000000 +0300
623621@@ -1,5 +1,5 @@
624622 {-# LANGUAGE BangPatterns, DeriveDataTypeable, DeriveGeneric,
625623- FlexibleContexts #-}
@@ -641,8 +639,8 @@ diff -ru orig/Statistics/Sample/Powers.hs new/Statistics/Sample/Powers.hs
641639 -- | O(/n/) Collect the /n/ simple powers of a sample.
642640 --
643641diff -ru orig/statistics.cabal new/statistics.cabal
644−--- orig/statistics.cabal 2014-02-19 18:51:48.676768606 +0200
645−+++ new/statistics.cabal 2014-02-19 18:51:48.000000000 +0200
642+--- orig/statistics.cabal 2014-04-14 09:04:31.429509375 +0300
643++++ new/statistics.cabal 2014-04-14 09:04:31.000000000 +0300
646644@@ -90,7 +90,7 @@
647645 Statistics.Test.Internal
648646 build-depends:
@@ -653,8 +651,8 @@ diff -ru orig/statistics.cabal new/statistics.cabal
653651 erf,
654652 monad-par >= 0.3.4,
655653diff -ru orig/tests/Tests/Distribution.hs new/tests/Tests/Distribution.hs
656−--- orig/tests/Tests/Distribution.hs 2014-02-19 18:51:48.676768606 +0200
657−+++ new/tests/Tests/Distribution.hs 2014-02-19 18:51:48.000000000 +0200
654+--- orig/tests/Tests/Distribution.hs 2014-04-14 09:04:31.425509375 +0300
655++++ new/tests/Tests/Distribution.hs 2014-04-14 09:04:31.000000000 +0300
658656@@ -188,7 +188,7 @@
659657
660658 -- Quantile is inverse of CDF
@@ -676,8 +674,8 @@ diff -ru orig/tests/Tests/Distribution.hs new/tests/Tests/Distribution.hs
676674
677675
678676diff -ru orig/tests/Tests/Function.hs new/tests/Tests/Function.hs
679−--- orig/tests/Tests/Function.hs 2014-02-19 18:51:48.676768606 +0200
680−+++ new/tests/Tests/Function.hs 2014-02-19 18:51:48.000000000 +0200
677+--- orig/tests/Tests/Function.hs 2014-04-14 09:04:31.425509375 +0300
678++++ new/tests/Tests/Function.hs 2014-04-14 09:04:31.000000000 +0300
681679@@ -1,7 +1,6 @@
682680 module Tests.Function ( tests ) where
683681
@@ -694,8 +692,8 @@ diff -ru orig/tests/Tests/Function.hs new/tests/Tests/Function.hs
694692+ pows = [1 .. 17 :: Int]
695693 lists = [ (2^m, [2^n+1 .. 2^m]) | (n,m) <- pows `zip` tail pows ]
696694diff -ru orig/tests/Tests/Transform.hs new/tests/Tests/Transform.hs
697−--- orig/tests/Tests/Transform.hs 2014-02-19 18:51:48.672768606 +0200
698−+++ new/tests/Tests/Transform.hs 2014-02-19 18:51:48.000000000 +0200
695+--- orig/tests/Tests/Transform.hs 2014-04-14 09:04:31.425509375 +0300
696++++ new/tests/Tests/Transform.hs 2014-04-14 09:04:31.000000000 +0300
699697@@ -15,7 +15,7 @@
700698 import Test.Framework (Test, testGroup)
701699 import Test.Framework.Providers.QuickCheck2 (testProperty)