From a632f28c36ec40c0d92318195dcb790845211588 Mon Sep 17 00:00:00 2001
From: juanmanuel <jneyra@uni-bremen.de>
Date: Wed, 13 Nov 2024 09:48:55 -0500
Subject: [PATCH] fix: logs added and bugs fixed

---
 CMakeLists.txt                               |   9 +-
 README.md                                    |   5 +-
 config/ai_test/data.xml                      | 388 +++++++++----------
 src/main.cpp                                 |   4 +
 src/networkInterface/NetworkInterfaceTlm.cpp |  17 +-
 src/networkInterface/NetworkInterfaceTlm.h   |   3 +-
 src/router/router.cpp                        |   6 +-
 src/router/router.h                          |   3 +
 src/router/router_cs.cpp                     |   1 +
 src/utils/report.cpp                         |  81 ++++
 src/utils/report.h                           |  39 +-
 11 files changed, 337 insertions(+), 219 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9924173..876fee7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ ADD_EXECUTABLE(${PROJECT_NAME}
     src/utils/memory_manager.cpp 
     src/utils/utils.cpp 
     src/utils/noc_logger.cpp 
+    src/utils/report.cpp 
     src/ratatoskrUtils/utils/Report.cpp 
     src/ratatoskrUtils/utils/GlobalReport.cpp 
     src/ratatoskrUtils/utils/Structures.cpp 
@@ -46,13 +47,7 @@ ADD_EXECUTABLE(${PROJECT_NAME}
     src/ratatoskrUtils/traffic/synthetic/SyntheticPool.cpp 
     src/ratatoskrUtils/traffic/task/TaskPool.cpp 
     src/ratatoskrUtils/traffic/TrafficPool.cpp 
-    src/ratatoskrUtils/link/Link.cpp 
-    src/ratatoskrUtils/traffic/netrace/NetracePool.cpp 
-    src/ratatoskrUtils/traffic/netrace/NetracePool.h 
-    src/ratatoskrUtils/traffic/netrace/ntNetrace.h 
-    src/ratatoskrUtils/traffic/netrace/ntNetrace.cpp 
-    src/ratatoskrUtils/traffic/netrace/ntQueue.h 
-    src/ratatoskrUtils/traffic/netrace/ntQueue.cpp 
+    src/ratatoskrUtils/link/Link.cpp
     src/ratatoskrUtils/utils/TrafficTracer.cpp 
 )
 
diff --git a/README.md b/README.md
index dbf0838..7b423ff 100755
--- a/README.md
+++ b/README.md
@@ -47,4 +47,7 @@ This project is licensed under the MIT License - see the LICENSE.md file for det
 
 ## Acknowledgments
 
-* [Ratatoskr NoC simulator](https://github.com/jmjos/ratatoskr)
\ No newline at end of file
+* [Ratatoskr NoC simulator](https://github.com/jmjos/ratatoskr)
+
+### TODO
+- Check why there is no throttled messages for router
\ No newline at end of file
diff --git a/config/ai_test/data.xml b/config/ai_test/data.xml
index 49545fa..c9b79da 100755
--- a/config/ai_test/data.xml
+++ b/config/ai_test/data.xml
@@ -266,7 +266,7 @@
             <destination id="0">
               <delay min="5" max="5"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="0"/>
               <task value="1"/>
             </destination>
@@ -286,7 +286,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="1"/>
               <task value="2"/>
             </destination>
@@ -297,7 +297,7 @@
         <requirement id="0">
           <type value="0"/>
           <source value="0"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -312,7 +312,7 @@
             <destination id="0">
               <delay min="198" max="198"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="2"/>
               <task value="3"/>
             </destination>
@@ -323,7 +323,7 @@
         <requirement id="0">
           <type value="1"/>
           <source value="1"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -338,7 +338,7 @@
             <destination id="0">
               <delay min="352" max="352"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="3"/>
               <task value="4"/>
             </destination>
@@ -349,7 +349,7 @@
         <requirement id="0">
           <type value="2"/>
           <source value="2"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -364,7 +364,7 @@
             <destination id="0">
               <delay min="1055" max="1055"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="4"/>
               <task value="5"/>
             </destination>
@@ -375,7 +375,7 @@
         <requirement id="0">
           <type value="3"/>
           <source value="3"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -390,7 +390,7 @@
             <destination id="0">
               <delay min="149" max="149"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="5"/>
               <task value="6"/>
             </destination>
@@ -401,7 +401,7 @@
         <requirement id="0">
           <type value="4"/>
           <source value="4"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -416,14 +416,14 @@
             <destination id="0">
               <delay min="396" max="396"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="6"/>
               <task value="7"/>
             </destination>
             <destination id="1">
               <delay min="396" max="396"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="6"/>
               <task value="10"/>
             </destination>
@@ -434,7 +434,7 @@
         <requirement id="0">
           <type value="5"/>
           <source value="5"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -449,7 +449,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="7"/>
               <task value="8"/>
             </destination>
@@ -460,7 +460,7 @@
         <requirement id="0">
           <type value="6"/>
           <source value="6"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -475,7 +475,7 @@
             <destination id="0">
               <delay min="223" max="223"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="8"/>
               <task value="9"/>
             </destination>
@@ -486,7 +486,7 @@
         <requirement id="0">
           <type value="7"/>
           <source value="7"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -501,7 +501,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="9"/>
               <task value="10"/>
             </destination>
@@ -512,7 +512,7 @@
         <requirement id="0">
           <type value="8"/>
           <source value="8"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -527,14 +527,14 @@
             <destination id="0">
               <delay min="3" max="3"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="10"/>
               <task value="11"/>
             </destination>
             <destination id="1">
               <delay min="3" max="3"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="10"/>
               <task value="14"/>
             </destination>
@@ -545,12 +545,12 @@
         <requirement id="0">
           <type value="6"/>
           <source value="6"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="9"/>
           <source value="9"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -565,7 +565,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="11"/>
               <task value="12"/>
             </destination>
@@ -576,7 +576,7 @@
         <requirement id="0">
           <type value="10"/>
           <source value="10"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -591,7 +591,7 @@
             <destination id="0">
               <delay min="223" max="223"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="12"/>
               <task value="13"/>
             </destination>
@@ -602,7 +602,7 @@
         <requirement id="0">
           <type value="11"/>
           <source value="11"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -617,7 +617,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="13"/>
               <task value="14"/>
             </destination>
@@ -628,7 +628,7 @@
         <requirement id="0">
           <type value="12"/>
           <source value="12"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -643,7 +643,7 @@
             <destination id="0">
               <delay min="3" max="3"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="14"/>
               <task value="15"/>
             </destination>
@@ -654,12 +654,12 @@
         <requirement id="0">
           <type value="10"/>
           <source value="10"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="13"/>
           <source value="13"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -674,7 +674,7 @@
             <destination id="0">
               <delay min="593" max="593"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="15"/>
               <task value="16"/>
             </destination>
@@ -685,7 +685,7 @@
         <requirement id="0">
           <type value="14"/>
           <source value="14"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -700,7 +700,7 @@
             <destination id="0">
               <delay min="160" max="160"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="16"/>
               <task value="17"/>
             </destination>
@@ -711,7 +711,7 @@
         <requirement id="0">
           <type value="15"/>
           <source value="15"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -726,14 +726,14 @@
             <destination id="0">
               <delay min="306" max="306"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="17"/>
               <task value="18"/>
             </destination>
             <destination id="1">
               <delay min="306" max="306"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="17"/>
               <task value="21"/>
             </destination>
@@ -744,7 +744,7 @@
         <requirement id="0">
           <type value="16"/>
           <source value="16"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -759,7 +759,7 @@
             <destination id="0">
               <delay min="612" max="612"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="18"/>
               <task value="19"/>
             </destination>
@@ -770,7 +770,7 @@
         <requirement id="0">
           <type value="17"/>
           <source value="17"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -785,7 +785,7 @@
             <destination id="0">
               <delay min="319" max="319"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="19"/>
               <task value="20"/>
             </destination>
@@ -796,7 +796,7 @@
         <requirement id="0">
           <type value="18"/>
           <source value="18"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -811,7 +811,7 @@
             <destination id="0">
               <delay min="612" max="612"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="20"/>
               <task value="21"/>
             </destination>
@@ -822,7 +822,7 @@
         <requirement id="0">
           <type value="19"/>
           <source value="19"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -837,14 +837,14 @@
             <destination id="0">
               <delay min="2" max="2"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="21"/>
               <task value="22"/>
             </destination>
             <destination id="1">
               <delay min="2" max="2"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="21"/>
               <task value="25"/>
             </destination>
@@ -855,12 +855,12 @@
         <requirement id="0">
           <type value="17"/>
           <source value="17"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="20"/>
           <source value="20"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -875,7 +875,7 @@
             <destination id="0">
               <delay min="612" max="612"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="22"/>
               <task value="23"/>
             </destination>
@@ -886,7 +886,7 @@
         <requirement id="0">
           <type value="21"/>
           <source value="21"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -901,7 +901,7 @@
             <destination id="0">
               <delay min="319" max="319"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="23"/>
               <task value="24"/>
             </destination>
@@ -912,7 +912,7 @@
         <requirement id="0">
           <type value="22"/>
           <source value="22"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -927,7 +927,7 @@
             <destination id="0">
               <delay min="612" max="612"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="24"/>
               <task value="25"/>
             </destination>
@@ -938,7 +938,7 @@
         <requirement id="0">
           <type value="23"/>
           <source value="23"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -953,7 +953,7 @@
             <destination id="0">
               <delay min="2" max="2"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="25"/>
               <task value="26"/>
             </destination>
@@ -964,12 +964,12 @@
         <requirement id="0">
           <type value="21"/>
           <source value="21"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="24"/>
           <source value="24"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -984,7 +984,7 @@
             <destination id="0">
               <delay min="612" max="612"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="26"/>
               <task value="27"/>
             </destination>
@@ -995,7 +995,7 @@
         <requirement id="0">
           <type value="25"/>
           <source value="25"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1010,7 +1010,7 @@
             <destination id="0">
               <delay min="31" max="31"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="27"/>
               <task value="28"/>
             </destination>
@@ -1021,7 +1021,7 @@
         <requirement id="0">
           <type value="26"/>
           <source value="26"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1036,14 +1036,14 @@
             <destination id="0">
               <delay min="298" max="298"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="28"/>
               <task value="29"/>
             </destination>
             <destination id="1">
               <delay min="298" max="298"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="28"/>
               <task value="32"/>
             </destination>
@@ -1054,7 +1054,7 @@
         <requirement id="0">
           <type value="27"/>
           <source value="27"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1069,7 +1069,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="29"/>
               <task value="30"/>
             </destination>
@@ -1080,7 +1080,7 @@
         <requirement id="0">
           <type value="28"/>
           <source value="28"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1095,7 +1095,7 @@
             <destination id="0">
               <delay min="56" max="56"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="30"/>
               <task value="31"/>
             </destination>
@@ -1106,7 +1106,7 @@
         <requirement id="0">
           <type value="29"/>
           <source value="29"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1121,7 +1121,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="31"/>
               <task value="32"/>
             </destination>
@@ -1132,7 +1132,7 @@
         <requirement id="0">
           <type value="30"/>
           <source value="30"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1147,14 +1147,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="32"/>
               <task value="33"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="32"/>
               <task value="36"/>
             </destination>
@@ -1165,12 +1165,12 @@
         <requirement id="0">
           <type value="28"/>
           <source value="28"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="31"/>
           <source value="31"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1185,7 +1185,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="33"/>
               <task value="34"/>
             </destination>
@@ -1196,7 +1196,7 @@
         <requirement id="0">
           <type value="32"/>
           <source value="32"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1211,7 +1211,7 @@
             <destination id="0">
               <delay min="56" max="56"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="34"/>
               <task value="35"/>
             </destination>
@@ -1222,7 +1222,7 @@
         <requirement id="0">
           <type value="33"/>
           <source value="33"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1237,7 +1237,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="35"/>
               <task value="36"/>
             </destination>
@@ -1248,7 +1248,7 @@
         <requirement id="0">
           <type value="34"/>
           <source value="34"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1263,14 +1263,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="36"/>
               <task value="37"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="36"/>
               <task value="40"/>
             </destination>
@@ -1281,12 +1281,12 @@
         <requirement id="0">
           <type value="32"/>
           <source value="32"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="35"/>
           <source value="35"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1301,7 +1301,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="37"/>
               <task value="38"/>
             </destination>
@@ -1312,7 +1312,7 @@
         <requirement id="0">
           <type value="36"/>
           <source value="36"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1327,7 +1327,7 @@
             <destination id="0">
               <delay min="56" max="56"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="38"/>
               <task value="39"/>
             </destination>
@@ -1338,7 +1338,7 @@
         <requirement id="0">
           <type value="37"/>
           <source value="37"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1353,7 +1353,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="39"/>
               <task value="40"/>
             </destination>
@@ -1364,7 +1364,7 @@
         <requirement id="0">
           <type value="38"/>
           <source value="38"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1379,7 +1379,7 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="40"/>
               <task value="41"/>
             </destination>
@@ -1390,12 +1390,12 @@
         <requirement id="0">
           <type value="36"/>
           <source value="36"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="39"/>
           <source value="39"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1410,7 +1410,7 @@
             <destination id="0">
               <delay min="546" max="546"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="41"/>
               <task value="42"/>
             </destination>
@@ -1421,7 +1421,7 @@
         <requirement id="0">
           <type value="40"/>
           <source value="40"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1436,7 +1436,7 @@
             <destination id="0">
               <delay min="155" max="155"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="42"/>
               <task value="43"/>
             </destination>
@@ -1447,7 +1447,7 @@
         <requirement id="0">
           <type value="41"/>
           <source value="41"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1462,14 +1462,14 @@
             <destination id="0">
               <delay min="744" max="744"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="43"/>
               <task value="44"/>
             </destination>
             <destination id="1">
               <delay min="744" max="744"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="43"/>
               <task value="47"/>
             </destination>
@@ -1480,7 +1480,7 @@
         <requirement id="0">
           <type value="42"/>
           <source value="42"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1495,7 +1495,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="44"/>
               <task value="45"/>
             </destination>
@@ -1506,7 +1506,7 @@
         <requirement id="0">
           <type value="43"/>
           <source value="43"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1521,7 +1521,7 @@
             <destination id="0">
               <delay min="212" max="212"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="45"/>
               <task value="46"/>
             </destination>
@@ -1532,7 +1532,7 @@
         <requirement id="0">
           <type value="44"/>
           <source value="44"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1547,7 +1547,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="46"/>
               <task value="47"/>
             </destination>
@@ -1558,7 +1558,7 @@
         <requirement id="0">
           <type value="45"/>
           <source value="45"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1573,14 +1573,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="47"/>
               <task value="48"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="47"/>
               <task value="51"/>
             </destination>
@@ -1591,12 +1591,12 @@
         <requirement id="0">
           <type value="43"/>
           <source value="43"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="46"/>
           <source value="46"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1611,7 +1611,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="48"/>
               <task value="49"/>
             </destination>
@@ -1622,7 +1622,7 @@
         <requirement id="0">
           <type value="47"/>
           <source value="47"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1637,7 +1637,7 @@
             <destination id="0">
               <delay min="212" max="212"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="49"/>
               <task value="50"/>
             </destination>
@@ -1648,7 +1648,7 @@
         <requirement id="0">
           <type value="48"/>
           <source value="48"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1663,7 +1663,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="50"/>
               <task value="51"/>
             </destination>
@@ -1674,7 +1674,7 @@
         <requirement id="0">
           <type value="49"/>
           <source value="49"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1689,14 +1689,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="51"/>
               <task value="52"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="51"/>
               <task value="55"/>
             </destination>
@@ -1707,12 +1707,12 @@
         <requirement id="0">
           <type value="47"/>
           <source value="47"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="50"/>
           <source value="50"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1727,7 +1727,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="52"/>
               <task value="53"/>
             </destination>
@@ -1738,7 +1738,7 @@
         <requirement id="0">
           <type value="51"/>
           <source value="51"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1753,7 +1753,7 @@
             <destination id="0">
               <delay min="212" max="212"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="53"/>
               <task value="54"/>
             </destination>
@@ -1764,7 +1764,7 @@
         <requirement id="0">
           <type value="52"/>
           <source value="52"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1779,7 +1779,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="54"/>
               <task value="55"/>
             </destination>
@@ -1790,7 +1790,7 @@
         <requirement id="0">
           <type value="53"/>
           <source value="53"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1805,7 +1805,7 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="55"/>
               <task value="56"/>
             </destination>
@@ -1816,12 +1816,12 @@
         <requirement id="0">
           <type value="51"/>
           <source value="51"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="54"/>
           <source value="54"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1836,7 +1836,7 @@
             <destination id="0">
               <delay min="1014" max="1014"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="56"/>
               <task value="57"/>
             </destination>
@@ -1847,7 +1847,7 @@
         <requirement id="0">
           <type value="55"/>
           <source value="55"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1862,7 +1862,7 @@
             <destination id="0">
               <delay min="60" max="60"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="57"/>
               <task value="58"/>
             </destination>
@@ -1873,7 +1873,7 @@
         <requirement id="0">
           <type value="56"/>
           <source value="56"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1888,14 +1888,14 @@
             <destination id="0">
               <delay min="493" max="493"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="58"/>
               <task value="59"/>
             </destination>
             <destination id="1">
               <delay min="493" max="493"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="58"/>
               <task value="62"/>
             </destination>
@@ -1906,7 +1906,7 @@
         <requirement id="0">
           <type value="57"/>
           <source value="57"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1921,7 +1921,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="59"/>
               <task value="60"/>
             </destination>
@@ -1932,7 +1932,7 @@
         <requirement id="0">
           <type value="58"/>
           <source value="58"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1947,7 +1947,7 @@
             <destination id="0">
               <delay min="103" max="103"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="60"/>
               <task value="61"/>
             </destination>
@@ -1958,7 +1958,7 @@
         <requirement id="0">
           <type value="59"/>
           <source value="59"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1973,7 +1973,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="61"/>
               <task value="62"/>
             </destination>
@@ -1984,7 +1984,7 @@
         <requirement id="0">
           <type value="60"/>
           <source value="60"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -1999,14 +1999,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="62"/>
               <task value="63"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="62"/>
               <task value="66"/>
             </destination>
@@ -2017,12 +2017,12 @@
         <requirement id="0">
           <type value="58"/>
           <source value="58"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="61"/>
           <source value="61"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2037,7 +2037,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="63"/>
               <task value="64"/>
             </destination>
@@ -2048,7 +2048,7 @@
         <requirement id="0">
           <type value="62"/>
           <source value="62"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2063,7 +2063,7 @@
             <destination id="0">
               <delay min="103" max="103"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="64"/>
               <task value="65"/>
             </destination>
@@ -2074,7 +2074,7 @@
         <requirement id="0">
           <type value="63"/>
           <source value="63"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2089,7 +2089,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="65"/>
               <task value="66"/>
             </destination>
@@ -2100,7 +2100,7 @@
         <requirement id="0">
           <type value="64"/>
           <source value="64"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2115,14 +2115,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="66"/>
               <task value="67"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="66"/>
               <task value="70"/>
             </destination>
@@ -2133,12 +2133,12 @@
         <requirement id="0">
           <type value="62"/>
           <source value="62"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="65"/>
           <source value="65"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2153,7 +2153,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="67"/>
               <task value="68"/>
             </destination>
@@ -2164,7 +2164,7 @@
         <requirement id="0">
           <type value="66"/>
           <source value="66"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2179,7 +2179,7 @@
             <destination id="0">
               <delay min="103" max="103"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="68"/>
               <task value="69"/>
             </destination>
@@ -2190,7 +2190,7 @@
         <requirement id="0">
           <type value="67"/>
           <source value="67"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2205,7 +2205,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="69"/>
               <task value="70"/>
             </destination>
@@ -2216,7 +2216,7 @@
         <requirement id="0">
           <type value="68"/>
           <source value="68"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2231,14 +2231,14 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="70"/>
               <task value="71"/>
             </destination>
             <destination id="1">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="70"/>
               <task value="74"/>
             </destination>
@@ -2249,12 +2249,12 @@
         <requirement id="0">
           <type value="66"/>
           <source value="66"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="69"/>
           <source value="69"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2269,7 +2269,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="71"/>
               <task value="72"/>
             </destination>
@@ -2280,7 +2280,7 @@
         <requirement id="0">
           <type value="70"/>
           <source value="70"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2295,7 +2295,7 @@
             <destination id="0">
               <delay min="103" max="103"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="72"/>
               <task value="73"/>
             </destination>
@@ -2306,7 +2306,7 @@
         <requirement id="0">
           <type value="71"/>
           <source value="71"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2321,7 +2321,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="73"/>
               <task value="74"/>
             </destination>
@@ -2332,7 +2332,7 @@
         <requirement id="0">
           <type value="72"/>
           <source value="72"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2347,7 +2347,7 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="74"/>
               <task value="75"/>
             </destination>
@@ -2358,12 +2358,12 @@
         <requirement id="0">
           <type value="70"/>
           <source value="70"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
         <requirement id="1">
           <type value="73"/>
           <source value="73"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2378,7 +2378,7 @@
             <destination id="0">
               <delay min="854" max="854"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="75"/>
               <task value="76"/>
             </destination>
@@ -2389,7 +2389,7 @@
         <requirement id="0">
           <type value="74"/>
           <source value="74"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2404,7 +2404,7 @@
             <destination id="0">
               <delay min="37" max="37"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="76"/>
               <task value="77"/>
             </destination>
@@ -2415,7 +2415,7 @@
         <requirement id="0">
           <type value="75"/>
           <source value="75"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2430,7 +2430,7 @@
             <destination id="0">
               <delay min="1445" max="1445"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="77"/>
               <task value="78"/>
             </destination>
@@ -2441,7 +2441,7 @@
         <requirement id="0">
           <type value="76"/>
           <source value="76"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2456,7 +2456,7 @@
             <destination id="0">
               <delay min="1483" max="1483"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="78"/>
               <task value="79"/>
             </destination>
@@ -2467,7 +2467,7 @@
         <requirement id="0">
           <type value="77"/>
           <source value="77"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2482,7 +2482,7 @@
             <destination id="0">
               <delay min="173" max="173"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="79"/>
               <task value="80"/>
             </destination>
@@ -2493,7 +2493,7 @@
         <requirement id="0">
           <type value="78"/>
           <source value="78"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2508,7 +2508,7 @@
             <destination id="0">
               <delay min="10" max="10"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="80"/>
               <task value="81"/>
             </destination>
@@ -2519,7 +2519,7 @@
         <requirement id="0">
           <type value="79"/>
           <source value="79"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2534,7 +2534,7 @@
             <destination id="0">
               <delay min="52" max="52"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="81"/>
               <task value="82"/>
             </destination>
@@ -2545,7 +2545,7 @@
         <requirement id="0">
           <type value="80"/>
           <source value="80"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2560,7 +2560,7 @@
             <destination id="0">
               <delay min="1" max="1"/>
               <interval min="20" max="20"/>
-              <count min="5" max="5"/>
+              <count min="10" max="10"/>
               <type value="82"/>
               <task value="83"/>
             </destination>
@@ -2571,7 +2571,7 @@
         <requirement id="0">
           <type value="81"/>
           <source value="81"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
@@ -2589,7 +2589,7 @@
         <requirement id="0">
           <type value="82"/>
           <source value="82"/>
-          <count min="5" max="5"/>
+          <count min="10" max="10"/>
         </requirement>
       </requires>
     </task>
diff --git a/src/main.cpp b/src/main.cpp
index 667cb93..18df502 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,6 +27,7 @@
 
 #include "utils/GlobalResourcesCS.h"
 #include "networkManager/NetworkManager.h"
+#include "utils/report.h"
 
 namespace po = boost::program_options;
 
@@ -55,5 +56,8 @@ int sc_main(int arg_num, char *arg_vec[])
     sc_start(globalResources.simulation_time, SC_NS);
     cout << endl
          << "Simulation completed! Time: "<< sc_time_stamp() << endl;
+    
+    TlmReport& report = TlmReport::getInstance();
+    report.write_report();
     return 0;
 }
diff --git a/src/networkInterface/NetworkInterfaceTlm.cpp b/src/networkInterface/NetworkInterfaceTlm.cpp
index 622e7a2..a71b41c 100755
--- a/src/networkInterface/NetworkInterfaceTlm.cpp
+++ b/src/networkInterface/NetworkInterfaceTlm.cpp
@@ -54,12 +54,12 @@ NetworkInterfaceTlm::NetworkInterfaceTlm(sc_module_name nm, Node& node,
     sensitive << packetPortContainer->portValidIn.pos();
 
     for(uint8_t lay=0; lay<NUM_ACC_LAYERS; lay++){
-        initiator[lay] = new ni_init_socket((string(nm)+"_"+
+        initiator[lay] = new ni_init_socket((ni_name+"_"+
                             to_string(lay)+"_init").c_str());
         initiator[lay]->register_nb_transport_bw(this, 
                         &NetworkInterfaceTlm::nb_transport_bw_cb, lay);
 
-        target[lay] = new ni_targ_socket((string(nm)+"_"+
+        target[lay] = new ni_targ_socket((ni_name+"_"+
                             to_string(lay)+"targ").c_str());
         target[lay]->register_nb_transport_fw(this, 
                         &NetworkInterfaceTlm::nb_transport_fw_cb, lay);
@@ -263,6 +263,7 @@ void NetworkInterfaceTlm::thread() {
                 }
                 else {
                     if(log_wait){
+                        report.update_throttled_count(ni_name);
                         if(credit_counter == 0){
                             log_info("No more credits. Waiting for Router!");
                         }
@@ -465,6 +466,7 @@ void NetworkInterfaceTlm::target_peq_cb(tlm_gp& trans, const tlm::tlm_phase& pha
             break;
 
         default:
+            report.update_packet_count(ni_name);
             if(phase == INTERNAL_PROC_PHASE){
                 receive_and_process_flit(trans);
             }
@@ -522,27 +524,28 @@ void NetworkInterfaceTlm::send_response(tlm_gp& trans){
 void NetworkInterfaceTlm::update_credits(tlm_gp&trans, int added_creds){
     string type_name = get_type_name(get_type_from_extension(trans));
     int p_id = get_packet_id_from_extension(trans);
-
-    if(type_name == TYPE_PACKET || (type_name == TYPE_ROUT_CONFIG && p_id != -1)){
+    //if(type_name == TYPE_PACKET || (type_name == TYPE_ROUT_CONFIG && p_id != -1)){
+    if (!((type_name == TYPE_ROUT_CONFIG && p_id == -1) || 
+            type_name == TYPE_STREAM)){
         credit_counter += added_creds;
         log_info("Credit counter updated: "+to_string(credit_counter));
     }
 }
 
 void NetworkInterfaceTlm::log_info(string msg){
-    string log_msg = ni_name + ": (Node" + 
+    string log_msg = string(name()) + ": (Node" + 
                         to_string(node.id)+"): "+msg;
     SC_REPORT_INFO(NI_LOG, (log_msg).c_str());
 }
 
 void NetworkInterfaceTlm::log_error(string msg){
-    string log_msg = ni_name + ": (Node" + 
+    string log_msg = string(name()) + ": (Node" + 
                         to_string(node.id)+"): "+msg;
     SC_REPORT_ERROR(NI_LOG, (log_msg).c_str());
 }
 
 void NetworkInterfaceTlm::log_fatal(string msg){
-    string log_msg = ni_name + ": (Node" + 
+    string log_msg = string(name()) + ": (Node" + 
                         to_string(node.id)+"): "+msg;
     SC_REPORT_FATAL(NI_LOG, (log_msg).c_str());
 }
diff --git a/src/networkInterface/NetworkInterfaceTlm.h b/src/networkInterface/NetworkInterfaceTlm.h
index acd156b..d5f81b3 100755
--- a/src/networkInterface/NetworkInterfaceTlm.h
+++ b/src/networkInterface/NetworkInterfaceTlm.h
@@ -54,7 +54,6 @@ public:
     std::queue<PacketCS*> packet_send_queue;
     std::queue<PacketCS*> packet_recv_queue;
 
-    string ni_name;
     // To PE
     sc_in<bool> clk;
     PacketPortContainer* packetPortContainer;
@@ -66,12 +65,14 @@ public:
     tlm_gp* curr_req;
     tlm_gp* nxt_resp_pend;
 
+    string ni_name;
     bool resp_in_progress;
     int credit_counter;
     MemoryManager m_mm;
     uint8_t max_pos[3];
     bool valid_socket[NUM_ACC_LAYERS] = {false};
 
+    TlmReport& report = TlmReport::getInstance();
 
     sc_event_or_list ev_msg_arrv;
     
diff --git a/src/router/router.cpp b/src/router/router.cpp
index 0b57c79..7a554fa 100755
--- a/src/router/router.cpp
+++ b/src/router/router.cpp
@@ -46,12 +46,12 @@ void TlmRouter::initialize(){
                             to_string(link)+"_init").c_str());
         (*init_socket[link]).register_nb_transport_bw(this, 
                             &TlmRouter::nb_transport_bw_cb, link);
-        
+
         target_socket[link] = new rout_targ_socket((router_name+"_"+
                             to_string(link)+"_targ").c_str());
         (*target_socket[link]).register_nb_transport_fw(this, 
                             &TlmRouter::nb_transport_fw_cb, link);
-        
+
         valid_links[link] = false;
         resp_in_progress[link] = false;
         nxt_resp_pend[link] = 0;
@@ -125,6 +125,7 @@ bool TlmRouter::send_data(int link, int dest_link, tlm_gp& trans){
     }
     else {
         log_warn(link,trans, "Waiting for downstream Router!");
+        report.update_throttled_count(router_name);
         return false;
     }
 }
@@ -269,6 +270,7 @@ void TlmRouter::target_peq_cb(tlm_gp& trans, const tlm_phase& phase){
             log_error(link,trans,"Illegal transaction phase received by target");
             break;
         default:
+            report.update_packet_count(router_name);
             if(phase == INTERNAL_PROC_PHASE){
                 switching(link, trans);
             }
diff --git a/src/router/router.h b/src/router/router.h
index 7e73e2b..19b31d3 100755
--- a/src/router/router.h
+++ b/src/router/router.h
@@ -37,6 +37,7 @@
 #include "utils/configuration.h"
 #include "utils/utils.h"
 #include "utils/noc_logger.h"
+#include "utils/report.h"
 
 using namespace sc_core;
 using namespace sc_dt;
@@ -72,6 +73,8 @@ class TlmRouter : public sc_module{
         uint8_t max_pos[3];
         bool valid_links[NUM_LINKS];
 
+        TlmReport& report = TlmReport::getInstance();
+
         SC_HAS_PROCESS(TlmRouter);
         TlmRouter(sc_module_name name, uint8_t rout_pos[3],
                                       uint8_t max_pos[3]);
diff --git a/src/router/router_cs.cpp b/src/router/router_cs.cpp
index d63f360..b5a3f8e 100755
--- a/src/router/router_cs.cpp
+++ b/src/router/router_cs.cpp
@@ -122,6 +122,7 @@ void TlmRouterCS::target_peq_cb(tlm_gp& trans, const tlm_phase& phase){
             send_end_req(link, trans);
             break;
         default:
+            report.update_packet_count(name());
             if(phase == INTERNAL_PROC_PHASE){
                 switching(link, trans);
             }
diff --git a/src/utils/report.cpp b/src/utils/report.cpp
index e69de29..2719455 100644
--- a/src/utils/report.cpp
+++ b/src/utils/report.cpp
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (C) 2024 Juan Neyra
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ ******************************************************************************/
+#include "report.h"
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+TlmReport::TlmReport(){
+}
+
+TlmReport &TlmReport::getInstance()
+{
+    static TlmReport instance;
+    return instance;
+}
+
+void TlmReport::update_packet_count(string np_name){
+    // check if np_name exists in packet_count
+    if(packet_count.count(np_name)){
+        packet_count[np_name] += 1;
+    }
+    else{
+        packet_count.insert(std::make_pair(np_name, 1));
+    }
+}
+
+
+void TlmReport::update_throttled_count(string np_name){
+    if(throttled_count.count(np_name)){
+        throttled_count[np_name] += 1;
+    }
+    else{
+        throttled_count.insert(std::make_pair(np_name, 1));
+    }
+}
+
+
+void TlmReport::write_report(){
+    cout << endl << "Write packet count csv file" << endl;
+    stringstream ss_msg_packet;
+    ss_msg_packet << "router,packet_count" << endl;
+    for(auto& pc_pair: packet_count){
+        ss_msg_packet << string(pc_pair.first) << "," << to_string(pc_pair.second) << endl;
+    }
+
+    ofstream log_file;
+    log_file.open(PACKET_COUNT_FILE);
+    log_file << ss_msg_packet.str();
+    log_file.close();
+
+
+    cout << "Write throttled count csv file" << endl << endl;
+    stringstream ss_msg_throttled;
+    ss_msg_throttled << "router,throttled_count" << endl;
+    for(auto& tc_pair: throttled_count){
+        ss_msg_throttled << tc_pair.first << "," << tc_pair.second << endl;
+    }
+
+    log_file.open(THROTTLED_COUNT_FILE);
+    log_file << ss_msg_throttled.str();
+    log_file.close();
+}
diff --git a/src/utils/report.h b/src/utils/report.h
index 561c03b..8106de6 100644
--- a/src/utils/report.h
+++ b/src/utils/report.h
@@ -22,17 +22,42 @@
 #pragma once
 
 #include <map>
-#include <systemc>
+//#include <systemc>
+
+#define PACKET_COUNT_FILE "out/packet_count.csv"
+#define THROTTLED_COUNT_FILE "out/throttled_count.csv"
 
 using namespace std;
-using namespace sc_core;
+//using namespace sc_core;
 
-class Report {
+class TlmReport {
     public:
+
+        TlmReport();
+        static TlmReport &getInstance();
+
+        /**
+         * Increases the packet count by one for the given router
+         *
+         * @param np_name     network participant's name
+         */
+        void update_packet_count(string np_name);
+
+        /**
+         * Increases the throttled count by one for the given router
+         *
+         * @param np_name     network participant's name
+         */
+        void update_throttled_count(string np_name);
+
+        /** 
+         * Writes report as csv
+         */
+        void write_report();
+
+    private:
         std::map<string, int> packet_count;
         std::map<string, int> throttled_count;
-        std::map<int, sc_time> task_start_time;
-        std::map<int, sc_time> task_completed_time;
-
-        Report();
+        //std::map<int, sc_time> task_start_time;
+        //std::map<int, sc_time> task_completed_time;
 };
\ No newline at end of file