From f27ff12d88c1a0540d295018384393e634eac24b Mon Sep 17 00:00:00 2001 From: s473561 Date: Sun, 18 Jun 2023 13:07:05 +0200 Subject: [PATCH] cleaned up code, removed unneccessary methods in wozek --- __pycache__/ekran.cpython-311.pyc | Bin 6425 -> 7727 bytes __pycache__/grid.cpython-311.pyc | Bin 2931 -> 2869 bytes __pycache__/paczka.cpython-311.pyc | Bin 6176 -> 6213 bytes __pycache__/regal.cpython-311.pyc | Bin 4894 -> 4818 bytes __pycache__/wozek.cpython-311.pyc | Bin 7918 -> 6454 bytes __pycache__/wyszukiwanie.cpython-311.pyc | Bin 7045 -> 7050 bytes algorytm_genetyczny.py | 2 +- drzewo_decyzyjne.py | 2 +- grid.py | 11 +--- itemList.py | 15 +----- main.py | 18 ------- plansza.py | 1 - regal.py | 13 +---- wozek.py | 61 ++--------------------- 14 files changed, 9 insertions(+), 114 deletions(-) diff --git a/__pycache__/ekran.cpython-311.pyc b/__pycache__/ekran.cpython-311.pyc index 9d2c92753d5672b4c5b8fcc0e133f3fbd9014d39..646c2b3952e313265b41b634331d2b46407b75bb 100644 GIT binary patch literal 7727 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 R*ekq>AHmXJa3}(s4FK8Fjf4OI diff --git a/__pycache__/regal.cpython-311.pyc b/__pycache__/regal.cpython-311.pyc index a892f15d9035e064c159a8060ee1f58df3b38e65..124145388356cc9e0223fe288bad5560bfd6da79 100644 GIT binary patch delta 754 zcmbQIc1e|YIWI340}wPk?n{}xk++wT@y6!ajK++Nypzu}-DV8gyqcMvQ7@gLmaT@h zh9RC8q!t8f*nm7f2ph;_$YO!9Q&=XyV{vC>pX|VK1~yNi z>;YDDMm8js?08jjAgScUtCDLn4+qS4ZagZryA|_-?VL^mRFb z3o&W_YDmJ{fS?8Ri$G6qu%04L*i$@aYNRCd!XnbgzKGbJ z(6(<&I0{{W2v(FiLw*g6ZHhCtUc`&MO5>80#-4OaAtG@x!MCFsYs{ zMfm}W^MnE+O~?ui;~lGh*J?PX+ii1ki`uuH<}DX*s>NbdWK2(NjmJoKRN%gT#c5d0 z6Q;S^TJ4(VVe#f($M@=k%qW}d$45r~o00dWU`q9wKwtJ_gZXGV06FYxRk(=nw8w|e z3e{|o&r?C|jM5)3W&#))N+7 z!w-pj2KCA-g!6Qc oI$|r3^4SC_88SYbAW;Q4=Cj?|uddg=#HN33egEDgiPK*H1(?UTUH||9 diff --git a/__pycache__/wozek.cpython-311.pyc b/__pycache__/wozek.cpython-311.pyc index 27447ca5cba6ee10316b71346a2030a95609615a..15c080eb92a0217c5351c6c5e8cff9507c059e36 100644 GIT binary patch delta 2507 zcmb7FTWA|c6rEY^N-JqCKV->@AF|`ruGeuME+qlSDT&)WN@6>~2`T#7sM5w=Td&Nn zBU`vgA1x?gO3k#SAqn^^B_xGFO54x&uLMGEBd}NqG=zS*(4x>5N+6_nb}iK=X`nOG znVCB?cjw+Y_s;JJzj?#=WnG;IK`A``Bp&uH`a=0B7+pbe6vqh^v0EI$Fy;~{$wfHK zWR8R*$wzprj}t;fP`QYcL&s2@{|Lne6;HXCR#v7&yG7`x1EJgSw@btw#}i0)uCw8o zj7=$_=|;3s(F`@2&Vs;sQZ)>fEG`9cV)5I_!6KT)kp|e~HHCBOoH`xD8@gD-6tn*y zVUT`~uOI`{MI53Z<5MBSvXQNV^EmAmp(Pjn!4sgrx|>>RviZ&PBE4AG-7t?7cXi7= zTJkWVn^_Jgag5PhTo`-lk6f5OQu|LlG0XiWJIYThF?zvZVH*wfauX%Ul?exC)WWUKJQluUx zZPkse*Tlfjpc9~~oF10;<90eH-3Nar8~1u~9LF8@biWVMJ5w z>}0aTl(KVrZf07`MpK$f`j~EJh0Iy!w*)%d*R^3q8y#$FqjJ*@+($>7x9wY3SfW?`1AVO^H0#oFJ*%lX#d4r!oXHznQZ@N(R5N6O z1n6)6w{Z&{Y(9(!sNQ@ThweRVF5%JFVE=jqK)d<;`E!}KH@gkE2>n8uBuytt8&RMm zy9e1}AATS7$(sN=V_w&W31klqw`|Az=%JRiF6*$HdCJ2|i>G%$dIix#fdQI!HH;Xw zh(Tx`8?~r`xB>UvW-hV{Ic-$C&`t@}!IG0cY7NqZzD5DhW5q=Wxd5)p8iGLV8jIsx z4t6nK)APY?-db?HT1EclDyrY#h=(&o28rw?>_P}L)O2Lh8PlWbS_%QEYdWKujGBtG9S}fDGJQ!kU9iYWqLV7=p#$4G@*C_iMV2fS(7%O3 zbr~%-tt&GbE0^T_c0_Cu9)%<5Ujr1-Lw~5`?^*N9tA2UKzq91uSri|71D}3yw z>&%{`w(CW+ekKzKs)Ap1&Ct>*Q%cPwRdNpEPtQd+MkmsVnPh5?9EP1_guy`uJ#@US z3kPVX?R5x~F90X#_idNj?4W}c)l%c}cXW4a$9qPNpg_u6e~Xln!75t`4XKn7mg%z! z&}=iQA=~CLkoDge1?UTu1^U(^W`lcG2aw~S$aG~A5W8Tn5K}VRtSQ7<^Mbvww8|!D z!g_GFa7l`j^hicm?5SK+HM;`kHe@Vm==aqBv-`Yk~q99 z4%14T>@B*A_RYzSbhy1I&mIfX#en(W6qC_eMb~nw=}4$4(!(Zt88kE4&tMOOBMinF zoCPrJ6eX63>UvB~Bosx)BnVO~bsw_c1;QRT3s?fse**Zs0EaE)8K4U17Ip%~UxXkQ z#&88~LMN(kEF3EX951`2qQ7|Va{EGiVWh%)g#HSuL5LIjDyRmcD0Ej)4Vrzz5zy#vNqEpPpmk*{FYpBp<0z6yW#2*zOH*_UGR=)!18>Uv^L|M?$_tmFOzDr8gH literal 7918 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 diff --git a/__pycache__/wyszukiwanie.cpython-311.pyc b/__pycache__/wyszukiwanie.cpython-311.pyc index 59ec5904385275534b42c2b1a5a3864e3ebbce85..467a4250c617d0a9be10cbeb0d45751007f46512 100644 GIT binary patch delta 73 zcmZoQ?=t6I&dbZi00i=9Yg1-yZk6_Yw%JlDkP!gkybcNg diff --git a/algorytm_genetyczny.py b/algorytm_genetyczny.py index 14c6fe6..537e2fd 100644 --- a/algorytm_genetyczny.py +++ b/algorytm_genetyczny.py @@ -110,4 +110,4 @@ def print_board(osobnik): # uruchomienie algorytmu genetycznego # najlepszy_osobnik = ewolucja() -# print_board(najlepszy_osobnik) +# print_board(najlepszy_osobnik) \ No newline at end of file diff --git a/drzewo_decyzyjne.py b/drzewo_decyzyjne.py index a563a7e..823b1a0 100644 --- a/drzewo_decyzyjne.py +++ b/drzewo_decyzyjne.py @@ -46,4 +46,4 @@ def stworz_plik_drzewa_w_pdf(clf, feature_names, class_names): graph = graphviz.Source(dot_data) # Wyświetlanie drzewa - graph.view() + graph.view() \ No newline at end of file diff --git a/grid.py b/grid.py index 51313ab..3e687ff 100644 --- a/grid.py +++ b/grid.py @@ -9,16 +9,9 @@ class GridCellType(Enum): RACK = 1 PLACE = 2 -# class RackCellType(Enum): -# OGROD = 0 -# NARZEDZIA = 1 -# KUCHNIA = 2 -# MOTORYZACJA = 3 - class SearchGrid: grid: Dict[Tuple[int, int], GridCellType] = {} - # rack_grid : Dict[Tuple[int, int], GridCellType] = {} def __init__(self) -> None: self._init_grid() @@ -31,6 +24,4 @@ class SearchGrid: (x3, y3), (x3+1, y3), (x3, y3+1), (x3+1, y3+1), (x4, y4), (x4+1, y4), (x4, y4+1), (x4+1, y4+1),]: self.grid[(c,d)] = GridCellType.RACK for e, f in [(plansza.a, plansza.b),(plansza.c, plansza.d)]: - self.grid[(e,f)] = GridCellType.PLACE - - + self.grid[(e,f)] = GridCellType.PLACE \ No newline at end of file diff --git a/itemList.py b/itemList.py index ada7c0d..31b78ae 100644 --- a/itemList.py +++ b/itemList.py @@ -1,7 +1,5 @@ import pygame -# from paczka import Paczka - class listOfItems: list = [] item_group = pygame.sprite.Group() @@ -12,15 +10,4 @@ class listOfItems: def remove(self): last_item = self.list.pop() - self.item_group.remove(last_item) - - -# def zainicjuj_liste_paczek(init_x, init_y): -# packageList = listOfPackages() -# demo_paczka = Paczka('duzy', 10, any, False, True, False, any, any, any, any, any) -# demo_paczka.update_position(init_x, init_y) -# packageList.add(demo_paczka) -# return packageList - - - + self.item_group.remove(last_item) \ No newline at end of file diff --git a/main.py b/main.py index eede3df..b8a3a00 100644 --- a/main.py +++ b/main.py @@ -104,24 +104,6 @@ def main(): sciezka = wyszukiwanie.znajdz_sciezke(wezel) wozek.przemiesc_wozek_po_sciezce(sciezka) - # if grid_points.grid[(wiersz, kolumna)] is GridCellType.PLACE: #picks up package - # if wozek.ln == 0: - # wozek.load_package() - # wozek.dynamic_wozek_picture - # else: - # if wozek.ln != 0: # drops package - # wozek.drop_package() - # wozek.dynamic_wozek_picture() - - # if event.type == pygame.KEYDOWN: - # if event.key == pygame.K_SPACE: - # if wozek.ln == 0: - # wozek.load_package() - # wozek.dynamic_wozek_picture() - # else: - # wozek.drop_package() - # wozek.dynamic_wozek_picture() - ekran.odswiez_ekran(wozek) diff --git a/plansza.py b/plansza.py index 5502a4b..449d202 100644 --- a/plansza.py +++ b/plansza.py @@ -1,4 +1,3 @@ -import random import algorytm_genetyczny as genetic def obliczPixeleNaPodstawieKratek(wymiar): #Przeliczanie współrzędnych podanych w kratkach na pixele diff --git a/regal.py b/regal.py index c2c0649..d2519fe 100644 --- a/regal.py +++ b/regal.py @@ -4,7 +4,6 @@ MAX_STORAGE = 3 def obliczPixeleNaPodstawieKratek(wymiar): #Przeliczanie współrzędnych podanych w kratkach na pixele i = 1 - # pixele = 100 pixele = 73 while (i < wymiar): pixele = pixele + 70 @@ -33,13 +32,6 @@ class Regal(pygame.sprite.Sprite): self.kolumna = obliczPixeleNaPodstawieKratek(numerKolumny) self.dlugosc = obliczPixeleDlugosciRegalu(self) - package_storage = [] - shelfs = { # here packages are stored - "dolna": package_storage, - "gorna": package_storage - } - - storage_dolna = [] storage_gorna = [] @@ -89,7 +81,4 @@ class Regal(pygame.sprite.Sprite): if(where == 0): self.dolna.append(package) else: - self.gorna.append(package) - - - + self.gorna.append(package) \ No newline at end of file diff --git a/wozek.py b/wozek.py index 682f495..94c06c5 100644 --- a/wozek.py +++ b/wozek.py @@ -1,6 +1,5 @@ import ekran -import pygame,math -# from packageList import listOfPackages +import pygame from ekran import lista_itemow from letter import Letter import plansza @@ -13,40 +12,19 @@ class Wozek(pygame.sprite.Sprite): self.obecnyStan = None self.height = 64 self.width = 64 - self.image = pygame.image.load("images/pusty_wozek.png") - self.rect = self.image.get_rect() # Credit: Forklift icons created by Smashicons - Flaticon # https://www.flaticon.com/free-icons/forklift + self.image = pygame.image.load("images/pusty_wozek.png") + self.rect = self.image.get_rect() self.__zainicjuj_stan_poczatkowy() def draw(self): ekran.screen.blit(self.image, (self.obecnyStan.x, self.obecnyStan.y)) - # self.update_position(self.obecnyStan.x, self.obecnyStan.y) - #storage = ["none"] * 10 storage = [] max_size = 10 ln = len(storage) - def add_element(self, element): - if self.ln < self.max_size: - self.storage.append(element) - self.ln=self.ln+1 - else: - print("I'm full!") - def remove_element(self): - if self.ln > 0: - element = self.storage.pop() - self.ln=self.ln-1 - return element - else: - print("I'm empty!") - - def update_position(self, x, y): - self.obecnyStan.x = x - self.obecnyStan.y = y - self.rect.topleft = (x, y) - def dynamic_wozek_picture(self): if self.ln == 0: self.image = pygame.image.load("images/pusty_wozek.png") @@ -57,38 +35,7 @@ class Wozek(pygame.sprite.Sprite): elif (self.ln == 10): self.image = pygame.image.load("images/pelny_wozek_full_3_crates.png") - self.rect = self.image.get_rect() - - - def load_package(self): - #for package in listOfPackages.list: - # for package in listOfPackages: - # dist = math.sqrt((self.obecnyStan.x - package.x)**2 + (self.obecnyStan.y - package.y)**2) - # if dist <= 50: - # self.add_element(package) - # # listOfPackages.list.pop() - # listOfPackages.pop() - package = listOfPackages.pop() - dist = math.sqrt((self.obecnyStan.x - package.x)**2 + (self.obecnyStan.y - package.y)**2) - if dist <= 50: - self.add_element(package) - # listOfPackages.list.pop() - - def load_packages_collision(self): - pass - # packages_collision = pygame.sprite.spritecollide(self, listOfPackages.package_group, False) - # if packages_collision: - # for package in packages_collision: - # self.add_element(package) - # listOfPackages.list.remove(package) # collision doesn't work, collision always happens - - def drop_package(self): - package = self.remove_element() - if package is not None: - package.x = self.obecnyStan.x - package.y = self.obecnyStan.y - # listOfPackages.list.append(package) - listOfPackages.append(package) + self.rect = self.image.get_rect() def __zainicjuj_stan_poczatkowy(self): from wyszukiwanie import Stan