criterion 0.5.0.5 → 0.5.0.7
raw patch · 4 files changed
+70/−53 lines, 4 filesdep ~Chartdep ~mwc-randomdep ~statisticsPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: Chart, mwc-random, statistics, vector, vector-algorithms
API changes (from Hackage documentation)
Files
- Criterion/Plot.hs +11/−6
- README +0/−40
- README.markdown +45/−0
- criterion.cabal +14/−7
Criterion/Plot.hs view
@@ -32,14 +32,15 @@ import System.IO (IOMode(..), Handle, hPutStr, withBinaryFile) import Text.Printf (printf) import qualified Criterion.MultiMap as M+import Criterion.IO (printError) #ifdef HAVE_CHART import Data.Accessor ((^=)) import Graphics.Rendering.Chart hiding (Plot,c)+#ifdef HAVE_GTK import Graphics.Rendering.Chart.Gtk (renderableToWindow)-#else-import Criterion.IO (printError) #endif+#endif plotWith :: Plot -> (PlotOutput -> IO ()) -> Criterion () plotWith p plot = getConfigItem (M.lookup p . cfgPlot)@@ -70,13 +71,15 @@ renderableToSVGFile (renderTiming desc times) x y (mangle $ printf "%s timings %dx%d.svg" desc x y) +#ifdef HAVE_GTK plotTiming (Window x y) desc times = renderableToWindow (renderTiming desc times) x y-#else+#endif+#endif+ plotTiming output _desc _times = printError "ERROR: output type %s not supported on this platform\n" (show output)-#endif -- | Plot kernel density estimate. plotKDE :: PlotOutput -- ^ The kind of output desired.@@ -105,13 +108,15 @@ renderableToSVGFile (renderKDE desc exs points pdf) x y (mangle $ printf "%s densities %dx%d.svg" desc x y) +#ifdef HAVE_GTK plotKDE (Window x y) desc exs points pdf = renderableToWindow (renderKDE desc exs points pdf) x y-#else+#endif+#endif+ plotKDE output _desc _exs _points _pdf = printError "ERROR: output type %s not supported on this platform\n" (show output)-#endif #ifdef HAVE_CHART renderTiming :: String -> Sample -> Renderable ()
− README
@@ -1,40 +0,0 @@-Criterion: robust, reliable performance measurement------------------------------------------------------This package provides the Criterion module, a Haskell library for-measuring and analysing the performance of Haskell programs.--To get started, read the documentation for the Criterion.Main module,-and take a look at the programs in the examples directory.---Building and installing--------------------------To build and install criterion, just run-- cabal install criterion--On Mac OS X, the Chart library that criterion uses is not available,-so you'll have to build without it.-- cabal install criterion -f-chart- -This will lose you the ability to generate charts, but you'll still be-able to generate CSV files and import them into your favourite-spreadsheet, or gnuplot, or whatnot.---Get involved!----------------Please feel welcome to contribute new code or bug fixes. You can-fetch the source repository from here:--http://bitbucket.org/bos/criterion---Authors----------Bryan O'Sullivan <bos@serpentine.com>
+ README.markdown view
@@ -0,0 +1,45 @@+# Criterion: robust, reliable performance measurement++This package provides the Criterion module, a Haskell library for+measuring and analysing the performance of Haskell programs.++To get started, read the documentation for the Criterion.Main module,+and take a look at the programs in the examples directory.+++# Building and installing++To build and install criterion, just run++ cabal install criterion++On Mac OS X, the Chart library that criterion uses is not available,+so you'll have to build without it.++ cabal install criterion -f-chart+ +This will lose you the ability to generate charts, but you'll still be+able to generate CSV files and import them into your favourite+spreadsheet, or gnuplot, or whatnot.+++# Get involved!++Please report bugs via the+[bitbucket issue tracker](http://bitbucket.org/bos/criterion).++Master [Mercurial repository](http://bitbucket.org/bos/criterion):++* `hg clone http://bitbucket.org/bos/criterion`++There's also a [git mirror](http://github.com/bos/criterion):++* `git clone git://github.com/bos/criterion.git`++(You can create and contribute changes using either Mercurial or git.)+++# Authors++This library is written and maintained by Bryan O'Sullivan,+<bos@serpentine.com>.
criterion.cabal view
@@ -1,5 +1,5 @@ name: criterion-version: 0.5.0.5+version: 0.5.0.7 synopsis: Robust, reliable performance measurement and analysis license: BSD3 license-file: LICENSE@@ -12,7 +12,7 @@ build-type: Simple cabal-version: >= 1.6 extra-source-files:- README+ README.markdown examples/Fibber.hs examples/Judy.hs examples/Makefile@@ -32,6 +32,10 @@ -- Broken under GHC 6.12 so far. default: False +flag gtk+ description: enable displaying charts in GTK+ windows+ default: False+ library exposed-modules: Criterion@@ -53,19 +57,22 @@ deepseq >= 1.1.0.0, filepath, mtl,- mwc-random >= 0.7.0.0,+ mwc-random >= 0.8.0.3, parallel, parsec >= 3.1.0,- statistics >= 0.6.0.0,+ statistics >= 0.8.0.5, time,- vector >= 0.6.0.2,- vector-algorithms >= 0.3.2+ vector >= 0.7.0.0,+ vector-algorithms >= 0.4 if flag(chart) build-depends:- Chart >= 0.13 && < 0.14,+ Chart >= 0.13 && < 0.15, data-accessor cpp-options: -DHAVE_CHART++ if flag(gtk)+ cpp-options: -DHAVE_GTK -- gather extensive profiling data for now ghc-prof-options: -auto-all