derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5

Browse Source 
--HG--
extra : convert_revision : 81a644bebf1b9fe11ac767c097c2d457c5698e73
This commit is contained in:
Lisa Hsu
2003-11-04 18:19:40 -05:00
parent 293ee75117 16d0b2f85a
commit d7b25c8022
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base/statistics.cc
View File

@@ -886,14 +886,18 @@ DistDisplay(ostream &stream, const string &name, const string &desc,
}
#endif
/**
* @todo get rid of the ugly hack **Ignore for total
*/
void
FancyDisplay(ostream &stream, const string &name, const string &desc,
int precision, FormatFlags flags, result_t mean,
result_t variance)
result_t variance, result_t total)
{
result_t stdev = isnan(variance) ? NAN : sqrt(variance);
PrintOne(stream, mean, name + NAMESEP + "mean", desc, precision, flags);
PrintOne(stream, stdev, name + NAMESEP + "stdev", desc, precision, flags);
PrintOne(stream, total, "**Ignore: " + name + NAMESEP + "TOT", desc, precision, flags);
}
BinBase::BinBase()

6
base/statistics.hh
View File

@@ -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);
}
/**