From 66dfb94548b89bcc979156051d8441a4057aa578 Mon Sep 17 00:00:00 2001
From: Michal Zmudzinski <michal.zmudzinski@gmail.com>
Date: Tue, 15 Jun 2021 19:59:23 +0200
Subject: [PATCH] bfs #fixed

---
 __pycache__/bfs.cpython-39.pyc | Bin 1516 -> 1705 bytes
 bfs.py                         |   8 ++++++--
 main.py                        |   2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/__pycache__/bfs.cpython-39.pyc b/__pycache__/bfs.cpython-39.pyc
index b61c917e8931b8e186a418843c54fd3483cf1e64..1ae82be8fa22bd6c9347f239e966bb365a453e79 100644
GIT binary patch
delta 684
zcmYLGJ&)5s5Z&1iug{5(2qEr3Cr&^>G6fYSAOsR+BoxuOF{iB2B|&k#HdmlMT@fQn
zbn+j#6BR<Dp`)OtP3wOEqKA?hJBVHF%<P+)o!K|PdLP5^APfVB>%q_OFFu@xZ->|L
zlCl^Ki@EU(H==@A7->|+VrgK^B7OS#_sN7)+Gde0@I1j&JVsG62PLeyedySX8@Ph^
zPS1IEzs2|lL%qQS#)vr|Gb6By99h7Zevo(?$tIW<(?wApEGDTHY|NOI=&=e##I292
zQCWGITDwJfE9h&Dmn3PPBz?3C4+Vn&?!lYhC^PBZ&KL2~C{pz&xC0mJHC*@UX&(ab
z%O3#Pwv>xSs1@6<wRi^?>-Xa3{yqW|iv71JkZQC<e5=>uM)K9EGi2Z#j&&)Vo=GQG
zyqL8XpL0u=vM)=oLslG^^UfIF^f{o7-ea9Va^9FZNjRaU-$v`%R{cueI;mXGsUxrz
z)?%(l5qXvGQ4W5s?K=wW4mO6=Athp&EiDbL<B&RT)Y48DrPYMezdC07|5=W8x-iKy
zE9@S+V||1JDO1y^ydJ3M&u$}F3{fzU?H+Im0ly3$^l|$jc>q^o8wPkR1x8+@4zt%q
X+O@KaP}^Qteu#tEsn=>(g#M+!5pIOY

delta 475
zcmY*UJxc>Y5Z&3YJCj^U5d+Evi8h{15dVU8nvmui74E=9$j9Cpn++)vu@l1fAt?p1
z5&R9dqJ^Zi5y9Tp*;5dAnYS}<-t5fWc%OOi#Pf0lPyPMzcz@<y`V|af5<)~m8u5rm
zYziTZph*HTd-#$8Z8QRI#&plz(W;~<cj5k-0u(<0gMcdgsFHbOSKyfr-vQrT^D4ZW
zTfRMh(PBX(Si;CjnRYrHO-v||RAv#I&}5o<^o%O&IV$~CQmfN)L6CKqfIenN&Y<y+
zlTD(z)mTNkmi>i2G@GzPVh+UCc&_tW3_;Ct7NYZ3H<%B6jg`1wHh+*)WxEDLSh0Su
zzY=}b?xu=cR#>pBD`~;8;3EWuzkKM#-RP*_OVkEtLTA`c+G!lE#K1g>R;z|&vWq}~
yXSYN-<e&%@kWj$uqH&soP2@^w%2ot&B~E+iN&M4&9jR=@th=h23t4BbTmA;0c4IyO

diff --git a/bfs.py b/bfs.py
index 3074435..18f77d4 100644
--- a/bfs.py
+++ b/bfs.py
@@ -9,6 +9,11 @@ class Node:
         self.parent = parent
         self.action = action
 
+    def __eq__(self, other):
+        if isinstance(other, Node):
+            return self.pos[0] == other.pos[0] and self.pos[1] == other.pos[1] and self.direction == other.direction
+        return False
+
 
 def successor(pos, direction, houses):
     neighbours = []
@@ -38,13 +43,12 @@ def bfs(pos, direction, end_pos, houses):
 
     while queue:
         curr_node = queue.pop(0)
-        print(curr_node.pos, curr_node.direction)
+
         if not is_house(curr_node.pos, houses) and curr_node.pos == end_pos:
             while curr_node.parent:
                 print(curr_node.pos, end_pos)
                 actions.append(curr_node.action)
                 curr_node = curr_node.parent
-            actions.append(curr_node.action)
             return actions
 
         visited.append(curr_node)
diff --git a/main.py b/main.py
index aa67b20..33908bc 100644
--- a/main.py
+++ b/main.py
@@ -83,9 +83,9 @@ def game_loop():
                     print('##################################################')
                     while actions:
                         action = actions.pop()
-                        print(action)
                         pygame.event.post(pygame.event.Event(
                             pygame.KEYDOWN, {'key': action}))
+
                         game_keys(truck, trash, houses, True)
                         update_images(gameDisplay, truck, trash, houses)
                 else: