summaryrefslogtreecommitdiff
path: root/base/statistics.hh
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2003-11-04 18:19:40 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2003-11-04 18:19:40 -0500
commitd7b25c80228a10a57deffb5ba4f654b35777e317 (patch)
tree2f497ca565090045cbbcef03c4de5df9e09459f7 /base/statistics.hh
parent293ee75117f1b401a3aff6c889d661299a98b0af (diff)
parent16d0b2f85ac8527895df09235124798ad6518779 (diff)
downloadgem5-d7b25c80228a10a57deffb5ba4f654b35777e317.tar.xz
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG-- extra : convert_revision : 81a644bebf1b9fe11ac767c097c2d457c5698e73
Diffstat (limited to 'base/statistics.hh')
-rw-r--r--base/statistics.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/statistics.hh b/base/statistics.hh
index aa3489727..fc3252782 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -1309,7 +1309,7 @@ struct DistStor
void FancyDisplay(std::ostream &stream, const std::string &name,
const std::string &desc, int precision, FormatFlags flags,
- result_t mean, result_t variance);
+ result_t mean, result_t variance, result_t total);
/**
* Templatized storage and interface for a distribution that calculates mean
@@ -1369,16 +1369,16 @@ struct FancyStor
result_t mean = NAN;
result_t variance = NAN;
+ result_t ftot = total;
if (total != 0) {
result_t fsum = sum;
result_t fsq = squares;
- result_t ftot = total;
mean = fsum / ftot;
variance = (ftot * fsq - (fsum * fsum)) / (ftot * (ftot - 1.0));
}
- FancyDisplay(stream, name, desc, precision, flags, mean, variance);
+ FancyDisplay(stream, name, desc, precision, flags, mean, variance, ftot);
}
/**