From f967e587f7a28ff417ed0469be32fd774893ed22 Mon Sep 17 00:00:00 2001
From: "Felipe S. Prado" <sprado@rhrk.uni-kl.de>
Date: Fri, 26 Aug 2016 13:09:06 +0200
Subject: [PATCH] tests.py and simple test fixed

---
 DRAMSys/analyzer/scripts/tests.py |  3 +++
 DRAMSys/tests/simple/expected.txt | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/DRAMSys/analyzer/scripts/tests.py b/DRAMSys/analyzer/scripts/tests.py
index 8185d44f..01de6560 100755
--- a/DRAMSys/analyzer/scripts/tests.py
+++ b/DRAMSys/analyzer/scripts/tests.py
@@ -147,6 +147,9 @@ class DramConfig(object):
             return self.clk*(self.burstLength - 1)
         elif (self.memoryType == "DDR4"):
             return self.clk*self.burstLength/self.dataRate
+        else: #DEFAULT
+            return self.clk*self.burstLength/self.dataRate
+
 
     def getReadAccessTime(self):
         return self.burstLength/self.dataRate * dramconfig.clk
diff --git a/DRAMSys/tests/simple/expected.txt b/DRAMSys/tests/simple/expected.txt
index 747722e2..95fe211d 100644
--- a/DRAMSys/tests/simple/expected.txt
+++ b/DRAMSys/tests/simple/expected.txt
@@ -1,25 +1,25 @@
 Info: /OSCI/SystemC: Simulation stopped by user.
-sim.dram0	Total Energy: 	4307074.21 pJ
-sim.dram0	Average Power: 	12.62 mW
+sim.dram0	Total Energy: 	4300303.75 pJ
+sim.dram0	Average Power: 	12.60 mW
 sim.dram0	Total Time: 	340669248 ps
 sim.dram0	AVG BW: 	1.00 GiB/s (4.81 %)
 sim.dram0	AVG BW/IDLE: 	10.64 GiB/s (51.27 %)
 sim.dram0	MAX BW: 	20.75 GiB/s
-sim.dram1	Total Energy: 	2184238.16 pJ
-sim.dram1	Average Power: 	6.40 mW
+sim.dram1	Total Energy: 	2157481.55 pJ
+sim.dram1	Average Power: 	6.32 mW
 sim.dram1	Total Time: 	0 s
 sim.dram1	AVG BW: 	-nan GiB/s (-nan %)
 sim.dram1	AVG BW/IDLE: 	-nan GiB/s (-nan %)
 sim.dram1	MAX BW: 	20.75 GiB/s
-sim.dram2	Total Energy: 	4212328.28 pJ
-sim.dram2	Average Power: 	12.34 mW
+sim.dram2	Total Energy: 	4202780.15 pJ
+sim.dram2	Average Power: 	12.31 mW
 sim.dram2	Total Time: 	340115040 ps
 sim.dram2	AVG BW: 	0.75 GiB/s (3.63 %)
 sim.dram2	AVG BW/IDLE: 	15.65 GiB/s (75.44 %)
 sim.dram2	MAX BW: 	20.75 GiB/s
-sim.dram3	Total Energy: 	2319885.40 pJ
-sim.dram3	Average Power: 	6.80 mW
+sim.dram3	Total Energy: 	2293679.84 pJ
+sim.dram3	Average Power: 	6.72 mW
 sim.dram3	Total Time: 	312862464 ps
 sim.dram3	AVG BW: 	0.03 GiB/s (0.14 %)
 sim.dram3	AVG BW/IDLE: 	9.21 GiB/s (44.40 %)
-sim.dram3	MAX BW: 	20.75 GiB/s
+sim.dram3	MAX BW: 	20.75 GiB/s
\ No newline at end of file