Zaktualizuj 'main.py'

This commit is contained in:
Dominik Zawadzki 2020-06-09 12:26:23 +00:00
parent 9acdfc0cc8
commit b1c7b70ace

31
main.py
View File

@ -32,6 +32,9 @@ if __name__ == "__main__":
# Dominik # Dominik
check = 0 check = 0
queue = [] queue = []
fromBar = 0
barNode = (3, 12)
node = ()
# Marcin Dobrowolski # Marcin Dobrowolski
suggestionTreeRoot = SuggestionTree.buildTree(trainingData) suggestionTreeRoot = SuggestionTree.buildTree(trainingData)
@ -165,17 +168,31 @@ if __name__ == "__main__":
path = waiter.translatePath(path) path = waiter.translatePath(path)
# Dominik # Dominik
if check == 1: if path == '' and fromBar == 0 and check == 1:
task = queue.pop(0) task = queue.pop(0)
goal = (task[2][0], task[2][1]) tree.RemoveTask()
print(goal) node = (task[2][0], task[2][1])
path = waiter.findPath(goal) if task[0] == "goToBar":
print(path) path = waiter.findPath(barNode)
fromBar = 1
else:
path = waiter.findPath(node)
path = waiter.translatePath(path) path = waiter.translatePath(path)
print(path) if fromBar == 1:
check = 0 check = 0
if len(queue) != 0 and check == 0 and path == '': if path == '' and fromBar == 1:
path = waiter.findPath(node)
path = waiter.translatePath(path)
fromBar = 0
if path != '':
nextStep = path[0]
path = path[1:]
waiter.travel(nextStep, graphics)
if len(queue) != 0 and check == 0 and path == '' and fromBar == 0:
check = 1 check = 1
# AStar # AStar