From ac3051c78a1e30c01f2ea55dfb55b5f44cee6bfb Mon Sep 17 00:00:00 2001
From: Frederik Lauer <frederiklauer@me.com>
Date: Tue, 31 May 2016 00:23:10 +0200
Subject: [PATCH] Minor changes:  	printing values with precision 2 
 			printing Units without [ ]

---
 DRAMSys/simulator/src/simulation/Dram.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h
index 2d201ebe..0f860701 100644
--- a/DRAMSys/simulator/src/simulation/Dram.h
+++ b/DRAMSys/simulator/src/simulation/Dram.h
@@ -216,8 +216,8 @@ struct Dram : sc_module
             double averagePower = (totalEnergy / sc_time_stamp().to_seconds()) / 1e9;
 
             // Print the final total energy and the average power for the simulation
-            cout << name() << string("\tTotal Energy: \t") + to_string(totalEnergy) + string("\t[pJ]") << endl;
-            cout << name() << string("\tAverage Power: \t") + to_string(averagePower) + string("\t[mW]") << endl;
+            cout << name() << string("\tTotal Energy: \t")  << fixed <<std::setprecision( 2 )<< totalEnergy << string(" pJ") << endl;
+            cout << name() << string("\tAverage Power: \t") << fixed <<std::setprecision( 2 )<< averagePower<< string(" mW") << endl;
         }
 
         // Bandwidth:
@@ -232,7 +232,7 @@ struct Dram : sc_module
         double maxBandwidth = ( (1000000/Configuration::getInstance().memSpec.clk.to_double())  *  Configuration::getInstance().memSpec.DataRate   *  Configuration::getInstance().memSpec.BusWidth ) / ( 1024 );
         cout << name() << string("\tTotal Time: \t")            <<(endTime-startTime).to_string() << endl;
         cout << name() << string("\tTotal IDLE: \t")            <<idleTime.to_string() << endl;
-        cout << name() << string("\tTotal Active: \t")          << activeTime.to_string() << endl;
+        cout << name() << string("\tTotal Active DataBus: \t")          << activeTime.to_string() << endl;
         cout << name() << string("\tAVG BW: \t")         <<std::fixed<<std::setprecision(2) << ((bandwidth/100)*maxBandwidth)  << " GiB/s (" << bandwidth << " %)" << endl;
         cout << name() << string("\tAVG BW/IDLE: \t")    <<std::fixed<<std::setprecision(2) << ((bandwidth_IDLE/100)*maxBandwidth) <<" GiB/s ("<< (bandwidth_IDLE) << " %)" << endl;
         cout << name() << string("\tMAX BW: \t")         <<std::fixed<<std::setprecision(2) <<maxBandwidth << " GiB/s" << endl;