From a18927bfb4eb0e7daa66f73f38464550db9d7fb7 Mon Sep 17 00:00:00 2001 From: s450026 Date: Tue, 9 Jun 2020 15:32:39 +0200 Subject: [PATCH] fix simulation, fix tasklist --- main.py | 13 +++++++------ resources/simulations/simulation_1.txt | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index aec9dd4..d07725a 100644 --- a/main.py +++ b/main.py @@ -82,12 +82,13 @@ if __name__ == "__main__": break if event.key == pygame.K_s: - tree.TasksList('check', [2, 3]) - tree.TasksList('eat', [9, 6]) - tree.TasksList('order', [4, 8]) - tree.TasksList('goToBar', [11, 4]) - tree.TasksList('check', [2, 9]) - tree.TasksList('eat', [1, 1]) + waitPosition = [waiter.X, waiter.Y] + tree.TasksList('check', [2, 3], waitPosition) + tree.TasksList('eat', [9, 6], waitPosition) + tree.TasksList('order', [4, 8], waitPosition) + tree.TasksList('goToBar', [11, 4], waitPosition) + tree.TasksList('check', [2, 9], waitPosition) + tree.TasksList('eat', [1, 1], waitPosition) queue = tree.ReturnQueueList() tree.print() check = 1 diff --git a/resources/simulations/simulation_1.txt b/resources/simulations/simulation_1.txt index b452938..fce198d 100644 --- a/resources/simulations/simulation_1.txt +++ b/resources/simulations/simulation_1.txt @@ -1,13 +1,13 @@ ______________ ______________ __PW_____PW___ -_USWP___USWP__ -__OWS____OWSI_ +__SWP____SWP__ +__OWS____OWS__ __PWO____PWO__ -_USW____USW___ +__SW_____SW___ __OWP____OWP__ -__PWS____PWSI_ -_USWO___USWO__ +__PWS____PWS__ +__SWO____SWO__ __OW_____OW___ ______________ ______________