From fa29d16c7dc7b45a940e38dabd92e4118591d8dc Mon Sep 17 00:00:00 2001
From: keithw <unknown>
Date: Thu, 2 Mar 2000 11:39:45 +0000
Subject: [PATCH] [project @ 2000-03-02 11:39:45 by keithw] Move `Average' line
back to bottom of table to save confusion.
---
glafp-utils/nofib-analyse/Main.hs | 33 ++++++++++++++++---------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/glafp-utils/nofib-analyse/Main.hs b/glafp-utils/nofib-analyse/Main.hs
index c5f4b3c71390..299b6f81d0ba 100644
--- a/glafp-utils/nofib-analyse/Main.hs
+++ b/glafp-utils/nofib-analyse/Main.hs
@@ -1,5 +1,5 @@
-----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.2 2000/03/01 18:38:45 keithw Exp $
+-- $Id: Main.hs,v 1.3 2000/03/02 11:39:45 keithw Exp $
-- (c) Simon Marlow 1997-1999
-----------------------------------------------------------------------------
@@ -158,10 +158,10 @@ htmlShowResults
htmlShowResults (r:rs) ss f stat result_ok
= tabHeader ss
+/+ foldr1 (+/+) (zipWith tableRow [1..] results_per_prog)
- +/+ foldr1 (+/+) (tableRow (-1) ("Average", gms)
- : if nodevs then []
- else [tableRow (-1) ("-1 s.d.", lows),
- tableRow (-1) ("+1 s.d.", highs)])
+ +/+ foldr1 (+/+) ((if nodevs then []
+ else [tableRow (-1) ("-1 s.d.", lows),
+ tableRow (-1) ("+1 s.d.", highs)])
+ ++ [tableRow (-1) ("Average", gms)])
where
-- results_per_prog :: [ (String,[BoxValue a]) ]
results_per_prog = map (calc_result rs f stat result_ok) (fmToList r)
@@ -180,13 +180,14 @@ htmlShowMultiResults
htmlShowMultiResults (r:rs) ss f result_ok =
multiTabHeader ss
+/+ foldr1 (+/+) (map show_results_for_prog results_per_prog_mod_run)
- +/+ foldr1 (+/+) ((cellHtml [] (bold [] (htmlStr "Average"))
- +-+ tableRow (-1) ("", gms))
- : if nodevs then []
- else [(cellHtml [] (bold [] (htmlStr "-1 s.d.")))
- +-+ tableRow (-1) ("", lows),
- (cellHtml [] (bold [] (htmlStr "+1 s.d.")))
- +-+ tableRow (-1) ("", highs)])
+ +/+ foldr1 (+/+) ((if nodevs then []
+ else [(cellHtml [] (bold [] (htmlStr "-1 s.d.")))
+ +-+ tableRow (-1) ("", lows),
+ (cellHtml [] (bold [] (htmlStr "+1 s.d.")))
+ +-+ tableRow (-1) ("", highs)])
+ ++ [cellHtml [] (bold [] (htmlStr "Average"))
+ +-+ tableRow (-1) ("", gms)])
+
where
base_results = fmToList r :: [(String,Results)]
@@ -312,13 +313,13 @@ ascii_show_results
ascii_show_results (r:rs) ss f stat result_ok
= ascii_header ss
. interleave "\n" (map show_per_prog_results results_per_prog)
- . str "\n"
- . show_per_prog_results ("Average",gms)
. if nodevs then id
else str "\n"
. show_per_prog_results ("-1 s.d.",lows)
. str "\n"
. show_per_prog_results ("+1 s.d.",highs)
+ . str "\n"
+ . show_per_prog_results ("Average",gms)
where
-- results_per_prog :: [ (String,[BoxValue a]) ]
results_per_prog = map (calc_result rs f stat result_ok) (fmToList r)
@@ -338,13 +339,13 @@ ascii_show_multi_results (r:rs) ss f result_ok
= ascii_header ss
. interleave "\n" (map show_results_for_prog results_per_prog_mod_run)
. str "\n"
- . str "\n"
- . show_per_prog_results ("Average",gms)
. if nodevs then id
else str "\n"
. show_per_prog_results ("-1 s.d.",lows)
. str "\n"
. show_per_prog_results ("+1 s.d.",highs)
+ . str "\n"
+ . show_per_prog_results ("Average",gms)
where
base_results = fmToList r :: [(String,Results)]
--
GitLab