aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2014-09-15 16:54:19 -0600
committerJack Moffitt <jack@metajack.im>2014-09-15 16:54:19 -0600
commit6ed9680ba5964f4e53700853a50fd43a22f39cc9 (patch)
tree753e43a2f060c99dbfacdc5882f74d80bf3b6676
parent5f10d15e74ca5ee331a8271dede03fdca5adcb6c (diff)
parent587eaf4f5b8776d885ea6af337fdc5fc70dccfb9 (diff)
downloadservo-6ed9680ba5964f4e53700853a50fd43a22f39cc9.tar.gz
servo-6ed9680ba5964f4e53700853a50fd43a22f39cc9.zip
Merge pull request #3349 from LalehB/patch-3
Update PowerMeasure.py
-rw-r--r--tests/power/PowerMeasure.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/power/PowerMeasure.py b/tests/power/PowerMeasure.py
index 3a8f3977052..50cea349329 100644
--- a/tests/power/PowerMeasure.py
+++ b/tests/power/PowerMeasure.py
@@ -61,8 +61,8 @@ def PowerParser(OutputDir, LayoutThreads):
ExperimentNum = 21
ResultTable = OutputDir + "ResultTable.csv"
ResultFile = open(ResultTable, "w")
- ResultFile.write("LayoutThreads, MeanPower, MeanTime , MaxTime, "
- "MinTime , MaxPower , MinPower \n")
+ ResultFile.write("LayoutThreads, MeanPower, MaxPower , MinPower, MeanTime , MaxTime, "
+ "MinTime \n")
for layoutT in range(1, LayoutThreads+1):
MaxTime = 0
@@ -71,6 +71,8 @@ def PowerParser(OutputDir, LayoutThreads):
MinPower = 1000000
TotalPower = 0
TotalTime = 0
+ TimeGen = 0
+ PowerGen = 0
for ExpNum in range(1, ExperimentNum):
Files = OutputDir + 'power/' + 'power-Layout' + str(layoutT) + \
"-set" + str(ExpNum) + ".csv"
@@ -118,13 +120,15 @@ def PowerParser(OutputDir, LayoutThreads):
MaxTime = TotalTime
if TotalTime < MinTime:
MinTime = TotalTime
+ TimeGen = TimeGen + TotalTime
+ PowerGen = PowerGen + TotalPower
- TotalPower = TotalPower / float(ExperimentNum-1)
- TotalTime = TotalTime / float(ExperimentNum-1)
+ TotalPower = PowerGen / float(ExperimentNum-1)
+ TotalTime = TimeGen / float(ExperimentNum-1)
ResultFile.write(str(layoutT) + " , " + str(TotalPower) + " , " +
+ str(MaxPower) + " , " + str(MinPower) + " , " +
str(TotalTime) + " , " + str(MaxTime) + " , " +
- str(MinTime) + " , " + str(MaxPower) + " , " +
- str(MinPower) + "\n")
+ str(MinTime) + "\n")
ResultFile.close()
Opener = ResultFile = open(ResultTable, "r")
for line in Opener: