loic/esds
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/esds.git synced 2025-04-06 10:06:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debug

Browse source
This commit is contained in:
Loïc Guégan 2024-10-24 23:14:53 +02:00
parent 247999c6d1
commit 6f007a0bec
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esds/simulator.py
View file

@ -271,9 +271,8 @@ class Simulator:
#### All CASES WHERE INTERFERENCES OCCUR #### All CASES WHERE INTERFERENCES OCCUR
# receiver_is_sending # receiver_is_sending
# 1) check if current com receiver already sending # 1) check if current com receiver already sending
# 2) if yes, we check if current com is one that should be marked as interterference (current com is actually involving the receiver) see interferences_bug1 test # 2) ensure not dealing with the special com (where sender is the receiver)
# 3) ensure not dealing with the special com (where sender is the receiver) receiver_is_sending=(receiver==com_sender and sender!=receiver)
receiver_is_sending=(receiver==com_sender and com_receiver==receiver and sender!=receiver)
# receiver_is_receiving # receiver_is_receiving
# 1) check if the current com receiver is already receiving (thus interference) # 1) check if the current com receiver is already receiving (thus interference)
# 2) ensure not dealing with the special com (where sender is the receiver) # 2) ensure not dealing with the special com (where sender is the receiver)
@ -284,8 +283,10 @@ class Simulator:
sender_is_receiving=(com_receiver==sender and com_sender!=com_sender) sender_is_receiving=(com_receiver==sender and com_sender!=com_sender)
##### Update com return code ##### Update com return code
if receiver_is_sending or receiver_is_receiving or sender_is_receiving: if receiver_is_sending or receiver_is_receiving or sender_is_receiving:
status=True status=True # receiver_is_sending is handled by return code (see self.communicate())
if com_sender != com_receiver: # In the following test, we ignore the receiver_is_sending (see comment line above)
# By ignoring receiver_is_sending, we solve the interferences_bug1 (see tests)
if not receiver_is_sending and com_sender != com_receiver:
event[2][10]=RCode.INTERFERENCES # Tell the sender/receiver interferences occurred event[2][10]=RCode.INTERFERENCES # Tell the sender/receiver interferences occurred
return status return status