From 238355d785bf3d7b18b431800109e0ee3d905aef Mon Sep 17 00:00:00 2001 From: shaaqu Date: Wed, 10 Jun 2020 00:03:58 +0200 Subject: [PATCH] dziala! --- assigning.py | 2 +- coder.py | 3 ++- img/codes/Kinder-bueno.png | Bin 7884 -> 7907 bytes main.py | 6 ++++-- mcda.py | 2 +- product.py | 1 - shelf.py | 1 + 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assigning.py b/assigning.py index 1430f9f..813e381 100644 --- a/assigning.py +++ b/assigning.py @@ -5,7 +5,7 @@ from codes_recognizer.rocognizer import recognizer def assigning(product_code_path, shelfs): c = None - code = product_code_path + code = product_code_path[0] # code = recognizer(product_code_path) product_color = str(code[0]) + str(code[1]) for shelf in shelfs: diff --git a/coder.py b/coder.py index caf576b..8961003 100644 --- a/coder.py +++ b/coder.py @@ -72,5 +72,6 @@ def create_image(product): d.text((28, 28), string, font=fnt, fill=(0, 0, 0)) path = 'img/codes/' + product.name + '.png' img.save(path) - return string + r = [string, path] + return r diff --git a/img/codes/Kinder-bueno.png b/img/codes/Kinder-bueno.png index 1ba42bfe31a88305523c8ae347aee0847979c709..ce2df4895b7ee85a5c5871c671ed6832fbf55a5f 100644 GIT binary patch literal 7907 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 RiJ*Cnr>Ux=f>C-A`ajs~SY7}C literal 7884 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 diff --git a/main.py b/main.py index a82c2ba..8faa61c 100644 --- a/main.py +++ b/main.py @@ -79,11 +79,13 @@ def run(): ''' # list [x, y] dest_shelf = new_product.shelf(shelfs) - path = functions.a_star(board[agent.y][agent.x], dest_shelf, board) + dest_field = board[dest_shelf.y+1][dest_shelf.x] + path = functions.a_star(board[agent.y][agent.x], dest_field, board) + print(path) '''''' agent.item = new_product - # path.pop(len(path) - 1) + path.pop(len(path) - 1) next_step = path.pop(len(path) - 1) # agent.is_busy = True diff --git a/mcda.py b/mcda.py index a07060a..d4ed58a 100644 --- a/mcda.py +++ b/mcda.py @@ -103,6 +103,6 @@ def selectedSupply(): supply = [] for i in range(len(products)): supply.append([products[i].color, products[i].shape, products[i].mass, products[i].size, '-']) - supply.append(['-', '-', 0, '-', '-']) + # supply.append(['-', '-', 0, '-', '-']) print(supply) return supply \ No newline at end of file diff --git a/product.py b/product.py index 9d6c357..47d91ee 100644 --- a/product.py +++ b/product.py @@ -32,5 +32,4 @@ class FinalProduct: self.img = create_image(self) def shelf(self, shelfs): - print(self.img) return assigning(self.img, shelfs); diff --git a/shelf.py b/shelf.py index c73d77c..0d74593 100644 --- a/shelf.py +++ b/shelf.py @@ -20,6 +20,7 @@ class Shelf: self.level3.append(product) def get_field(self): + return self.field def get_color(self):