Debug and improve interference detection

10 files changed, 81 insertions, 9 deletions

diff --git a/tests/api_send_interferences_wlan0_ncom_2s1r/out b/tests/api_send_interferences_wlan0_ncom_2s1r/out
new file mode 100644
index 0000000..5f5d74b
--- /dev/null
+++ b/tests/api_send_interferences_wlan0_ncom_2s1r/out
@@ -0,0 +1,13 @@
+[t=0.000,src=n1,grp=def] Send 50 bytes on wlan0
+[t=0.000,src=n2,grp=def] Send 50 bytes on wlan0
+[t=133.333,src=n0,grp=def] Receive 50 bytes on wlan0 with errors
+[t=133.333,src=n2,grp=def] Receive 50 bytes on wlan0 with errors
+[t=133.333,src=n0,grp=def] Receive 50 bytes on wlan0 with errors
+[t=133.333,src=n1,grp=def] Receive 50 bytes on wlan0 with errors
+[t=133.333,src=n0,grp=def] Receiver receive code 1 is RCode.INTERFERENCES
+[t=133.333,src=n1,grp=def] Sender send code is RCode.SUCCESS
+[t=133.333,src=n2,grp=def] Sender send code is RCode.SUCCESS
+[t=133.333,src=n0,grp=def] Receiver receive code 2 is RCode.INTERFERENCES
+[t=133.333,src=n1,grp=def] Sender receive code is RCode.INTERFERENCES
+[t=133.333,src=n2,grp=def] Sender receive code is RCode.INTERFERENCES
+[t=133.333,src=esds] Simulation ends
diff --git a/tests/api_send_interferences_wlan0_ncom_2s1r/platform.yaml b/tests/api_send_interferences_wlan0_ncom_2s1r/platform.yaml
new file mode 100644
index 0000000..3480951
--- /dev/null
+++ b/tests/api_send_interferences_wlan0_ncom_2s1r/platform.yaml
@@ -0,0 +1,17 @@
+general:
+  interferences: yes
+
+nodes:
+  count: 3
+  implementations:
+    - 1-@ sender.py
+    - 0 receiver.py
+
+interfaces:
+  wlan0:
+    type: "wireless"
+    nodes: all
+    links:
+      - all 3bps 0s all
+    txperfs:
+      - all 3bps 0s
diff --git a/tests/api_send_interferences_wlan0_ncom_2s1r/receiver.py b/tests/api_send_interferences_wlan0_ncom_2s1r/receiver.py
new file mode 100644
index 0000000..a74c0de
--- /dev/null
+++ b/tests/api_send_interferences_wlan0_ncom_2s1r/receiver.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+def execute(api):
+    code,data=api.receive("wlan0")
+    api.log("Receiver receive code 1 is " + str(code))
+    code,data=api.receive("wlan0")
+    api.log("Receiver receive code 2 is " + str(code))
+    
+
diff --git a/tests/api_send_interferences_wlan0_ncom_2s1r/sender.py b/tests/api_send_interferences_wlan0_ncom_2s1r/sender.py
new file mode 100644
index 0000000..1c29920
--- /dev/null
+++ b/tests/api_send_interferences_wlan0_ncom_2s1r/sender.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+def execute(api):
+    if api.node_id==0:
+        code=api.send("wlan0","hello",50,None)
+    else:
+        code=api.send("wlan0","hello",50,None)
+    api.log("Sender send code is "+str(code))
+    code,data=api.receive("wlan0")
+    api.log("Sender receive code is "+str(code))
+    
\ No newline at end of file
diff --git a/tests/api_send_wlan0_2s1r/out b/tests/api_send_wlan0_2s1r/out
index f9f2e96..01a1cf1 100644
--- a/tests/api_send_wlan0_2s1r/out
+++ b/tests/api_send_wlan0_2s1r/out
@@ -1,6 +1,13 @@
 [t=0.000,src=n0,grp=def] Send 1 bytes on wlan0
 [t=0.000,src=n1,grp=def] Send 1 bytes on wlan0
-[t=0.000,src=n0,grp=def] Interferences on wlan0
-[t=0.000,src=n1,grp=def] Interferences on wlan0
-[t=0.000,src=n2,grp=def] Interferences on wlan0
+[t=1.000,src=n1,grp=def] Receive 1 bytes on wlan0 with errors
+[t=1.000,src=n2,grp=def] Receive 1 bytes on wlan0 with errors
+[t=1.000,src=n0,grp=def] Receive 1 bytes on wlan0 with errors
+[t=1.000,src=n2,grp=def] Receive 1 bytes on wlan0
+[t=1.000,src=n0,grp=def] Sender send code RCode.SUCCESS
+[t=1.000,src=n1,grp=def] Sender send code RCode.SUCCESS
+[t=1.000,src=n2,grp=def] Receiver code 1 RCode.INTERFERENCES
+[t=1.000,src=n0,grp=def] Sender receive code RCode.INTERFERENCES
+[t=1.000,src=n1,grp=def] Sender receive code RCode.INTERFERENCES
+[t=1.000,src=n2,grp=def] Receiver code 2 RCode.SUCCESS
 [t=1.000,src=esds] Simulation ends
diff --git a/tests/api_send_wlan0_2s1r/receiver.py b/tests/api_send_wlan0_2s1r/receiver.py
index 0b48f12..f72d47b 100644
--- a/tests/api_send_wlan0_2s1r/receiver.py
+++ b/tests/api_send_wlan0_2s1r/receiver.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
 def execute(api):
-    pass
+    code, data=api.receive("wlan0")
+    api.log("Receiver code 1 "+str(code))
+    code, data=api.receive("wlan0")
+    api.log("Receiver code 2 "+str(code))
 
diff --git a/tests/api_send_wlan0_2s1r/sender.py b/tests/api_send_wlan0_2s1r/sender.py
index 80f0fc2..bcaaa2a 100644
--- a/tests/api_send_wlan0_2s1r/sender.py
+++ b/tests/api_send_wlan0_2s1r/sender.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
 
 def execute(api):
-    api.send("wlan0","Hello World!",1,1)
+    code=api.send("wlan0","Hello World!",1,1)
+    api.log("Sender send code "+str(code))
+    code, data=api.receive("wlan0")
+    api.log("Sender receive code "+str(code))
\ No newline at end of file
diff --git a/tests/hidden_node_2s1r/out b/tests/hidden_node_2s1r/out
index 2b15788..2ce6af9 100644
--- a/tests/hidden_node_2s1r/out
+++ b/tests/hidden_node_2s1r/out
@@ -1,4 +1,9 @@
 [t=0.000,src=n0,grp=def] Send 1 bytes on wlan0
 [t=0.000,src=n2,grp=def] Send 1 bytes on wlan0
-[t=0.000,src=n1,grp=def] Interferences on wlan0
+[t=1.000,src=n1,grp=def] Receive 1 bytes on wlan0 with errors
+[t=1.000,src=n1,grp=def] Receive 1 bytes on wlan0 with errors
+[t=1.000,src=n0,grp=def] Sender RCode.SUCCESS
+[t=1.000,src=n1,grp=def] Receiver RCode.INTERFERENCES
+[t=1.000,src=n2,grp=def] Sender RCode.SUCCESS
+[t=1.000,src=n1,grp=def] Receiver RCode.INTERFERENCES
 [t=1.000,src=esds] Simulation ends
diff --git a/tests/hidden_node_2s1r/receiver.py b/tests/hidden_node_2s1r/receiver.py
index 0b48f12..4c66495 100644
--- a/tests/hidden_node_2s1r/receiver.py
+++ b/tests/hidden_node_2s1r/receiver.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
 def execute(api):
-    pass
-
+    code,data=api.receive("wlan0")
+    api.log("Receiver "+str(code))
+    code,data=api.receive("wlan0")
+    api.log("Receiver "+str(code))
+    
diff --git a/tests/hidden_node_2s1r/sender.py b/tests/hidden_node_2s1r/sender.py
index 80f0fc2..c07749a 100644
--- a/tests/hidden_node_2s1r/sender.py
+++ b/tests/hidden_node_2s1r/sender.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 
 def execute(api):
-    api.send("wlan0","Hello World!",1,1)
+    code=api.send("wlan0","Hello World!",1,1)
+    api.log("Sender "+str(code))