diff --git a/util/stats/stats.py b/util/stats/stats.py index 7f3761a92..62819c397 100755 --- a/util/stats/stats.py +++ b/util/stats/stats.py @@ -1,6 +1,6 @@ #!/usr/bin/env python from __future__ import division -import re, sys +import re, sys, math def usage(): print '''\ @@ -255,28 +255,47 @@ def commands(options, command, args): #loop through all the stats selected for stat in stats: - avg = float(stat) + print "%s:" % stat.name + print "%-30s %12s %12s %4s %5s %5s %5s" % \ + ("run name", "average", "stdev", ">10%", ">1SDV", ">2SDV", "SAMP") + print "%-30s %12s %12s %4s %5s %5s %5s" % \ + ("------------------------------", "------------", + "------------", "----", "-----", "-----", "-----") #loop through all the selected runs for run in runs: info.display_run = run.run; - #print run.name - #print avg runTicks = info.source.retTicks([ run ]) #throw away the first one, it's 0 runTicks.pop(0) + stat.ticks = runTicks + avg = float(stat) + stdev = 0 + numoutsideavg = 0 + numoutside1std = 0 + numoutside2std = 0 #loop through all the various ticks for each run for tick in runTicks: stat.ticks = str(tick) val = float(stat) if (val < (avg * .9)) or (val > (avg * 1.1)): - print '%s:%s is %f, which is more than 10%% of the'\ - 'mean %f' % (run.name, stat.name, stat, avg) - - + numoutsideavg += 1 + stdev += pow((val-avg),2) + stdev = math.sqrt(stdev / len(runTicks)) + for tick in runTicks: + stat.ticks = str(tick) + val = float(stat) + if (val < (avg - stdev)) or (val > (avg + stdev)): + numoutside1std += 1 + if (val < (avg - (2*stdev))) or (val > (avg + (2*stdev))): + numoutside2std += 1 + print "%-30s %12s %12s %4s %5s %5s %5s" % \ + (run.name, "%.1f" % avg, "%.1f" % stdev, + "%d" % numoutsideavg, "%d" % numoutside1std, + "%d" % numoutside2std, "%d" % len(runTicks)) return