diff --git a/__pycache__/ekran.cpython-311.pyc b/__pycache__/ekran.cpython-311.pyc index fb3378d..47151c8 100644 Binary files a/__pycache__/ekran.cpython-311.pyc and b/__pycache__/ekran.cpython-311.pyc differ diff --git a/__pycache__/paczka.cpython-311.pyc b/__pycache__/paczka.cpython-311.pyc index c3f6e90..cd4c73b 100644 Binary files a/__pycache__/paczka.cpython-311.pyc and b/__pycache__/paczka.cpython-311.pyc differ diff --git a/__pycache__/regal.cpython-311.pyc b/__pycache__/regal.cpython-311.pyc index 37de8cc..c7d75cf 100644 Binary files a/__pycache__/regal.cpython-311.pyc and b/__pycache__/regal.cpython-311.pyc differ diff --git a/__pycache__/wozek.cpython-311.pyc b/__pycache__/wozek.cpython-311.pyc index 578d94e..406dafd 100644 Binary files a/__pycache__/wozek.cpython-311.pyc and b/__pycache__/wozek.cpython-311.pyc differ diff --git a/ekran.py b/ekran.py index ca73794..c009c34 100644 --- a/ekran.py +++ b/ekran.py @@ -50,11 +50,10 @@ def zwroc_regaly_kategoria(kategoria): lista_reg.append(reg) return lista_reg -def zwroc_regaly_wspolrzedne(x_reg, y_reg): - for regal in lista_regalow: - if regal.wiersz == obliczPixeleNaPodstawieKratek(x_reg) and regal.kolumna == obliczPixeleNaPodstawieKratek(y_reg): - return regal - +# def zwroc_regaly_wspolrzedne(x_reg, y_reg): +# for regal in lista_regalow: +# if regal.wiersz == obliczPixeleNaPodstawieKratek(x_reg) and regal.kolumna == obliczPixeleNaPodstawieKratek(y_reg): +# return regal def narysuj_siatke(): blockSize = 70 # Set the size of the grid block diff --git a/main.py b/main.py index 2cbd14b..ac27858 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ pygame.init() def main(): wozek = Wozek() - paczka = Paczka('duzy', 10, 'ogród', False, True, False, any, any, any, any, any) + paczka = Paczka('duzy', 10, 'narzedzia', False, True, False, any, any, any, any, any) ekran.lista_paczek.add(paczka) paczka.update_position(a_pix, b_pix) @@ -43,12 +43,11 @@ def main(): if wozek.ln == 0: wozek.load_package() wozek.dynamic_wozek_picture - print(wozek.storage) ## wozek jedzie odlozyc paczke na regal - paczka1 = wozek.storage.pop() + paczka1 = wozek.storage[0] - array, reg = paczka1.tablica_do_drzewa('ogród') + array, reg = paczka1.tablica_do_drzewa(paczka1.kategoria) plikZPrzecinkami = open("DecisionTree/training_data.txt", 'w') @@ -83,9 +82,11 @@ def main(): wozek.przemiesc_wozek_po_sciezce(sciezka) # print(wozek.storage) - # if wozek.ln != 0: # drops package - # wozek.drop_package() - # wozek.dynamic_wozek_picture() + if wozek.ln != 0: # drops package + wozek.drop_package() + reg.put_package_on_the_regal(paczka1, predictions) + wozek.dynamic_wozek_picture() + if event.type == pygame.MOUSEBUTTONDOWN: # lewy przycisk myszy diff --git a/paczka.py b/paczka.py index 87fb725..d9acda5 100644 --- a/paczka.py +++ b/paczka.py @@ -72,7 +72,6 @@ class Paczka(pygame.sprite.Sprite): def tablica_do_drzewa(self, kategoria): tablica = [] - # rozmiar if self.rozmiar == 'maly': tablica.append(0) @@ -103,7 +102,6 @@ class Paczka(pygame.sprite.Sprite): else: tablica.append(1) reg = ekran.zwroc_regaly_kategoria(kategoria) - # czy dolna wolna if reg[0].is_dolna_free() is True: tablica.append(0) diff --git a/regal.py b/regal.py index 89fbe12..c2c0649 100644 --- a/regal.py +++ b/regal.py @@ -85,5 +85,11 @@ class Regal(pygame.sprite.Sprite): return True return False + def put_package_on_the_regal(self, package, where): + if(where == 0): + self.dolna.append(package) + else: + self.gorna.append(package) +