summaryrefslogtreecommitdiff
path: root/src/unittest/stattest.cc
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2006-06-11 23:02:50 -0400
committerNathan Binkert <binkertn@umich.edu>2006-06-11 23:02:50 -0400
commitdf4b4f001e4db902297acf3b75480e4886e4e882 (patch)
tree5f1053fe9a36fb7b11750db8e4fab1d089ea94d0 /src/unittest/stattest.cc
parente0140202bd5f0d16d25e526283047e5a2ef5dc0c (diff)
parent3c95f5958fd1a90cf83d85e1b24fb700c07bae91 (diff)
downloadgem5-df4b4f001e4db902297acf3b75480e4886e4e882.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into iceaxe.:/Volumes/work/research/m5/newmem --HG-- extra : convert_revision : e457e807b29d8ff88ac335cd50acd596e7e31eee
Diffstat (limited to 'src/unittest/stattest.cc')
-rw-r--r--src/unittest/stattest.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 496d1f672..4e504fde9 100644
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -50,10 +50,10 @@ Tick ticksPerSecond = ULL(2000000000);
Scalar<> s1;
Scalar<> s2;
Average<> s3;
-Scalar<MainBin> s4;
-Vector<MainBin> s5;
-Distribution<MainBin> s6;
-Vector<MainBin> s7;
+Scalar<> s4;
+Vector<> s5;
+Distribution<> s6;
+Vector<> s7;
AverageVector<> s8;
StandardDeviation<> s9;
AverageDeviation<> s10;
@@ -72,9 +72,6 @@ Value f5;
Formula f6;
Formula f7;
-MainBin bin1("bin1");
-MainBin bin2("bin2");
-
ostream *outputStream = &cout;
double
@@ -303,8 +300,6 @@ main(int argc, char *argv[])
check();
reset();
- bin1.activate();
-
s16[1][0] = 1;
s16[0][1] = 3;
s16[0][0] = 2;
@@ -495,7 +490,6 @@ main(int argc, char *argv[])
s6.sample(8);
s6.sample(9);
- bin2.activate();
s6.sample(10);
s6.sample(10);
s6.sample(10);