darcs-benchmark 0.1.8.1 → 0.1.8.2

raw patch · 3 files changed

+9/−9 lines, 3 files

Files

• Definitions.hs +7/−7
• Report.hs +1/−1
• darcs-benchmark.cabal +1/−1

@@ -6,6 +6,7 @@ import Data.IORef import Data.List import Data.Maybe+import Data.Ord import Data.Time import Network.BSD ( HostName, getHostName ) import Statistics.Sample@@ -211,21 +212,20 @@ -- Reformat (test, output) array as a square table by (core) Repository repoTables :: [Benchmark ()] -> [(Test a, Maybe MemTimeOutput)] -> [RepoTable] repoTables benchmarks results = [RepoTable { rtRepo = reponame (head repo)-                                           , rtColumns = columns+                                           , rtColumns = columns repo                                            , rtRows = rows                                            , rtTable = table repo                                            } | repo <- reposResults]  where-  reposResults = groupBy sameRepo $ sortBy repoOrder results-  sameRepo (Test _ tr1 _, _) (Test _ tr2 _, _) = trCoreName tr1 == trCoreName tr2+  reposResults = groupBy (on (==) reponame) $ sortBy repoOrder results   reponame (Test _ tr _, _) = trCoreName tr-  repoOrder a b = compare (reponame a) (reponame b)+  repoOrder = comparing reponame   --   rows = map description . filter hasBenchmark $ benchmarks   hasBenchmark b = any (\ (Test tb _ _, _) -> description tb == description b) results   ---  columns = map mkColName columnInfos-  columnInfos = nub [ (b, trName tr) | (Test _ tr b, _) <- results ]+  columns repo = map mkColName $ columnInfos repo+  columnInfos repo = nub [ (b, trName tr) | (Test _ tr b, _) <- repo ]   mkColName (TestBinary b, tname) =     let v = nameToVariant tname         prefix = case vId v of@@ -239,7 +239,7 @@   table repo = [(tu (tableRow row), map justMemTimeOutput $ tableRow row)                | row <- rows]     where-      tableRow row = [find (match row col) repo | col <- columnInfos]+      tableRow row = [find (match row col) repo | col <- columnInfos repo]       getTime (Just (_, Just mt)) = Just (mtTimeMean mt)       getTime _ = Nothing       tu row = case mapMaybe getTime row of

@@ -139,7 +139,7 @@     map detail [ "GHC version"                , "Machine description", "Year", "CPU", "Memory", "Hard disk"                , "Notes" ]-  detail k = k ++ "\n    ????"+  detail k = k ++ "\n    *Replace Me*"   --   descriptions_of_variants = intercalate "\n" $     map (describe . toVariant) [ OptimizePristineVariant ]

@@ -1,5 +1,5 @@ name:          darcs-benchmark-version:       0.1.8.1+version:       0.1.8.2 synopsis:      Comparative benchmark suite for darcs.  description: A simple tool to compare performance of different Darcs 2.x