From 7baf7dadb3ff7d924aa2577c1a58186adbb15286 Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Sat, 10 Apr 2021 11:08:17 +0200
Subject: [PATCH] debugowanie

---
 .idea/workspace.xml              |  62 +++++++++++++++++++------------
 __pycache__/graph.cpython-37.pyc | Bin 3830 -> 4050 bytes
 graph.py                         |  36 ++++++++++++------
 py.py                            |   4 +-
 4 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ce33897..525805a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="56453584-72bd-49f4-a39c-fccf91ab20c6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fringe.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/graph.py" beforeDir="false" afterPath="$PROJECT_DIR$/graph.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/harvest.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/istate.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/py.py" beforeDir="false" afterPath="$PROJECT_DIR$/py.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tractor.py" beforeDir="false" afterPath="$PROJECT_DIR$/tractor.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -111,6 +107,8 @@
       <workItem from="1617982355911" duration="241000" />
       <workItem from="1617984929356" duration="612000" />
       <workItem from="1617992640419" duration="8178000" />
+      <workItem from="1618001458885" duration="787000" />
+      <workItem from="1618042095757" duration="3541000" />
     </task>
     <servers />
   </component>
@@ -122,44 +120,62 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617994393023" />
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom" timestamp="1618001369741">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom" timestamp="1618045669923">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1618001369741">
+    <state width="1879" height="295" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669923" />
+    <state width="1879" height="295" key="GridCell.Tab.0.center" timestamp="1618045669923">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1618001369741">
+    <state width="1879" height="295" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669923" />
+    <state width="1879" height="295" key="GridCell.Tab.0.left" timestamp="1618045669923">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1618001369741">
+    <state width="1879" height="295" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669923" />
+    <state width="1879" height="295" key="GridCell.Tab.0.right" timestamp="1618045669923">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1618001369741">
+    <state width="1879" height="295" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669923" />
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1618045669918">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1618001369741">
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669918" />
+    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1618045669918">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1618001369741">
+    <state width="1879" height="364" key="GridCell.Tab.1.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669918" />
+    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1618045669918">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1618001369741">
+    <state width="1879" height="364" key="GridCell.Tab.1.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669918" />
+    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1618045669918">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618001369741" />
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1617992641722">
+    <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618045669918" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1618042189818">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1617992641722" />
+    <state x="0" y="0" key="com.intellij.ide.util.TipDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1618042189818" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/graph.py</url>
+          <line>75</line>
+          <option name="timeStamp" value="7" />
+        </line-breakpoint>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="python-exception">
+          <properties notifyOnTerminate="true" exception="BaseException">
+            <option name="notifyOnTerminate" value="true" />
+          </properties>
+        </breakpoint>
+      </default-breakpoints>
+    </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1618001250511" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1618045588811" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/graph.cpython-37.pyc b/__pycache__/graph.cpython-37.pyc
index 6154e9784080d8aea3ed87e06ff354174e30f052..349c08b1bd59400c82b8659aa3d23b566a125376 100644
GIT binary patch
delta 1212
zcmaJ=%}*0S6rVRc`$<^{ew2?Qh!81af{7<InutM8m?%QhNCZ1wq=jvnt^~<8)s)18
z(WrAb?cIwpF&_N~xNx)aXe1oGnvi(#O;<j|=uYPM-kW*9d2imE{n5SE<6diSb_jmY
z9<0p0Z+YdmPfVc235O+;iX^1q2H})z8-!~WnxbeiuA`-+rE!Cs8zjZJ#ch;2cX$&@
z<DKULFu4iK;K)m~05SQNX2F$lZ53MO3oQ$6a#t(BahYZJ;iTMT9<<Ag`Yd$H*SZG@
zxvM`1O+Gbtp+`P3Ih>K-Odkg19V-K8<zqW8x2&6xlzsLroI~4#^Ku*Ul$><lz^MH0
zB+43I$HqB^v$zg~ERYfeq)I|kg&L_riH4Lzj*4DROVqcN)lP5~s(9y+qMue%-mFGE
z&7(B{@)w^Xe~#l>5kJ1iXXSq!pl6M$8De;@BlS}wm=UFfXhlIe#L?r=(Ef+ufNLW6
z=Mip{tR1m<8Sheqy}bSPLu4yQUxFC@FTIh#KKt?^w%uT_9%1h%uA-_Gx(<pK!fldt
zCU>w0WQQS0Gj=8B)LA-TcqCl4FdiE%i({yX69`F7bfQSb=F`Dq-Y?!;S}X>27G#zS
zLbWsk^?d8B_%NNmidu0HfdB&+EHJ1Ai9=c|41=0&jX4Bj0DaTCV&K<=)4~xwm9KI;
zHdOu?lHv%*#PKdV$KIEWz^EFbftneZp%JnQzLK0Jrq%VZ8cgj0Sz8aa(5%39GV9-^
zC97nI*pi$nvM52xfP_|PbJ{`h6q_@YHrG2yMK3wQ@12_!_1Khw+xxn5iq@T~U2Ev7
z)S;sSuViP)%HRzCx>#*va$Kl#Pl;~C9V)*xciuXUYF#Vj3!)b_kx-^y5Q}~wVyGvZ
zQig}tLMCNp)(T5`k>Pa%D?cA(8U+(wioyIm&oufY`sJ8AGBu5>#eM_=3F-jF9x#*+
z)}JA^VdWDLi-snK(JyI68T6qpsDcg!DxoOQu)N^J<!860RV8L&N8K(rVd+-<7Y7aw
AmjD0&

delta 1025
zcmaJ<&1(}u6rVRcJG-0aqbi|InzkynB*jCodMNdS>Y)}yX(d|vk;#^Rn546-6qyh(
zMf4yl10F;qISO6`PogKUo`fFEA0X&K4}##$HyfydinGk`ef{?F-kbMn^w)6mY$6dO
zcvj!nmOuADNe)g=qa}!dEm9;Gh@isSCBkabBA~^Djh2lT6<j#Gq-Y6Ocqo~Oi9VF}
z>xvIx={>j!o(7iI*XVWV({JboB=o3t8&dkIwE>4PR)Zs2vQ<dyJ?6uJ2A<ZJ?Te7n
z&ukxt(0&M1KjOb(L_cr@9M|8S3XJJRw+!R@gX=?H|L_L%8E*zA^nK5VlW6-etmk7d
z8mF+4fFlq%3XIAeY9%l>9*Wn*&fyKdA*_))C}?5hinO3j5NVtE)TeC#5=H30BB8ax
zTDBr>5Y{G@B4RRRHV!1I-0dOTNPfIeKFFQ#;d11@`ww@bhwC8si{TCnQ^kSA3a*fX
zJEvd9r-199@zae0m027>F}_j?*Q=FaX=^<QrH8IAnEmLm;8v+Lg<3F(KoShH`1M1s
z=Vn13!&u2S3_RvX7jHD<FQ|mLSc;mOB8l@wOMgrpZoE|_m=stVmTU_gd7Xz`amAXr
zf19qHHDzO0OmXuZJNJ~OcoWW(#XC1>-Ko3ERb<nV%P7IfkSIs-sC}+nK{EuAWk}Pm
zd!f_yG%-`8vsnyu4X@?4|LR!jzTfNWSRhlLDPnthfo$g&uos-DJvSrGZe9Hf`c*P}
zX$19-Rjbybwd>e5xn2on9KEt1p%5!_A6;wZqFdgnZB=DibU4m^B`ilnltU%~t5ii<
zX7yldGQEI~U<`pkj>doj!==_ssq_hmQ<+D9fy+@8((Ja(7%(f}O_$ftQ{&0#MIbqp
J%(=Fk`2!V<<vRcX

diff --git a/graph.py b/graph.py
index 5d5b96a..f13e119 100644
--- a/graph.py
+++ b/graph.py
@@ -1,3 +1,4 @@
+import copy
 import tractor
 class Node:
     def __init__(self, action, direction, parent, x, y):
@@ -61,19 +62,29 @@ def goal_test(elem, goaltest):
         return False
 def succ(elem):
     actions_list = []
-    actions_list.append(("rotate_left", (elem.get_x(), elem.get_y())))
-    actions_list.append(("rotate_right", (elem.get_x(), elem.get_y())))
+    temp = copy.copy(elem.get_direction())
+    if temp == 1:
+        temp = 4
+    else:
+        temp = temp - 1
+    actions_list.append(("rotate_left", (temp, elem.get_x(), elem.get_y())))
+    temp = copy.copy(elem.get_direction())
+    if temp == 4:
+        temp = 1
+    else:
+        temp = temp + 1
+    actions_list.append(("rotate_right", (temp, elem.get_x(), elem.get_y())))
     if tractor.Tractor.is_move_allowed_succ(elem) == "x + 1":
-        actions_list.append(("move", (elem.set_x(elem.get_x() + 1), elem.get_y())))
+        actions_list.append(("move", (elem.get_direction(), elem.set_x(elem.get_x() + 1), elem.get_y())))
     elif tractor.Tractor.is_move_allowed_succ(elem) == "y - 1":
-        actions_list.append(("move", (elem.get_x(), elem.set_y(elem.get_y() - 1))))
+        actions_list.append(("move", (elem.get_direction(), elem.get_x(), elem.set_y(elem.get_y() - 1))))
     elif tractor.Tractor.is_move_allowed_succ(elem) == "y + 1":
-        actions_list.append(("move", (elem.set_x(elem.get_x()), elem.set_y(elem.get_y() + 1))))
+        actions_list.append(("move", (elem.get_direction(), elem.get_x(), elem.set_y(elem.get_y() + 1))))
     elif tractor.Tractor.is_move_allowed_succ(elem) == "x - 1":
-        actions_list.append(("move", (elem.set_x(elem.get_x() - 1), elem.get_y())))
+        actions_list.append(("move", (elem.get_direction(), elem.set_x(elem.get_x() - 1), elem.get_y())))
     return actions_list
 def graphsearch(fringe, explored, istate, succ, goaltest):
-    node = Node(None, istate.get_direction(), None, istate.get_x(), istate.get_y())
+    node = Node(None, istate.get_direction(), None, istate.get_x(), istate.get_y()) #może None coś nie gra
     #fringe.add_to_fringe(node)
     fringe.append(node)
     while True:
@@ -81,16 +92,17 @@ def graphsearch(fringe, explored, istate, succ, goaltest):
             return False
         #elem = fringe.get_element_from_fringe_pop()
         elem = fringe.pop(0)
+        temp = copy.copy(elem) #żeby explored w for succ() nie zmieniało
         if goal_test(elem, goaltest) is True:
             return explored
         explored.append(elem)
-        for (action, state) in succ(elem):
+        for (action, state) in succ(temp):
             if state not in fringe and state not in explored:
-                x = Node(action, elem.get_direction(), elem, state[0], state[1])
+                x = Node(action, state[0], elem, state[1], state[2])
                 print(state[0])
                 print(state[1])
+                print(state[2])
                 print(x.get_action())
-                print(x.get_direction())
-                print(x.get_parent())
-
+                #print(x.get_direction())
+                #print(x.get_parent())
                 fringe.append(x)
\ No newline at end of file
diff --git a/py.py b/py.py
index 0881d7a..e794c69 100644
--- a/py.py
+++ b/py.py
@@ -14,7 +14,7 @@ def main():
     collected_plants_dict = {"beetroot": 0, "carrot": 0, "potato": 0, "wheat": 0}
     fertilizer_dict = {"beetroot": definitions.TRACTOR_FERTILIZER, "carrot": definitions.TRACTOR_FERTILIZER, "potato": definitions.TRACTOR_FERTILIZER, "wheat": definitions.TRACTOR_FERTILIZER}
     station1 = station.Station(collected_plants_dict)
-    tractor1 = tractor.Tractor(amount_of_seeds_dict, collected_plants_dict, definitions.TRACTOR_DIRECTION_SOUTH, fertilizer_dict, definitions.TRACTOR_FUEL, definitions.TRACTOR_WATER_LEVEL, 0, 0)
+    tractor1 = tractor.Tractor(amount_of_seeds_dict, collected_plants_dict, definitions.TRACTOR_DIRECTION_EAST, fertilizer_dict, definitions.TRACTOR_FUEL, definitions.TRACTOR_WATER_LEVEL, 0, 0)
     tractor1_rect = pygame.Rect(tractor1.get_x(), tractor1.get_y(), definitions.BLOCK_SIZE, definitions.BLOCK_SIZE)
     clock = pygame.time.Clock()
     run = True
@@ -23,7 +23,7 @@ def main():
         for event in pygame.event.get():
             if event.type == pygame.QUIT:
                 run = False
-        istate = graph.Istate(definitions.TRACTOR_DIRECTION_SOUTH, 0, 0)
+        istate = graph.Istate(definitions.TRACTOR_DIRECTION_EAST, 0, 0)
         istate1 = graph.Istate(None, 4, 4)
         print(graph.graphsearch([], [], istate, graph.succ, istate1))
         map1.draw_window(tractor1, tractor1_rect)