From a5259eacaeaa0850d09af485b3bbc6089de929b0 Mon Sep 17 00:00:00 2001 From: Adam Osiowy Date: Tue, 9 Jun 2020 22:16:34 +0200 Subject: [PATCH] final --- game.py | 21 +++++++++--------- requirements.txt | 4 ++-- .../glass/google-image(0113).jpeg | Bin 8317 -> 0 bytes 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 resources/smieci w kontenerach/glass/google-image(0113).jpeg diff --git a/game.py b/game.py index de99803..803f977 100644 --- a/game.py +++ b/game.py @@ -3,7 +3,6 @@ import modele import numpy as np import random import os -import shutil import astar import uczenie_kacper as kacper import uczenie_adamO as adamO @@ -11,18 +10,18 @@ import uczenie_adamB as adamB smieci_path = '' -smieci_w_kontenerach = "resources/smieci w kontenerach" +smieci_w_kontenerach = "resources\\smieci w kontenerach" # PODAJ OSOBE PRZED URUCHOMIENIEM (kacper/adamB/adamO) -osoba = 'adamB' +osoba = 'kacper' rfc = None if osoba == 'kacper': - smieci_path = 'resources/smieci' + smieci_path = 'resources\\smieci' elif osoba == 'adamB': - smieci_path = 'resources/smieci' + smieci_path = 'resources\\smieci' else: - smieci_path = 'resources/smieci_stare' + smieci_path = 'resources\\smieci_stare' rfc = adamO.rozpocznijUczenie() pygame.init() @@ -208,12 +207,12 @@ def utworzObiekty(): if not os.path.exists(smieci_w_kontenerach): os.makedirs(smieci_w_kontenerach) else: - for dir in os.listdir(os.getcwd() + "/" + smieci_w_kontenerach): - files = os.listdir(os.getcwd() + "/" + - smieci_w_kontenerach + "/" + dir) + for dir in os.listdir(os.getcwd() + "\\" + smieci_w_kontenerach): + files = os.listdir(os.getcwd() + "\\" + + smieci_w_kontenerach + "\\" + dir) for file in files: - os.remove(os.getcwd() + "/" + - smieci_w_kontenerach + "/" + dir + "/" + file) + os.remove(os.getcwd() + "\\" + + smieci_w_kontenerach + "\\" + dir + "\\" + file) kontener_szklo = modele.Kontener(4, 4, "glass") kontener_szklo.setImage(pygame.image.load( diff --git a/requirements.txt b/requirements.txt index caa07de..806b33d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,7 @@ pycodestyle==2.5.0 pydotplus==2.0.2 pygame==1.9.6 pyparsing==2.4.7 -PyQt5==5.9.2 +PyQt5==5.14.2 python-dateutil==2.8.1 PyYAML==5.3.1 requests==2.23.0 @@ -42,7 +42,7 @@ requests-oauthlib==1.3.0 rsa==4.0 scikit-learn==0.23.0 scipy==1.4.1 -sip==4.19.8 +sip==5.3.0 six==1.14.0 tensorboard==2.2.1 tensorboard-plugin-wit==1.6.0.post3 diff --git a/resources/smieci w kontenerach/glass/google-image(0113).jpeg b/resources/smieci w kontenerach/glass/google-image(0113).jpeg deleted file mode 100644 index 4e7ffc9b209ef005d1a907fbb4575afe29620065..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8317 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