From 99a623690aa09663a8a444b0a08765214ea2de15 Mon Sep 17 00:00:00 2001 From: sprado Date: Tue, 15 Mar 2016 21:39:39 +0100 Subject: [PATCH] cout lines removed --- DRAMSys/simulator/src/simulation/Dram.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h index acb07ecd..dda5b998 100644 --- a/DRAMSys/simulator/src/simulation/Dram.h +++ b/DRAMSys/simulator/src/simulation/Dram.h @@ -167,7 +167,7 @@ struct Dram : sc_module memSpec.memArchSpec = memArchSpec; DRAMPower = new libDRAMPower( memSpec, 0 ); - SC_THREAD(window); + SC_THREAD(powerWindow); } printDebugMessage(string("ErrorStorageMode: ") + EnumToString(ErrorStoreMode)); @@ -194,9 +194,7 @@ struct Dram : sc_module DRAMPower->updateCounters(true); DRAMPower->calcEnergy(); printDebugMessage(string("\tCurrent Energy: \t") + to_string(DRAMPower->getEnergy().total_energy - totalEnergy)); - printDebugMessage(string("\tAverage Power: \t") + to_string((DRAMPower->getEnergy().total_energy - totalEnergy)/windowSize.value())); - cout << name() << string("\tTotal Energy: \t") + to_string(DRAMPower->getEnergy().total_energy) << endl; - cout << name() << string("\tAverage Power: \t") + to_string(DRAMPower->getPower().average_power) << endl; + printDebugMessage(string("\tAverage Power: \t") + to_string((DRAMPower->getEnergy().total_energy - totalEnergy)/windowSize.value())); } // Clean up: for (auto e : ememory) { @@ -205,7 +203,7 @@ struct Dram : sc_module //std::cout << "Simulated Memory Size: " << memory.size() << endl; // TODO Aufrauemen } - void window() + void powerWindow() { double currentAveragePower = 0; double currentTotalEnergy = 0;