Move common summary functionality to Data.Summary.Utils

meteficha · Sep 16, 2010 · a36ed51 · a36ed51
1 parent a0fcbeb
commit a36ed51
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/examples/Binomial.hs b/examples/Binomial.hs
@@ -7,6 +7,7 @@ import Text.Printf( printf )
 
 import Control.Monad.MC
 import Data.Summary
+import Data.Summary.Utils( inInterval )
 
 -- | Sample from a binomial distribution with the given parameters.
 binomial :: (MonadMC m) => Int -> Double -> m Int

diff --git a/examples/Pi.lhs b/examples/Pi.lhs
@@ -6,7 +6,8 @@ of them fall in the unit circle.
 \begin{code}
 import Control.Monad( liftM, liftM2 )
 import Control.Monad.MC( MC, uniform, replicateMC, evalMC, mt19937 )
-import Data.Summary.Bool( summary, sampleMean, sampleSE, interval )
+import Data.Summary.Bool( summary, sampleMean, sampleSE )
+import Data.Summary.Utils( interval )
 import Text.Printf
 \end{code}
 

diff --git a/lib/Data/Summary/Bool.hs b/lib/Data/Summary/Bool.hs
@@ -22,15 +22,13 @@ module Data.Summary.Bool (
     sampleSE,
     sampleCI,
 
-    -- * Confidence intervals
-    module Data.Summary.Common,
-
     ) where
 
 import Data.List( foldl' )
 import Text.Printf
 
-import Data.Summary.Common
+import Data.Summary.Utils
+
 
 -- | A type for storing summary statistics for a data set of
 -- booleans.  Specifically, this just keeps track of the number

diff --git a/lib/Data/Summary/Double.hs b/lib/Data/Summary/Double.hs
@@ -25,15 +25,12 @@ module Data.Summary.Double (
     sampleSD,
     sampleCI,
 
-    -- * Confidence intervals
-    module Data.Summary.Common,
-
     ) where
 
 import Data.List( foldl' )
 import Text.Printf
 
-import Data.Summary.Common
+import Data.Summary.Utils
 
 
 -- | A type for storing summary statistics for a data set including

diff --git a/lib/Data/Summary/Utils.hs b/lib/Data/Summary/Utils.hs
@@ -1,13 +1,15 @@
 -----------------------------------------------------------------------------
 -- |
--- Module     : Data.Summary.Common
+-- Module     : Data.Summary.Utils
 -- Copyright  : Copyright (c) , Patrick Perry <patperry@stanford.edu>
 -- License    : BSD3
 -- Maintainer : Patrick Perry <patperry@stanford.edu>
 -- Stability  : experimental
 --
+-- Utilities for data summaries.
+--
 
-module Data.Summary.Common (
+module Data.Summary.Utils (
     interval,
     inInterval,
     ) where

diff --git a/monte-carlo.cabal b/monte-carlo.cabal
@@ -23,18 +23,18 @@ library
     exposed-modules: 
             Control.Monad.MC
             Control.Monad.MC.Class
+            Control.Monad.MC.GSL
             Data.Summary
             Data.Summary.Bool
             Data.Summary.Double
+            Data.Summary.Utils
 
     other-modules:
             Control.Monad.MC.Base
-            Control.Monad.MC.GSL
             Control.Monad.MC.GSLBase
             Control.Monad.MC.Repeat
             Control.Monad.MC.Sample
             Control.Monad.MC.Walker
-            Data.Summary.Common
 
     extensions:
             FlexibleInstances,