From 4a2696bd8901712b7262bccf756ae4fba48011a0 Mon Sep 17 00:00:00 2001
From: Art-cyber520 <arthar1@st.amu.edu.pl>
Date: Tue, 27 Apr 2021 14:15:48 +0200
Subject: [PATCH] Graphsearch and successor - perhaps they work right, but we
 have to check it

---
 bin/Classess/Node.py                         |  71 +++++++++----------
 bin/Classess/__pycache__/Node.cpython-38.pyc | Bin 2481 -> 2670 bytes
 bin/main/main.py                             |  20 ------
 3 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/bin/Classess/Node.py b/bin/Classess/Node.py
index 2382c11..9a7d4ac 100644
--- a/bin/Classess/Node.py
+++ b/bin/Classess/Node.py
@@ -22,90 +22,77 @@ def successor(state):
         node_state_left.state = State()
         node_state_left.state.coord = state.coord
         node_state_left.state.direction = "north"
-        #node_state_left.parent = state
         node_state_left.action = "Left"
 
         node_state_right.state = State()
         node_state_right.state.coord = state.coord
         node_state_right.state.direction = "south"
-        #node_state_right.parent = state
         node_state_right.action = "Right"
 
-        node_state_forward.state = State()
-        node_state_forward.state.coord = [state.coord[0] + 53, state.coord[1]]
-        node_state_forward.state.direction = state.direction
-        #node_state_forward.parent = state
-        node_state_forward.action = "Up"
-
-        #return [node_state_left, node_state_right, node_state_forward]
+        if state.coord[0] + 53 < 533:
+            node_state_forward.state = State()
+            node_state_forward.state.coord = [state.coord[0] + 53, state.coord[1]]
+            node_state_forward.state.direction = state.direction
+            node_state_forward.action = "Up"
 
     elif state.direction == "west":
 
         node_state_left.state = State()
         node_state_left.state.coord = state.coord
         node_state_left.state.direction = "south"
-        #node_state_left.parent = state
         node_state_left.action = "Left"
 
         node_state_right.state = State()
         node_state_right.state.coord = state.coord
         node_state_right.state.direction = "north"
-        #node_state_right.parent = state
         node_state_right.action = "Right"
 
-        node_state_forward.state = State()
-        node_state_forward.state.coord = [state.coord[0] - 53, state.coord[1]]
-        node_state_forward.state.direction = state.direction
-        #node_state_forward.parent = state
-        node_state_forward.action = "Up"
-
-        #return [node_state_left, node_state_right, node_state_forward]
+        if state.coord[0] > 3:
+            node_state_forward.state = State()
+            node_state_forward.state.coord = [state.coord[0] - 53, state.coord[1]]
+            node_state_forward.state.direction = state.direction
+            node_state_forward.action = "Up"
 
     elif state.direction == "north":
 
         node_state_left.state = State()
         node_state_left.state.coord = state.coord
         node_state_left.state.direction = "west"
-        #node_state_left.parent = state
         node_state_left.action = "Left"
 
         node_state_right.state = State()
         node_state_right.state.coord = state.coord
         node_state_right.state.direction = "east"
-        #node_state_right.parent = state
         node_state_right.action = "Right"
 
-        node_state_forward.state = State()
-        node_state_forward.state.coord = [state.coord[0], state.coord[1] - 53]
-        node_state_forward.state.direction = state.direction
-        #node_state_forward.parent = state
-        node_state_forward.action = "Up"
-
-        #return [node_state_left, node_state_right, node_state_forward]
+        if state.coord[1] > 3:
+            node_state_forward.state = State()
+            node_state_forward.state.coord = [state.coord[0], state.coord[1] - 53]
+            node_state_forward.state.direction = state.direction
+            node_state_forward.action = "Up"
 
     elif state.direction == "south":
 
         node_state_left.state = State()
         node_state_left.state.coord = state.coord
         node_state_left.state.direction = "east"
-        #node_state_left.parent = state
         node_state_left.action = "Left"
 
         node_state_right.state = State()
         node_state_right.state.coord = state.coord
         node_state_right.state.direction = "west"
-        #node_state_right.parent = state
         node_state_right.action = "Right"
 
-        node_state_forward.state = State()
-        node_state_forward.state.coord = [state.coord[0], state.coord[1] + 53]
-        node_state_forward.state.direction = state.direction
-        #node_state_forward.parent = state
-        node_state_forward.action = "Up"
+        if state.coord[1] + 53 < 533:
+            node_state_forward.state = State()
+            node_state_forward.state.coord = [state.coord[0], state.coord[1] + 53]
+            node_state_forward.state.direction = state.direction
+            node_state_forward.action = "Up"
 
-        #return [node_state_left, node_state_right, node_state_forward]
-
-    return [node_state_left, node_state_right, node_state_forward]
+    if len(node_state_forward.state.coord) != 0:
+        return [node_state_left, node_state_right, node_state_forward]
+    else:
+        return [node_state_left, node_state_right]
 
 
 def graphsearch(fringe, explored, start_state, end_state_coord):
@@ -126,7 +113,6 @@ def graphsearch(fringe, explored, start_state, end_state_coord):
         elem = fringe[iter]
 
         if elem.state.coord == end_state_coord:
-            print("Gotowe!")
             bool = False
             return fringe
 
@@ -166,8 +152,15 @@ def graphsearch(fringe, explored, start_state, end_state_coord):
                         another_states[i].parent = elem.state
                         fringe.append(another_states[i])
                 else:
-                    if another_states[i] in fringe:
+                    states = []
+                    for k in range(0, len(fringe)):
+                        new_state = [fringe[k].state.coord, fringe[k].state.direction]
+                        states.append(new_state)
+                    now_state = [another_states[i].state.coord, another_states[i].state.direction]
+                    if now_state in states:
                         break
+                    # if another_states[i] in fringe:
+                    #     break
                     if another_states[i].state.direction == fringe[j].state.direction:
                         another_states[i].parent = elem.state
                         fringe.append(another_states[i])
diff --git a/bin/Classess/__pycache__/Node.cpython-38.pyc b/bin/Classess/__pycache__/Node.cpython-38.pyc
index dc862e5548ac9614ecb7c291c6769c09efab2fb6..06dc08ffbb0c1335a6e845812172251afd6d628b 100644
GIT binary patch
delta 1059
zcma))&1(}u6u{@bnVtQ}rmab%NuzC{P>8mOAXGhhs2`__wiOSSR@oZdNNBf<7MaCE
z4i*m@GX4ST!K?P_*`pv{^B35Q;8hR$W}9vZt>7;E_I=Fz&6{~|xA<c;znsr|jGp6v
zp0ADV=0D@)4l)+A7E2(Nm`bi#2mv%Odar-t<pP-^kQEl#Cs^P#SoBVx;}vlAS6(W4
zimzI2XnsnQat&-lbcxc6dWX-R&Qkq`Xk)Y%V~bIO*`bFlvs531O{XwSVP6aka{85+
z&@&=$LLzXfntvdBxErEUOlxbtPGN#zR6ttUOEEc@QyB792rPxGR>tg|@TgLI+;5_C
zHs!`r@sNk21%YgE%1{avDqiP{%xHC7WC2@bwY>f<W~vWMbk%!6x8KF(jjnjIz7_9r
zGHbTJV2xW{{%F0aZ(A$RlxY!4pcg%KzypW0gMWdnljQTz&wK~5k^hJ}N92w6@+20(
z;}}ionmmQ$sISX2WRB^_a_ZWhfG1MXffT&q%6<#L=nCu*T97!g9Y8FU(}EVxvo@@B
z5|?a7G0()5*Yj`d@5I_xj-nQZ5L$t#&;+Pl-%7jQU*Tj?hbHnDu+67URcDDG+j_~K
zy6Ds~8B#vgG-PUO!=~S-XPQ|xtcI1}kTjro4Ml&nt9GYPx_OxNBFncjZIIM8q<(Cm
z){fcXN{8Zf$~l%;o73q)SPM~^TD){M8Z-TOBQq6|WrQTrmG?F_)|){zZal|~n9vWL
z5Ar^#Teo!8tu6=<G#eh6&W*r4ltFp|3iKbM&jaE5FoFXfUIw35M6*O$sEPee#XeoR
H=V9qDbuiSI

delta 894
zcmaJ<&1(}u6rVRcJ3Bi~($*xJq}Em{LQK60(wm2(=%F5Jk0mW`8cbxHOcx3=i`s>P
zx4`sbPI~bwJ$q3Qq&E*9B>#aIp$G52nQGHRb(eiR^ZS_hcyE4|4vYD<d|ncKy07;)
zULEE?)A?(Zkc4C;1sAD{o+cfLpi9+(Ii`1N3C)Q1niggeuaYRZMBG}KW3OBek@E)-
z?>n39(gCOn8jEJ=-8{!!InPX;nL6{(nn9XRY|gB(yaB%q!n|bFqDvLOa9W01s%kFL
zM>e0Ans&S<M82j?-+CJ2q|`Rm9x}|j+zKLhjs}fP+gl~|3Dfi!r+)zUW<=L|BevVx
zN$T9Z^RJjAfBkvSc8zktmr5!?f}s4&|1wA_S?&z-SMh&F{L{mkn#G)tnayktd5L}p
z^MyA&P~XfizVL7(;StLKNaUqllU1VOji-aRh$MjyI*>ss5)nbdw8$W%%VYrS%V~&v
zf}FIRmVfXYrWq{U-_t^eRcuqokNhf*Nl%P-ZZu;>c*=&3VL<wOv2K$zmk4tdEG&g>
znig~pt18&42GGAaKL2!ORg-#B=eiv4&6YjId=N8@;fX>MhaXsc>^YlT4Xu7{h&)z(
zo1}jKdW8L`^A%OW<~_RmEV#FwZ11+Nsv7R=QrS5x-v*9h#5a4rRveAIr>$5`Tg30F
zCvl=?%}n^7ZzHnvz<dp776mY1cmpJqK)@6%Lk+lOZ~-b%z)u1Tb1+2<s55i23bSTO
H-h$2FY<jnC

diff --git a/bin/main/main.py b/bin/main/main.py
index d954bec..bf0747d 100644
--- a/bin/main/main.py
+++ b/bin/main/main.py
@@ -164,25 +164,13 @@ def Action(event):
 # Modified by Artem to search in the status area
 def MouseClickEvent(event):
     global fringe
-    #print(len(field.canvas_small_images), field.canvas_small_images)
     for i in range(0, len(field.canvas_small_images)):
         print(field.small_field_canvas.coords(field.canvas_small_images[i]))
-    #print("Lewy przycisk myszy zostal nacisniety!")
-    #node = nd.Node()
-    #print(node.state.coord, node.state.direction, node.action, node.parent)
-    #node.state = nd.State()
-    #node.state.coord = field.small_field_canvas.coords(player.image_canvas_id)
-    #node.state.direction = "east"
-    #node.state.coord = field.small_field_canvas.coords(field.canvas_small_images[5])
 
     start_position = field.small_field_canvas.coords(player.image_canvas_id)
     end_state_coord = []
     print("Pierwsza pozycja: {} {}".format(start_position[0], start_position[1]))
 
-
-    #print(node.state.coord, node.state.direction, node.parent, node.action)
-    #print("Pozycje myszy: {} {}".format(event.x, event.y))
-
     for i in range(0, len(field.canvas_small_images)):
         img_coords = field.small_field_canvas.coords(field.canvas_small_images[i])
         if (img_coords[0] <= event.x and event.x <= img_coords[0] + IMAGE_SIZE) and (img_coords[1] <= event.y and event.y <= img_coords[1] + IMAGE_SIZE):
@@ -194,22 +182,14 @@ def MouseClickEvent(event):
     if len(fringe) == 0:
         node.state.coord = field.small_field_canvas.coords(player.image_canvas_id)
         node.state.direction = "east"
-        print("Pierwszy state - OK")
     else:
         node = fringe[len(fringe) - 1]
-        print("Pozostale states - OK")
         
     fringe.clear()
-    print("\nLIST IS EMPTY: {}\n".format(fringe))
     explored.clear()
-    print("Czyszczenie list - OK")
 
-    # Successor - only east
     fringe = nd.graphsearch(fringe, explored, node.state, end_state_coord)
-    print("Fringe - OK")
-    #print(fringe)
 
-    print("{}".format(fringe))
     for i in range(0, len(fringe)):
         print('Node{} = State: {} {}, Parent: {} {}, Action: {}'.format(i + 1, fringe[i].state.coord, fringe[i].state.direction, fringe[i].parent.coord, fringe[i].parent.direction, fringe[i].action))