diff --git a/simulators/c++2/src_simulator/app/TMLTask.cpp b/simulators/c++2/src_simulator/app/TMLTask.cpp index aa68d606802432e61a6d644913b4634e6c22dfc3..7cd34c5d0f64ae82f08085cc0e9d1d7ddc871663 100644 --- a/simulators/c++2/src_simulator/app/TMLTask.cpp +++ b/simulators/c++2/src_simulator/app/TMLTask.cpp @@ -574,7 +574,7 @@ void TMLTask::schedule2HTML(std::ofstream& myfile) const { isBlankTooBig = true; changeCssClass = true; } - if ( aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) ){ + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()){ listScale.push_back(aBlanks+1); tempString << tempBlanks+1; if (beg + 1 > listScaleTime.back()) { diff --git a/simulators/c++2/src_simulator/arch/CPU.cpp b/simulators/c++2/src_simulator/arch/CPU.cpp index 01e591c63f92626c7215acd3c35e9d5bb484ee7b..3808fd7c6113870b2ee85d5a2e868fd9a8c34aee 100644 --- a/simulators/c++2/src_simulator/arch/CPU.cpp +++ b/simulators/c++2/src_simulator/arch/CPU.cpp @@ -267,7 +267,7 @@ std::cout << std::endl << "---- CPU HTML ----- " << std::endl; - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); std::cout << "ListScale: " << (aBlanks + 1) << std::endl; @@ -518,7 +518,7 @@ void CPU::HW2HTML(std::ofstream &myfile) const isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; @@ -699,7 +699,7 @@ void CPU::schedule2HTML(std::ofstream &myfile) const isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp index 7e9b9e9df76ca623c88f8447b524e33d314bb8fa..e43da25d6acd38bc3db4e9674ae2eb0bbbcd1676 100644 --- a/simulators/c++2/src_simulator/arch/FPGA.cpp +++ b/simulators/c++2/src_simulator/arch/FPGA.cpp @@ -859,7 +859,7 @@ std::map<TMLTask *, std::string> FPGA::HWTIMELINE2HTML(std::ostringstream &myfil { tempReconfigIdle << " "; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; @@ -1074,7 +1074,7 @@ void FPGA::HW2HTML(std::ofstream &myfile) isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; @@ -1238,7 +1238,7 @@ void FPGA::schedule2HTML(std::ofstream &myfile) changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; diff --git a/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp b/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp index 118e6de0b73a36a961aef3d062cb959272209cc8..fbe97a71b32dbc17806dc7ce77f28153799a1758 100644 --- a/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp +++ b/simulators/c++2/src_simulator/arch/MultiCoreCPU.cpp @@ -611,7 +611,7 @@ std::cout << std::endl << "---- Multicore HTML ----- " << std::endl; isBlankTooBig = true; changeCssClass = true; } - if ( aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) ){ + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()){ listScale.push_back(aBlanks+1); std::cout << "ListScale: " << (aBlanks+1) << '\n'; diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp index 75f15d1f40471288e8291c7f5579aae425241c20..240425701f7c5f4ff1186aeba38132324e693546 100644 --- a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp +++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp @@ -400,7 +400,7 @@ std::map<TMLTask *, std::string> SchedulableDevice::HWTIMELINE2HTML(std::ostring isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { // std::cout << "Case blank #1: assign transaction " << aCurrTrans->toShortString() << std::endl; listScale.push_back(aBlanks + 1); @@ -647,7 +647,7 @@ void SchedulableDevice::HW2HTML(std::ofstream &myfile) const isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1); tempString << tempBlanks + 1; @@ -834,7 +834,7 @@ void SchedulableDevice::schedule2HTML(std::ofstream &myfile) const isBlankTooBig = true; changeCssClass = true; } - if (aBlanks >= 0 && (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction())) + if (!(aCurrTrans->getCommand()->getActiveDelay()) && aCurrTrans->getCommand()->isDelayTransaction()) { listScale.push_back(aBlanks + 1);