Zaktualizuj 'src/decisionTree.py'
This commit is contained in:
parent
35d84146d9
commit
9acdfc0cc8
@ -16,11 +16,12 @@ class DecisionTree:
|
||||
graphics = Graphics()
|
||||
self.waiter = Waiter(graphics)
|
||||
self.matrix = Matrix(graphics=graphics)
|
||||
self.tree = self.BuildTree(self.BuildDf())
|
||||
|
||||
def BuildDf(self):
|
||||
actionName = 'order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check'.split(',')
|
||||
distance = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27'.split(',')
|
||||
priority = '1,1,1,1,1,1,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4'.split(',')
|
||||
actionName = 'order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,order,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,goToBar,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,eat,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check,check'.split(',')
|
||||
distance = '0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27'.split(',')
|
||||
priority = '1,1,1,1,1,1,1,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4'.split(',')
|
||||
|
||||
dataset ={'actionName':actionName,'distance':distance,'priority':priority}
|
||||
df = pd.DataFrame(dataset,columns=['actionName','distance','priority'])
|
||||
@ -83,41 +84,32 @@ class DecisionTree:
|
||||
|
||||
return tree
|
||||
|
||||
|
||||
|
||||
|
||||
#Dodawanie zadan do listy zadan
|
||||
def TasksList(self, name, coordinate):
|
||||
def TasksList(self, name, coordinate, waiterPos):
|
||||
distance = []
|
||||
waiterNode = [self.waiter.X, self.waiter.Y]
|
||||
print(waiterPos)
|
||||
if name != "goToBar":
|
||||
if self.matrix.matrix[coordinate[0] - 1][coordinate[1] - 1].walk_through == 1:
|
||||
distance.append([abs(waiterNode[0] - (coordinate[0] - 1)) + abs(waiterNode[1] - (coordinate[1] - 1)), [coordinate[0] - 1, coordinate[1] - 1]])
|
||||
if self.matrix.matrix[coordinate[0] + 1][coordinate[1] - 1].walk_through == 1:
|
||||
distance.append([abs(waiterNode[0] - (coordinate[0] + 1)) + abs(waiterNode[1] - (coordinate[1] - 1)), [coordinate[0] + 1, coordinate[1] - 1]])
|
||||
if self.matrix.matrix[coordinate[0] + 1][coordinate[1]].walk_through == 1:
|
||||
distance.append([abs(coordinate[0] - (coordinate[0] + 1)) + abs(waiterNode[1] - coordinate[1]), [coordinate[0] + 1, coordinate[1] ]])
|
||||
if self.matrix.matrix[coordinate[0] + 1][coordinate[1] - 1].walk_through == 1:
|
||||
distance.append([abs(waiterNode[0] - (coordinate[0] + 1)) + abs(waiterNode[1] - (coordinate[1] - 1)), [coordinate[0] + 1, coordinate[1] - 1]])
|
||||
if self.matrix.matrix[coordinate[0] - 1][coordinate[1] + 1].walk_through == 1:
|
||||
distance.append([abs(waiterNode[0] - (coordinate[0] - 1)) + abs(waiterNode[1] - (coordinate[1] + 1)), [coordinate[0] - 1, coordinate[1] + 1]])
|
||||
distance.append([abs(coordinate[0] - (coordinate[0] + 1)) + abs(waiterPos[1] - coordinate[1]), [coordinate[0] + 1, coordinate[1] ]])
|
||||
if self.matrix.matrix[coordinate[0] - 1][coordinate[1]].walk_through == 1:
|
||||
distance.append([abs(coordinate[0] - (coordinate[0] - 1)) + abs(waiterPos[1] - coordinate[1]), [coordinate[0] - 1, coordinate[1] ]])
|
||||
|
||||
else:
|
||||
distance.append([abs(waiterNode[0] - 0) + abs(waiterNode[1] - 12), [0, 12]])
|
||||
distance.append([abs(waiterNode[0] - 1) + abs(waiterNode[1] - 12), [1, 12]])
|
||||
distance.append([abs(waiterNode[0] - 2) + abs(waiterNode[1] - 12), [2, 12]])
|
||||
distance.append([abs(waiterNode[0] - 3) + abs(waiterNode[1] - 12), [3, 12]])
|
||||
distance.append([abs(waiterNode[0] - 4) + abs(waiterNode[1] - 12), [4, 12]])
|
||||
distance.append([abs(waiterNode[0] - 5) + abs(waiterNode[1] - 13), [5, 13]])
|
||||
distance.append([abs(waiterNode[0] - 5) + abs(waiterNode[1] - 14), [5, 14]])
|
||||
if self.matrix.matrix[coordinate[0] + 1][coordinate[1]].walk_through == 1:
|
||||
distance.append([abs(waiterPos[0] - 3) + abs(waiterPos[1] - 12), [coordinate[0] + 1, coordinate[1] ]])
|
||||
if self.matrix.matrix[coordinate[0] - 1][coordinate[1]].walk_through == 1:
|
||||
distance.append([abs(waiterPos[0] - 3) + abs(waiterPos[1] - 12), [coordinate[0] - 1, coordinate[1] ]])
|
||||
|
||||
distance.sort(key=lambda x: x[0])
|
||||
tasksList.append([name, distance[0][0], distance[0][1]])
|
||||
|
||||
|
||||
#Kolejkowanie zadan
|
||||
def Queue(self, tasksList):
|
||||
df = self.BuildDf()
|
||||
tree = self.BuildTree(df)
|
||||
tree = self.tree
|
||||
winnerNode = self.FindWinner(df)
|
||||
|
||||
for i in tasksList:
|
||||
@ -153,6 +145,10 @@ class DecisionTree:
|
||||
print(queue)
|
||||
return queue
|
||||
|
||||
def RemoveTask(self):
|
||||
tasksList.remove(tasksList[0])
|
||||
|
||||
|
||||
def print(self):
|
||||
print(tasksList)
|
||||
|
Loading…
Reference in New Issue
Block a user