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 1/2] 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

From 11666fb586513d3dbba6ab6b0d80fc1634a19d1e Mon Sep 17 00:00:00 2001
From: juanmanuel <jneyra@uni-bremen.de>
Date: Thu, 14 Nov 2024 03:18:30 -0500
Subject: [PATCH 2/2] fix: lack of throttle count in routers fixed

---
 config/ai_test/data.xml                      | 386 ++++----
 config/simple_2_point_test/2pt_data.xml      |  17 +-
 config/simple_2_point_test/config.xml        |   2 +-
 config/throttle_test/config.xml              |  55 ++
 config/throttle_test/data.xml                | 245 ++++++
 config/throttle_test/map.xml                 |  51 ++
 config/throttle_test/net.xml                 | 879 +++++++++++++++++++
 src/networkInterface/NetworkInterfaceTlm.cpp |   4 +-
 src/networkManager/NetworkManager.cpp        |   2 -
 src/router/router.cpp                        |  88 +-
 src/router/router.h                          |   9 +-
 src/router/router_cs.cpp                     |  14 +-
 src/utils/configuration.h                    |   8 +-
 src/utils/utils.cpp                          |  15 +-
 14 files changed, 1498 insertions(+), 277 deletions(-)
 create mode 100755 config/throttle_test/config.xml
 create mode 100755 config/throttle_test/data.xml
 create mode 100755 config/throttle_test/map.xml
 create mode 100755 config/throttle_test/net.xml

diff --git a/config/ai_test/data.xml b/config/ai_test/data.xml
index c9b79da..e373369 100755
--- a/config/ai_test/data.xml
+++ b/config/ai_test/data.xml
@@ -264,8 +264,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="5" max="5"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="0"/>
               <task value="1"/>
@@ -284,8 +284,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="1"/>
               <task value="2"/>
@@ -310,8 +310,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="198" max="198"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="2"/>
               <task value="3"/>
@@ -336,8 +336,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="352" max="352"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="3"/>
               <task value="4"/>
@@ -362,8 +362,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1055" max="1055"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="4"/>
               <task value="5"/>
@@ -388,8 +388,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="149" max="149"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="5"/>
               <task value="6"/>
@@ -414,15 +414,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="396" max="396"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="6"/>
               <task value="10"/>
@@ -447,8 +447,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="7"/>
               <task value="8"/>
@@ -473,8 +473,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="223" max="223"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="8"/>
               <task value="9"/>
@@ -499,8 +499,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="9"/>
               <task value="10"/>
@@ -525,15 +525,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="3" max="3"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="10"/>
               <task value="14"/>
@@ -563,8 +563,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="11"/>
               <task value="12"/>
@@ -589,8 +589,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="223" max="223"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="12"/>
               <task value="13"/>
@@ -615,8 +615,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="13"/>
               <task value="14"/>
@@ -641,8 +641,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="3" max="3"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="14"/>
               <task value="15"/>
@@ -672,8 +672,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="593" max="593"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="15"/>
               <task value="16"/>
@@ -698,8 +698,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="160" max="160"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="16"/>
               <task value="17"/>
@@ -724,15 +724,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="306" max="306"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="17"/>
               <task value="21"/>
@@ -757,8 +757,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="612" max="612"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="18"/>
               <task value="19"/>
@@ -783,8 +783,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="319" max="319"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="19"/>
               <task value="20"/>
@@ -809,8 +809,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="612" max="612"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="20"/>
               <task value="21"/>
@@ -835,15 +835,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="2" max="2"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="21"/>
               <task value="25"/>
@@ -873,8 +873,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="612" max="612"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="22"/>
               <task value="23"/>
@@ -899,8 +899,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="319" max="319"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="23"/>
               <task value="24"/>
@@ -925,8 +925,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="612" max="612"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="24"/>
               <task value="25"/>
@@ -951,8 +951,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="2" max="2"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="25"/>
               <task value="26"/>
@@ -982,8 +982,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="612" max="612"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="26"/>
               <task value="27"/>
@@ -1008,8 +1008,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="31" max="31"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="27"/>
               <task value="28"/>
@@ -1034,15 +1034,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="298" max="298"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="28"/>
               <task value="32"/>
@@ -1067,8 +1067,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="29"/>
               <task value="30"/>
@@ -1093,8 +1093,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="56" max="56"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="30"/>
               <task value="31"/>
@@ -1119,8 +1119,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="31"/>
               <task value="32"/>
@@ -1145,15 +1145,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="32"/>
               <task value="36"/>
@@ -1183,8 +1183,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="33"/>
               <task value="34"/>
@@ -1209,8 +1209,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="56" max="56"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="34"/>
               <task value="35"/>
@@ -1235,8 +1235,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="35"/>
               <task value="36"/>
@@ -1261,15 +1261,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="36"/>
               <task value="40"/>
@@ -1299,8 +1299,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="37"/>
               <task value="38"/>
@@ -1325,8 +1325,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="56" max="56"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="38"/>
               <task value="39"/>
@@ -1351,8 +1351,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="39"/>
               <task value="40"/>
@@ -1377,8 +1377,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="40"/>
               <task value="41"/>
@@ -1408,8 +1408,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="546" max="546"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="41"/>
               <task value="42"/>
@@ -1434,8 +1434,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="155" max="155"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="42"/>
               <task value="43"/>
@@ -1460,15 +1460,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="744" max="744"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="43"/>
               <task value="47"/>
@@ -1493,8 +1493,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="44"/>
               <task value="45"/>
@@ -1519,8 +1519,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="212" max="212"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="45"/>
               <task value="46"/>
@@ -1545,8 +1545,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="46"/>
               <task value="47"/>
@@ -1571,15 +1571,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="47"/>
               <task value="51"/>
@@ -1609,8 +1609,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="48"/>
               <task value="49"/>
@@ -1635,8 +1635,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="212" max="212"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="49"/>
               <task value="50"/>
@@ -1661,8 +1661,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="50"/>
               <task value="51"/>
@@ -1687,15 +1687,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="51"/>
               <task value="55"/>
@@ -1725,8 +1725,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="52"/>
               <task value="53"/>
@@ -1751,8 +1751,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="212" max="212"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="53"/>
               <task value="54"/>
@@ -1777,8 +1777,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="54"/>
               <task value="55"/>
@@ -1803,8 +1803,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="55"/>
               <task value="56"/>
@@ -1834,8 +1834,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1014" max="1014"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="56"/>
               <task value="57"/>
@@ -1860,8 +1860,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="60" max="60"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="57"/>
               <task value="58"/>
@@ -1886,15 +1886,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="493" max="493"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="58"/>
               <task value="62"/>
@@ -1919,8 +1919,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="59"/>
               <task value="60"/>
@@ -1945,8 +1945,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="103" max="103"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="60"/>
               <task value="61"/>
@@ -1971,8 +1971,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="61"/>
               <task value="62"/>
@@ -1997,15 +1997,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="62"/>
               <task value="66"/>
@@ -2035,8 +2035,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="63"/>
               <task value="64"/>
@@ -2061,8 +2061,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="103" max="103"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="64"/>
               <task value="65"/>
@@ -2087,8 +2087,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="65"/>
               <task value="66"/>
@@ -2113,15 +2113,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="66"/>
               <task value="70"/>
@@ -2151,8 +2151,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="67"/>
               <task value="68"/>
@@ -2177,8 +2177,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="103" max="103"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="68"/>
               <task value="69"/>
@@ -2203,8 +2203,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="69"/>
               <task value="70"/>
@@ -2229,15 +2229,15 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <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"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="70"/>
               <task value="74"/>
@@ -2267,8 +2267,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="71"/>
               <task value="72"/>
@@ -2293,8 +2293,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="103" max="103"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="72"/>
               <task value="73"/>
@@ -2319,8 +2319,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="73"/>
               <task value="74"/>
@@ -2345,8 +2345,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="74"/>
               <task value="75"/>
@@ -2376,8 +2376,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="854" max="854"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="75"/>
               <task value="76"/>
@@ -2402,8 +2402,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="37" max="37"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="76"/>
               <task value="77"/>
@@ -2428,8 +2428,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1445" max="1445"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="77"/>
               <task value="78"/>
@@ -2454,8 +2454,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1483" max="1483"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="78"/>
               <task value="79"/>
@@ -2480,8 +2480,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="173" max="173"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="79"/>
               <task value="80"/>
@@ -2507,7 +2507,7 @@
           <destinations>
             <destination id="0">
               <delay min="10" max="10"/>
-              <interval min="20" max="20"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="80"/>
               <task value="81"/>
@@ -2532,8 +2532,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="52" max="52"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="81"/>
               <task value="82"/>
@@ -2558,8 +2558,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="1" max="1"/>
-              <interval min="20" max="20"/>
+              <delay min="10" max="10"/>
+              <interval min="10" max="10"/>
               <count min="10" max="10"/>
               <type value="82"/>
               <task value="83"/>
diff --git a/config/simple_2_point_test/2pt_data.xml b/config/simple_2_point_test/2pt_data.xml
index c91fdb8..42b28e9 100755
--- a/config/simple_2_point_test/2pt_data.xml
+++ b/config/simple_2_point_test/2pt_data.xml
@@ -5,7 +5,7 @@
       <name value="Packet"/>
     </dataType>
     <dataType id="1">
-      <name value="Streaming"/>
+      <name value="Stream"/>
     </dataType>
   </dataTypes>
   <tasks>
@@ -18,8 +18,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="0" max="100"/>
-              <interval min="100" max="100"/>
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
               <count min="1" max="1"/>
               <type value="0"/>
               <task value="2"/>
@@ -38,8 +38,8 @@
           <probability value="1"/>
           <destinations>
             <destination id="0">
-              <delay min="0" max="100"/>
-              <interval min="100" max="100"/>
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
               <count min="1" max="1"/>
               <type value="0"/>
               <task value="2"/>
@@ -57,12 +57,7 @@
         <requirement id="0">
           <type value="0"/>
           <source value="0"/>
-          <count max="1" min="1"/>
-        </requirement>
-        <requirement id="1">
-          <type value="0"/>
-          <source value="24"/>
-          <count max="1" min="1"/>
+          <count max="2" min="2"/>
         </requirement>
       </requires>
     </task>
diff --git a/config/simple_2_point_test/config.xml b/config/simple_2_point_test/config.xml
index 4de57e7..bc0faa5 100755
--- a/config/simple_2_point_test/config.xml
+++ b/config/simple_2_point_test/config.xml
@@ -5,7 +5,7 @@
     <outputToFile value="true">report</outputToFile>
   </general>
   <noc>
-    <nocFile>config/simple_test/net.xml</nocFile>
+    <nocFile>config/simple_2_point_test/net.xml</nocFile>
     <flitsPerPacket value="1"/>
     <bitWidth value="32"/>
     <Vdd value="5"/>
diff --git a/config/throttle_test/config.xml b/config/throttle_test/config.xml
new file mode 100755
index 0000000..8f5501d
--- /dev/null
+++ b/config/throttle_test/config.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <general>
+    <simulationTime value="1500"/>
+    <outputToFile value="true">report</outputToFile>
+  </general>
+  <noc>
+    <nocFile>config/throttle_test/net.xml</nocFile>
+    <flitsPerPacket value="1"/>
+    <bitWidth value="32"/>
+    <Vdd value="5"/>
+  </noc>
+  <application>
+    <benchmark>task</benchmark>
+    <dataFile>config/throttle_test/data.xml</dataFile>
+    <mapFile>config/throttle_test/map.xml</mapFile>
+  </application>
+  <verbose>
+    <processingElements>
+      <function_calls value="false"/>
+      <send_flit value="false"/>
+      <send_head_flit value="true"/>
+      <receive_flit value="false"/>
+      <receive_tail_flit value="true"/>
+      <throttle value="false"/>
+      <reset value="false"/>
+    </processingElements>
+    <router>
+      <function_calls value="false"/>
+      <send_flit value="false"/>
+      <send_head_flit value="false"/>
+      <receive_flit value="false"/>
+      <receive_tail_flit value="false"/>
+      <throttle value="false"/>
+      <reset value="false"/>
+      <assign_channel value="false"/>
+      <buffer_overflow value="true"/>
+    </router>
+    <netrace>
+      <inject value="true"/>
+      <eject value="true"/>
+      <router_receive value="true"/>
+    </netrace>
+    <tasks>
+      <function_calls value="true"/>
+      <xml_parse value="false"/>
+      <data_receive value="true"/>
+      <data_send value="true"/>
+      <source_execute value="false"/>
+    </tasks>
+  </verbose>
+  <report>
+    <bufferReportRouters>5 6 9 10</bufferReportRouters>
+  </report>
+</configuration>
diff --git a/config/throttle_test/data.xml b/config/throttle_test/data.xml
new file mode 100755
index 0000000..b79db77
--- /dev/null
+++ b/config/throttle_test/data.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" ?>
+<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <dataTypes>
+    <dataType id="0">
+      <name value="Packet"/>
+    </dataType>
+    <dataType id="1">
+      <name value="Stream"/>
+    </dataType>
+  </dataTypes>
+  <tasks>
+    <task id="0">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="1">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="2">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="3">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="4">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="5">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="6">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="7">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="8">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="9">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="10">
+      <start min="0" max="0"/>
+      <duration min="-1" max="-1"/>
+      <repeat min="1" max="1"/>
+      <generates>
+        <possibility id="0">
+          <probability value="1"/>
+          <destinations>
+            <destination id="0">
+              <delay min="0" max="10"/>
+              <interval min="5" max="5"/>
+              <count min="10" max="10"/>
+              <type value="0"/>
+              <task value="11"/>
+            </destination>
+          </destinations>
+        </possibility>
+      </generates>
+    </task>
+
+    <task id="11">
+      <start max="0" min="0"/>
+      <duration max="-1" min="-1"/>
+      <repeat max="1" min="1"/>
+      <requires>
+        <requirement id="0">
+          <type value="0"/>
+          <source value="0"/>
+          <count max="100" min="100"/>
+        </requirement>
+      </requires>
+    </task>
+  </tasks>
+</data>
diff --git a/config/throttle_test/map.xml b/config/throttle_test/map.xml
new file mode 100755
index 0000000..f165073
--- /dev/null
+++ b/config/throttle_test/map.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<map xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <bind>
+    <task value="0"/>
+    <node value="0"/>
+  </bind>
+  <bind>
+    <task value="1"/>
+    <node value="8"/>
+  </bind>
+  <bind>
+    <task value="2"/>
+    <node value="4"/>
+  </bind>
+  <bind>
+    <task value="3"/>
+    <node value="10"/>
+  </bind>
+  <bind>
+    <task value="4"/>
+    <node value="12"/>
+  </bind>
+  <bind>
+    <task value="5"/>
+    <node value="13"/>
+  </bind>
+  <bind>
+    <task value="6"/>
+    <node value="14"/>
+  </bind>
+  <bind>
+    <task value="7"/>
+    <node value="11"/>
+  </bind>
+  <bind>
+    <task value="8"/>
+    <node value="8"/>
+  </bind>
+  <bind>
+    <task value="9"/>
+    <node value="9"/>
+  </bind>
+  <bind>
+    <task value="10"/>
+    <node value="7"/>
+  </bind>
+  <bind>
+    <task value="11"/>
+    <node value="15"/>
+  </bind>
+</map>
diff --git a/config/throttle_test/net.xml b/config/throttle_test/net.xml
new file mode 100755
index 0000000..7407f52
--- /dev/null
+++ b/config/throttle_test/net.xml
@@ -0,0 +1,879 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<network-on-chip xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="layer.xsd">
+<bufferDepthType value="single" /> <!-- single, perVC-->
+	<nodeTypes>
+		<nodeType id="0">
+			<model value="Router"/>
+			<routing value="XYZ"/>
+			<clockDelay value="1"/>
+		</nodeType>
+		<nodeType id="1">
+			<model value="ProcessingElement"/>
+			<clockDelay value="1"/>
+		</nodeType>
+	</nodeTypes>
+
+
+	<nodes>
+		<node id="0">
+			<xPos value="0.000"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="0"/>
+			<layerType value="0"/>
+		</node>
+		<node id="1">
+			<xPos value="0.000"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="1"/>
+			<layerType value="0"/>
+		</node>
+		<node id="2">
+			<xPos value="0.000"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="2"/>
+			<layerType value="0"/>
+		</node>
+		<node id="3">
+			<xPos value="0.000"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="3"/>
+			<layerType value="0"/>
+		</node>
+		<node id="4">
+			<xPos value="0.333"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="4"/>
+			<layerType value="0"/>
+		</node>
+		<node id="5">
+			<xPos value="0.333"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="5"/>
+			<layerType value="0"/>
+		</node>
+		<node id="6">
+			<xPos value="0.333"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="6"/>
+			<layerType value="0"/>
+		</node>
+		<node id="7">
+			<xPos value="0.333"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="7"/>
+			<layerType value="0"/>
+		</node>
+		<node id="8">
+			<xPos value="0.667"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="8"/>
+			<layerType value="0"/>
+		</node>
+		<node id="9">
+			<xPos value="0.667"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="9"/>
+			<layerType value="0"/>
+		</node>
+		<node id="10">
+			<xPos value="0.667"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="10"/>
+			<layerType value="0"/>
+		</node>
+		<node id="11">
+			<xPos value="0.667"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="11"/>
+			<layerType value="0"/>
+		</node>
+		<node id="12">
+			<xPos value="1.000"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="12"/>
+			<layerType value="0"/>
+		</node>
+		<node id="13">
+			<xPos value="1.000"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="13"/>
+			<layerType value="0"/>
+		</node>
+		<node id="14">
+			<xPos value="1.000"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="14"/>
+			<layerType value="0"/>
+		</node>
+		<node id="15">
+			<xPos value="1.000"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="0"/>
+			<idType value="15"/>
+			<layerType value="0"/>
+		</node>
+		<node id="16">
+			<xPos value="0.000"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="0"/>
+			<layerType value="0"/>
+		</node>
+		<node id="17">
+			<xPos value="0.000"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="1"/>
+			<layerType value="0"/>
+		</node>
+		<node id="18">
+			<xPos value="0.000"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="2"/>
+			<layerType value="0"/>
+		</node>
+		<node id="19">
+			<xPos value="0.000"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="3"/>
+			<layerType value="0"/>
+		</node>
+		<node id="20">
+			<xPos value="0.333"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="4"/>
+			<layerType value="0"/>
+		</node>
+		<node id="21">
+			<xPos value="0.333"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="5"/>
+			<layerType value="0"/>
+		</node>
+		<node id="22">
+			<xPos value="0.333"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="6"/>
+			<layerType value="0"/>
+		</node>
+		<node id="23">
+			<xPos value="0.333"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="7"/>
+			<layerType value="0"/>
+		</node>
+		<node id="24">
+			<xPos value="0.667"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="8"/>
+			<layerType value="0"/>
+		</node>
+		<node id="25">
+			<xPos value="0.667"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="9"/>
+			<layerType value="0"/>
+		</node>
+		<node id="26">
+			<xPos value="0.667"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="10"/>
+			<layerType value="0"/>
+		</node>
+		<node id="27">
+			<xPos value="0.667"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="11"/>
+			<layerType value="0"/>
+		</node>
+		<node id="28">
+			<xPos value="1.000"/>
+			<yPos value="0.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="12"/>
+			<layerType value="0"/>
+		</node>
+		<node id="29">
+			<xPos value="1.000"/>
+			<yPos value="0.333"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="13"/>
+			<layerType value="0"/>
+		</node>
+		<node id="30">
+			<xPos value="1.000"/>
+			<yPos value="0.667"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="14"/>
+			<layerType value="0"/>
+		</node>
+		<node id="31">
+			<xPos value="1.000"/>
+			<yPos value="1.000"/>
+			<zPos value="0.000"/>
+			<nodeType value="1"/>
+			<idType value="15"/>
+			<layerType value="0"/>
+		</node>
+	</nodes>
+
+
+	<connections>
+		<con id="0">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="0"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="16"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="1">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="0"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="1"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="2">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="0"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="4"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="3">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="1"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="17"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="4">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="1"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="2"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="5">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="1"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="5"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="6">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="2"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="18"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="7">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="2"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="3"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="8">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="2"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="6"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="9">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="3"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="19"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="10">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="3"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="7"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="11">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="4"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="20"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="12">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="4"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="5"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="13">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="4"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="8"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="14">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="5"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="21"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="15">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="5"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="6"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="16">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="5"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="9"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="17">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="6"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="22"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="18">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="6"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="7"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="19">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="6"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="10"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="20">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="7"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="23"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="21">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="7"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="11"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="22">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="8"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="24"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="23">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="8"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="9"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="24">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="8"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="12"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="25">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="9"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="25"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="26">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="9"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="10"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="27">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="9"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="13"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="28">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="10"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="26"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="29">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="10"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="11"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="30">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="10"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="14"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="31">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="11"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="27"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="32">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="11"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="15"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="33">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="12"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="28"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="34">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="12"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="13"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="35">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="13"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="29"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="36">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="13"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="14"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="37">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="14"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="30"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="38">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="14"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="15"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+		<con id="39">
+			<interface value="0"/>
+			<ports>
+				<port id ="0">
+					<node value="15"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+				<port id ="1">
+					<node value="31"/>
+					<bufferDepth value="8"/>
+					<vcCount value="8"/>
+				</port>
+			</ports>
+		</con>
+	</connections>
+</network-on-chip>
diff --git a/src/networkInterface/NetworkInterfaceTlm.cpp b/src/networkInterface/NetworkInterfaceTlm.cpp
index a71b41c..ec57717 100755
--- a/src/networkInterface/NetworkInterfaceTlm.cpp
+++ b/src/networkInterface/NetworkInterfaceTlm.cpp
@@ -313,7 +313,7 @@ void NetworkInterfaceTlm::init_peq_cb(tlm_gp& trans, const tlm::tlm_phase& phase
     log_info("Init PEQ callback start for packet "+to_string(p_id));
     log_info("Phase "+string(phase.get_name())+" received");
     if (phase == tlm::END_REQ) {
-        update_credits(trans, 1);
+        //update_credits(trans, 1);
         curr_req = 0;
         if(p_id == -1){
             // Config msg transaction ended, so packet can be scheduled for deletion
@@ -507,7 +507,7 @@ void NetworkInterfaceTlm::send_response(tlm_gp& trans){
 
     tlm::tlm_sync_enum status = (*target[0])->nb_transport_bw(
                                     trans, bw_phase, delay);
-    update_credits(trans, -1);
+    //update_credits(trans, -1);
 
     if (status == tlm::TLM_UPDATED){
       target_peq.notify(trans, bw_phase, delay);
diff --git a/src/networkManager/NetworkManager.cpp b/src/networkManager/NetworkManager.cpp
index c1fa379..727fb3f 100755
--- a/src/networkManager/NetworkManager.cpp
+++ b/src/networkManager/NetworkManager.cpp
@@ -55,7 +55,6 @@ void NetworkManager::createTrafficPool() {
     get_max_pos(max_pos);
     // divided by num of layers (assuming equal number of nodes in each layer)
     unsigned long numOfPEs = globalResources.nodes.size() / (max_pos[2]+1);
-#ifndef ENABLE_NETRACE
     if (globalResources.benchmark == "task") {
         tp = std::make_unique<TaskPoolCS>();
     } else if (globalResources.benchmark == "synthetic") {
@@ -63,7 +62,6 @@ void NetworkManager::createTrafficPool() {
     } else {
         FATAL("Please specify correct benchmark type");
     }
-#endif
     tp->processingElements.resize(numOfPEs);
 }
 
diff --git a/src/router/router.cpp b/src/router/router.cpp
index 7a554fa..73b31e9 100755
--- a/src/router/router.cpp
+++ b/src/router/router.cpp
@@ -54,10 +54,10 @@ void TlmRouter::initialize(){
 
         valid_links[link] = false;
         resp_in_progress[link] = false;
-        nxt_resp_pend[link] = 0;
-        nxt_send_data_pend[link] = 0;
+        //nxt_resp_pend[link] = 0;
+        //nxt_send_data_pend[link] = 0;
         curr_req[link] = 0;
-        send_data_in_prog_dest[link] = Direction::invalid;
+        //send_data_in_prog_dest[link] = Direction::invalid;
         credit_counter[link] = NUM_CREDITS;
     }
 }
@@ -98,8 +98,8 @@ void TlmRouter::send_begin_req(int link, tlm_gp& trans, int dest_link){
                                 *new_trans, phase, delay);
     curr_req[dest_link] = new_trans;
     credit_counter[dest_link]--;
-    log_info(link, trans, 
-            "credits value updated: " + to_string(credit_counter[dest_link]));
+    log_info(link, trans, "credits value updated on link " + DIR::toString(dest_link) +
+                          ": " + to_string(credit_counter[dest_link]));
     // react to result
     if(status == TLM_UPDATED) {
         init_peq.notify(*new_trans, phase, delay);
@@ -109,8 +109,8 @@ void TlmRouter::send_begin_req(int link, tlm_gp& trans, int dest_link){
         curr_req[dest_link] = 0;
         check_transaction(link, *new_trans);
         credit_counter[dest_link]++;
-        log_info(link, trans, 
-                "credits value updated: " + to_string(credit_counter[dest_link]));
+        log_info(link, trans, "credits value updated on link " + DIR::toString(dest_link) +
+                              ": " + to_string(credit_counter[dest_link]));
         new_trans->release();
     }
 }
@@ -121,6 +121,12 @@ bool TlmRouter::send_data(int link, int dest_link, tlm_gp& trans){
     // check credits or that previous message is complete
     if (credit_counter[dest_link] > 0){
         send_begin_req(link, trans, dest_link);
+        // send response or add it to queue
+        if(resp_in_progress[link]) {
+            nxt_resp_pend[link].push(&trans);
+        }
+        else{ send_begin_response(link, trans); }
+
         return true;
     }
     else {
@@ -146,7 +152,6 @@ void TlmRouter::check_transaction(int link, tlm_gp& trans) {
     stream << hex << adr << " check, cmd=" << (cmd ? 'W' : 'R')
                          << ", data=" << hex << *ptr;
     log_info(link,trans, stream.str());
-    // Allow the memory manager to free the transaction object
     trans.release();
 }
 
@@ -177,12 +182,12 @@ void TlmRouter::init_peq_cb(tlm_gp& trans, const tlm_phase& phase){
     int link = get_link_from_extension(trans);
     log_info(link,trans, "Initiator PEQ callback start");
     log_info(link,trans, "Phase "+string(phase.get_name())+" received");
-    if (phase == END_REQ || (&trans == curr_req[link] && 
-                                    phase == BEGIN_RESP)){
+    if (phase == END_REQ || (&trans == curr_req[link] && phase == BEGIN_RESP)){
         curr_req[link] = 0;
-        credit_counter[link]++;
-        log_info(link, trans, 
-                "credits value updated: " + to_string(credit_counter[link]));
+        /*credit_counter[link]++;
+        log_info(link, trans, "credits value updated on link " + DIR::toString(link) +
+                ": " + to_string(credit_counter[link]));*/
+        log_info(link, trans, "Issuing next request");
         start_pend_req(link, trans);
     }
     else if (phase == BEGIN_REQ || phase == END_RESP){
@@ -190,7 +195,9 @@ void TlmRouter::init_peq_cb(tlm_gp& trans, const tlm_phase& phase){
     }
 
     if (phase == BEGIN_RESP) {
-        check_transaction(link, trans);
+        credit_counter[link]++;
+        log_info(link, trans, "credits value updated on link " + DIR::toString(link) +
+                ": " + to_string(credit_counter[link]));
         send_end_response(link, trans);
     }
 }
@@ -198,20 +205,20 @@ void TlmRouter::init_peq_cb(tlm_gp& trans, const tlm_phase& phase){
 
 void TlmRouter::start_pend_req(int rel_link, tlm_gp& trans){
     // find pending link
-    Direction pending_link = Direction::invalid;
     for(uint8_t dir=0; dir<Direction::num_dirs; dir++){
-        // check pending link valid and send data
-        if(send_data_in_prog_dest[dir] == rel_link){
-            pending_link = Direction(dir);
-            bool data_sent = send_data(pending_link, rel_link, 
-                *nxt_send_data_pend[pending_link]);
-            if (!data_sent){
-                log_error(pending_link, trans,
-                    "Credit counter was freed, but data can't be sent");
+        if( !nxt_send_data_pend[dir].empty() ){
+            // check pending link valid and send data
+            Direction rel_dest = send_data_in_prog_dest[dir].front();
+            if(rel_dest == rel_link){
+                tlm_gp* nxt_trans = nxt_send_data_pend[dir].front();
+                bool data_sent = send_data(dir, rel_link, *nxt_trans);
+                if (!data_sent){
+                    log_error(dir, trans, "Credit counter was freed, but data can't be sent");
+                }
+                send_data_in_prog_dest[dir].pop();
+                nxt_send_data_pend[dir].pop();
+                break;
             }
-            nxt_send_data_pend[pending_link] = 0;
-            send_data_in_prog_dest[dir] = Direction::invalid;
-            break;
         }
     }
 }
@@ -255,14 +262,15 @@ void TlmRouter::target_peq_cb(tlm_gp& trans, const tlm_phase& phase){
         case END_RESP:
             if (!resp_in_progress[link]){
                 log_warn(link,trans,
-                "Illegal transaction phase END_RESP received by target");
+                    "Illegal transaction phase END_RESP received by target");
             }
-            trans.release();
+            check_transaction(link, trans);
             // Target itself is now clear to issue the next BEGIN_RESP
             resp_in_progress[link] = false;
-            if (nxt_resp_pend[link]){
-                send_begin_response(link, *nxt_resp_pend[link]);
-                nxt_resp_pend[link] = 0;
+            if ( !nxt_resp_pend[link].empty() ){
+                log_info(link, trans, "Issuing next response");
+                send_begin_response(link, *nxt_resp_pend[link].front());
+                nxt_resp_pend[link].pop();
             }
             break;
         case END_REQ:
@@ -332,23 +340,9 @@ void TlmRouter::switching(int link, tlm_gp& trans){
     }
     // validate pending data sent
     if (!data_sent) {
-        if(nxt_send_data_pend[link]) {
-            log_error(link,trans,
-            "Attempt to have two pending data send in same destination");
-        }
-        nxt_send_data_pend[link] = &trans;
-        send_data_in_prog_dest[link] = destination;
+        nxt_send_data_pend[link].push(&trans);
+        send_data_in_prog_dest[link].push(destination);
     }
-    // validate pending response
-    if(resp_in_progress[link]) {
-        //TODO: Make sure that there is always only one transaction per link
-        if(nxt_resp_pend[link]){
-            log_error(link,trans,
-                "Attempt to have two pending responses in target");
-        }
-        nxt_resp_pend[link] = &trans;
-    }
-    else{ send_begin_response(link, trans); }
 }
 
 
diff --git a/src/router/router.h b/src/router/router.h
index 19b31d3..51d6272 100755
--- a/src/router/router.h
+++ b/src/router/router.h
@@ -27,6 +27,7 @@
 
 #include <systemc>
 #include <string>
+#include <queue>
 
 #include "tlm.h"
 #include "tlm_utils/simple_initiator_socket.h"
@@ -60,12 +61,12 @@ class TlmRouter : public sc_module{
         peq_with_cb_and_phase<TlmRouter> init_peq;
         peq_with_cb_and_phase<TlmRouter> target_peq;
         tlm_gp* curr_req[NUM_LINKS];
-        tlm_gp* nxt_resp_pend[NUM_LINKS];
-        tlm_gp* nxt_send_data_pend[NUM_LINKS];
         MemoryManager m_mm;
-        bool resp_in_progress[NUM_LINKS];
         int credit_counter[NUM_LINKS];
-        Dir send_data_in_prog_dest[NUM_LINKS];
+        bool resp_in_progress[NUM_LINKS];
+        queue<tlm_gp*> nxt_resp_pend[NUM_LINKS];
+        queue<tlm_gp*> nxt_send_data_pend[NUM_LINKS];
+        queue<Dir> send_data_in_prog_dest[NUM_LINKS];
 
         // attributes
         string router_name;
diff --git a/src/router/router_cs.cpp b/src/router/router_cs.cpp
index b5a3f8e..d310bfe 100755
--- a/src/router/router_cs.cpp
+++ b/src/router/router_cs.cpp
@@ -35,7 +35,7 @@ void TlmRouterCS::initialize(){
     TlmRouter::initialize();
     cout<<"Inherited function called";
     for(int link=0; link<NUM_LINKS; link++){
-        credit_counter[link] = NUM_CREDITS_CS;
+        //credit_counter[link] = NUM_CREDITS_CS;
         auto_rout_map[link] = Direction::invalid;
     }
 }
@@ -63,17 +63,17 @@ void TlmRouterCS::send_begin_req(int link, tlm_gp& trans, int dest_link){
     status = (*init_socket[dest_link])->nb_transport_fw(
                                 *new_trans, phase, delay);
     curr_req[dest_link] = new_trans;
-    credit_counter[dest_link]--;
-    log_info(link, trans, 
-            "credits value updated: " + to_string(credit_counter[link]));
+    //credit_counter[dest_link]--;
+    /*log_info(link, trans, 
+            "credits value updated: " + to_string(credit_counter[link]));*/
     // react to result
     if(status == TLM_COMPLETED) {
         log_error(link, trans, "Request completed prematurely");
         curr_req[dest_link] = 0;
         check_transaction(link, *new_trans);
-        credit_counter[dest_link]++;
-        log_info(link, trans, 
-                "credits value updated: " + to_string(credit_counter[dest_link]));
+        //credit_counter[dest_link]++;
+        /*log_info(link, trans, 
+                "credits value updated: " + to_string(credit_counter[dest_link]));*/
         new_trans->release();
     }
 }
diff --git a/src/utils/configuration.h b/src/utils/configuration.h
index 5172a1a..064c9a7 100755
--- a/src/utils/configuration.h
+++ b/src/utils/configuration.h
@@ -34,10 +34,10 @@ using namespace sc_dt;
 // router paremters
 #define NUM_CREDITS     7
 // router delays
-#define REQ_INIT_DELAY       20
-#define REQ_END_DELAY        20
-#define INTERN_PROC_DELAY    20
-#define RESP_END_DELAY       20
+#define REQ_INIT_DELAY       10
+#define REQ_END_DELAY        10
+#define INTERN_PROC_DELAY    100
+#define RESP_END_DELAY       10
 #define UNITS_DELAY          SC_NS
 
 // types
diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
index 50d0f3d..b7f5a30 100755
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -51,12 +51,15 @@ void get_max_pos(uint8_t max_pos[3]){
     vector<float> gr_pos[3];
     get_pos_distances(dists, gr_pos);
 
-    max_pos[0] = 1+round(max_element(gr_pos[0].begin(), 
-                                   gr_pos[0].end())[0]/dists[0]);
-    max_pos[1] = 1+round(max_element(gr_pos[1].begin(), 
-                                   gr_pos[1].end())[0]/dists[1]);
-    max_pos[2] = 1+round(max_element(gr_pos[2].begin(), 
-                                   gr_pos[2].end())[0]/dists[2]);
+    max_pos[0] = dists[0] != 0 ? 
+                    1+round(max_element(gr_pos[0].begin(), gr_pos[0].end())[0]/dists[0]) 
+                    : 1;
+    max_pos[1] = dists[1] != 0 ?
+                    1+round(max_element(gr_pos[1].begin(),gr_pos[1].end())[0]/dists[1])
+                    : 1;
+    max_pos[2] = dists[2] != 0 ?
+                    1+round(max_element(gr_pos[2].begin(), gr_pos[2].end())[0]/dists[2])
+                    : 1;
 }
 
 string get_type_name(dataTypeID_t id){