Use different matrix for wlan0 and eth0

24 files changed, 30 insertions, 30 deletions

diff --git a/tests/hidden_node_2s1r/simulator.py b/tests/hidden_node_2s1r/simulator.py
index 63ca502..bfe68ba 100755
--- a/tests/hidden_node_2s1r/simulator.py
+++ b/tests/hidden_node_2s1r/simulator.py
@@ -13,7 +13,7 @@ B[0,2]=0
 B[2,0]=0
 
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/mobility_eth0_bandwidth_1s1r/simulator.py b/tests/mobility_eth0_bandwidth_1s1r/simulator.py
index f7a0072..6d9d5fc 100755
--- a/tests/mobility_eth0_bandwidth_1s1r/simulator.py
+++ b/tests/mobility_eth0_bandwidth_1s1r/simulator.py
@@ -26,13 +26,13 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B*2,simulator.L)
+    simulator.update_network(simulator.B_wlan0*2,simulator.L_wlan0,simulator.B_eth0*2,simulator.L_eth0)
 
 s.run(breakpoints_every=1/2,breakpoint_callback=callback)
diff --git a/tests/mobility_eth0_bandwidth_2s1r/simulator.py b/tests/mobility_eth0_bandwidth_2s1r/simulator.py
index ba876d8..bc0712d 100755
--- a/tests/mobility_eth0_bandwidth_2s1r/simulator.py
+++ b/tests/mobility_eth0_bandwidth_2s1r/simulator.py
@@ -28,7 +28,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
@@ -36,6 +36,6 @@ s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B*2,simulator.L)
+    simulator.update_network(simulator.B_wlan0*2,simulator.L_wlan0,simulator.B_eth0*2,simulator.L_eth0)
 
 s.run(breakpoints_every=1,breakpoint_callback=callback,debug=True)
diff --git a/tests/mobility_eth0_latency_1s1r/simulator.py b/tests/mobility_eth0_latency_1s1r/simulator.py
index 525bb66..f25e231 100755
--- a/tests/mobility_eth0_latency_1s1r/simulator.py
+++ b/tests/mobility_eth0_latency_1s1r/simulator.py
@@ -27,13 +27,13 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B,simulator.L+1/2)
+    simulator.update_network(simulator.B_wlan0,simulator.L_wlan0+1/2,simulator.B_eth0,simulator.L_eth0+1/2)
 
 s.run(breakpoints_every=1/2,breakpoint_callback=callback)
diff --git a/tests/mobility_eth0_latency_2s1r/simulator.py b/tests/mobility_eth0_latency_2s1r/simulator.py
index 101004b..ccc2a63 100755
--- a/tests/mobility_eth0_latency_2s1r/simulator.py
+++ b/tests/mobility_eth0_latency_2s1r/simulator.py
@@ -29,7 +29,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
@@ -37,6 +37,6 @@ s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B,simulator.L+0.5)
+    simulator.update_network(simulator.B_wlan0,simulator.L_wlan0+0.5,simulator.B_eth0,simulator.L_eth0+0.5)
 
 s.run(breakpoints_every=1,breakpoint_callback=callback,debug=True)
diff --git a/tests/mobility_wlan0_bandwidth_1s1r/simulator.py b/tests/mobility_wlan0_bandwidth_1s1r/simulator.py
index f7a0072..6d9d5fc 100755
--- a/tests/mobility_wlan0_bandwidth_1s1r/simulator.py
+++ b/tests/mobility_wlan0_bandwidth_1s1r/simulator.py
@@ -26,13 +26,13 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B*2,simulator.L)
+    simulator.update_network(simulator.B_wlan0*2,simulator.L_wlan0,simulator.B_eth0*2,simulator.L_eth0)
 
 s.run(breakpoints_every=1/2,breakpoint_callback=callback)
diff --git a/tests/mobility_wlan0_latency_1s1r/simulator.py b/tests/mobility_wlan0_latency_1s1r/simulator.py
index 525bb66..f25e231 100755
--- a/tests/mobility_wlan0_latency_1s1r/simulator.py
+++ b/tests/mobility_wlan0_latency_1s1r/simulator.py
@@ -27,13 +27,13 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
 
 def callback(simulator):
     simulator.log("Network update!")
-    simulator.update_network(simulator.B,simulator.L+1/2)
+    simulator.update_network(simulator.B_wlan0,simulator.L_wlan0+1/2,simulator.B_eth0,simulator.L_eth0+1/2)
 
 s.run(breakpoints_every=1/2,breakpoint_callback=callback)
diff --git a/tests/simple_breakpoints_auto_1n/simulator.py b/tests/simple_breakpoints_auto_1n/simulator.py
index c5e3b02..99cdafc 100755
--- a/tests/simple_breakpoints_auto_1n/simulator.py
+++ b/tests/simple_breakpoints_auto_1n/simulator.py
@@ -9,7 +9,7 @@ import numpy as np
 n=2
 B=np.full((2,2),n)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_breakpoints_manual_1n/simulator.py b/tests/simple_breakpoints_manual_1n/simulator.py
index a0d0d2b..1b27c88 100755
--- a/tests/simple_breakpoints_manual_1n/simulator.py
+++ b/tests/simple_breakpoints_manual_1n/simulator.py
@@ -9,7 +9,7 @@ import numpy as np
 n=2
 B=np.full((n,n),n)
 L=np.full((n,n),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_breakpoints_manual_no_callback_1n/simulator.py b/tests/simple_breakpoints_manual_no_callback_1n/simulator.py
index 93b1fef..85cfeb4 100755
--- a/tests/simple_breakpoints_manual_no_callback_1n/simulator.py
+++ b/tests/simple_breakpoints_manual_no_callback_1n/simulator.py
@@ -9,7 +9,7 @@ import numpy as np
 n=2
 B=np.full((n,n),n)
 L=np.full((n,n),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_log_5n/simulator.py b/tests/simple_log_5n/simulator.py
index 184340a..3f7775b 100755
--- a/tests/simple_log_5n/simulator.py
+++ b/tests/simple_log_5n/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((5,5),5)
 L=np.full((5,5),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_read_clock_2n/simulator.py b/tests/simple_read_clock_2n/simulator.py
index b2c042c..9690b3f 100755
--- a/tests/simple_read_clock_2n/simulator.py
+++ b/tests/simple_read_clock_2n/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((2,2),2)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_read_eth0_ncom_2s1r/simulator.py b/tests/simple_read_eth0_ncom_2s1r/simulator.py
index 5294b9d..c5ee571 100755
--- a/tests/simple_read_eth0_ncom_2s1r/simulator.py
+++ b/tests/simple_read_eth0_ncom_2s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),3)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
diff --git a/tests/simple_read_wlan0_ncom_2s1r/simulator.py b/tests/simple_read_wlan0_ncom_2s1r/simulator.py
index 5294b9d..c5ee571 100755
--- a/tests/simple_read_wlan0_ncom_2s1r/simulator.py
+++ b/tests/simple_read_wlan0_ncom_2s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),3)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
diff --git a/tests/simple_receivet_eth0_1s1r/simulator.py b/tests/simple_receivet_eth0_1s1r/simulator.py
index 5ec9a25..e80e7a1 100755
--- a/tests/simple_receivet_eth0_1s1r/simulator.py
+++ b/tests/simple_receivet_eth0_1s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/simple_send_eth0_1s1r/simulator.py b/tests/simple_send_eth0_1s1r/simulator.py
index f5f6ca6..39be96c 100755
--- a/tests/simple_send_eth0_1s1r/simulator.py
+++ b/tests/simple_send_eth0_1s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/simple_send_eth0_2s1r/simulator.py b/tests/simple_send_eth0_2s1r/simulator.py
index 9faaf3d..9980b2a 100755
--- a/tests/simple_send_eth0_2s1r/simulator.py
+++ b/tests/simple_send_eth0_2s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
diff --git a/tests/simple_send_eth0_3s1r/simulator.py b/tests/simple_send_eth0_3s1r/simulator.py
index 4a5aede..cc09486 100755
--- a/tests/simple_send_eth0_3s1r/simulator.py
+++ b/tests/simple_send_eth0_3s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((4,4),8)
 L=np.full((4,4),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
diff --git a/tests/simple_send_wlan0_1s2r/simulator.py b/tests/simple_send_wlan0_1s2r/simulator.py
index 3f53e63..0778101 100755
--- a/tests/simple_send_wlan0_1s2r/simulator.py
+++ b/tests/simple_send_wlan0_1s2r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/simple_send_wlan0_2s1r/simulator.py b/tests/simple_send_wlan0_2s1r/simulator.py
index 9faaf3d..9980b2a 100755
--- a/tests/simple_send_wlan0_2s1r/simulator.py
+++ b/tests/simple_send_wlan0_2s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("sender")
diff --git a/tests/simple_sendt_eth0_1s1r/simulator.py b/tests/simple_sendt_eth0_1s1r/simulator.py
index f5f6ca6..39be96c 100755
--- a/tests/simple_sendt_eth0_1s1r/simulator.py
+++ b/tests/simple_sendt_eth0_1s1r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((2,2),8)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/simple_sendt_wlan0_1s2r/simulator.py b/tests/simple_sendt_wlan0_1s2r/simulator.py
index 3f53e63..0778101 100755
--- a/tests/simple_sendt_wlan0_1s2r/simulator.py
+++ b/tests/simple_sendt_wlan0_1s2r/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),8)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("sender")
 s.create_node("receiver")
diff --git a/tests/simple_wait_2n/simulator.py b/tests/simple_wait_2n/simulator.py
index b2c042c..9690b3f 100755
--- a/tests/simple_wait_2n/simulator.py
+++ b/tests/simple_wait_2n/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((2,2),2)
 L=np.full((2,2),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")
diff --git a/tests/simple_wait_end_3n/simulator.py b/tests/simple_wait_end_3n/simulator.py
index d4c9ec4..6b68c46 100755
--- a/tests/simple_wait_end_3n/simulator.py
+++ b/tests/simple_wait_end_3n/simulator.py
@@ -8,7 +8,7 @@ import numpy as np
 
 B=np.full((3,3),2)
 L=np.full((3,3),0)
-s=esds.Simulator(B,L)
+s=esds.Simulator(B,L,B,L)
 
 s.create_node("node")
 s.create_node("node")