From 97a210167ce95a280e5de3c785568474c360cf3a Mon Sep 17 00:00:00 2001
From: Tomasz Adamczyk <tpadamczyk7@gmail.com>
Date: Sat, 10 Apr 2021 19:16:34 +0200
Subject: [PATCH] =?UTF-8?q?naprawiony=20b=C5=82=C4=85d=20cofania?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                    |  36 ++++++++--------
 __pycache__/definitions.cpython-37.pyc | Bin 3400 -> 3400 bytes
 __pycache__/graph.cpython-37.pyc       | Bin 4392 -> 4392 bytes
 __pycache__/plant.cpython-37.pyc       | Bin 1713 -> 2478 bytes
 __pycache__/tractor.cpython-37.pyc     | Bin 8619 -> 8643 bytes
 plant.py                               |  56 ++++++++++++-------------
 py.py                                  |  10 +++--
 tractor.py                             |   8 ++--
 8 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a180c67..6864bd5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <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$/graph.py" beforeDir="false" afterPath="$PROJECT_DIR$/graph.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/plant.py" beforeDir="false" afterPath="$PROJECT_DIR$/plant.py" afterDir="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" />
@@ -114,6 +113,7 @@
       <workItem from="1618045709925" duration="3464000" />
       <workItem from="1618049213609" duration="5378000" />
       <workItem from="1618060647009" duration="10450000" />
+      <workItem from="1618073000111" duration="1948000" />
     </task>
     <servers />
   </component>
@@ -125,38 +125,38 @@
       <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="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.0.bottom" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.0.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.0.center" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.0.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.0.left" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.0.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.0.right" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.0.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.1.bottom/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.1.center" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.1.center/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.1.left" timestamp="1618074966357">
       <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="1618071825769" />
-    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1618071825769">
+    <state width="1879" height="364" key="GridCell.Tab.1.left/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
+    <state width="1879" height="364" key="GridCell.Tab.1.right" timestamp="1618074966357">
       <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="1618071825769" />
+    <state width="1879" height="364" key="GridCell.Tab.1.right/0.0.1920.1080@0.0.1920.1080" timestamp="1618074966357" />
     <state x="0" y="0" key="com.intellij.ide.util.TipDialog" timestamp="1618060648138">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -174,6 +174,6 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/SmartTractor$py.coverage" NAME="py Coverage Results" MODIFIED="1618071647071" 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="1618074916801" 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__/definitions.cpython-37.pyc b/__pycache__/definitions.cpython-37.pyc
index aae9f00fa4e4380229470a74978e82a66cc3da37..ba1ba5ce0c0f2f96c09a3e35192ba44f41f7d49b 100644
GIT binary patch
delta 212
zcmX>hbwY~QiI<m)0SHv?7ACye$g9GnEF2}1!W<==Dx1P0!jQr$&JZP+%9zEvfGw3F
zi+uq{3R{ZE<PauxM$ySNKvHb-5+Er)`3#VhnEVAuN=}wxR%eu&>;fdEC+7f3naNXt
zr0nE9%#xCFQJN{NQCcZ1QQ9f;Q93DdQMxG#QF<xDo8K|lGqJuD0lH;#E*mQ&Yv%ux
zv#dAQu)8r!MTv(5IXZ{<2gSR12Dv(ic>4Rr`}qfjc--22hbx1TO$Ml`NM^DZ&p!Y|
Coi@t=

delta 214
zcmX>hbwY~QiI<m)0SHcQElha2kynLDnKeo#g*i$#RW^l1gdv4hoFPgsl`)HT0b43V
z7W)E@6t)!M$stVYj3Se3fTZZ;B|uVa@);m0KKTofl$b2Ttj;Jo*#$^SP0j(5(vznE
zNtwxem?b4;qcl@kqqI_3qO?=wqI6PZqjXc`qx4b~Hos%8XPUf)O>lBE+ZV2vCxC8x
zDFP%m*RZ=WOWhI=337A}@ehi3@eFcx4)OH&i}&*n3h{{Ae1|K8kxdq;vPgEa7tcQc
DHt;wi

diff --git a/__pycache__/graph.cpython-37.pyc b/__pycache__/graph.cpython-37.pyc
index 66a7a5ed6cbaa2c552a843c898d3de591aaa0e73..699e78171d9268e82f777cd4755bfd1c6303ee11 100644
GIT binary patch
delta 19
ZcmZ3Xv_gr?iI<m)0SNwH-^e8=2mmi^1j7IT

delta 19
ZcmZ3Xv_gr?iI<m)0SIFEY~+#?1OO`~1PA~C

diff --git a/__pycache__/plant.cpython-37.pyc b/__pycache__/plant.cpython-37.pyc
index 238da7a46efaec7fcaa6a7c05e58311adbc29779..7b39b4241026eba1ebf959c0d31c2a96d5bc6427 100644
GIT binary patch
delta 938
zcma)*&u`N(6vu5RcC)r=OFLLAZDSzOtrw(mLcJjIqv9|DQU#Ncpkz%Lu(fGjqje}z
z4&x8#$Z;H6PMjtx{+ozDfbk!2g7?xE(F0<(-p77l*<U})$=EzCn72(cNuZs4>%JHt
zn~&+%ar0K*F>KS$yeCKWY0}QtNhLS_+-3p8mCy_b0dWVScS;Gdsm~xZMcz;dwnS_Q
zUmwtZTgB=Ty-No4*>j(R_9WKWRIB;IBSU>eJYFK6C=oy5C5C)NhGIl)ZI8*1lROwE
zMg;7QSmHkO1RS~G(P0ud7oprZOF<?u!xFmHzsz*l`F)yCywb69KCfWjjPJ1ll{e??
z%&B%h!+AderOb+*6qkvWKVHHAZn{mn<!$1@Q^aL_^0e8^PSip7w3n<-YyuBzJUIIW
z?F=4|M8=NeDCxQ?5=~1=96PSElpFDbSB|A>m28x<o$!agF1WPXyH1$n)k36MJH3eS
zI;zp142R)Ees9@`^p@4xj0`2MrgG(GMEemvjI`G4c6h>9f+B8d?z=swry4Cwy_HU*
zvv0Lk20y490K#;t(;Qudo}*V`t^;Rdc`o08H9C8@`UoAa|I50GH^rutuWQ-|8ptdp
z5><)E${gYXA`hsT@)FJqh(*Lj#1f*2SU{u@B}5vrf>=dd22^yphVyHPGGZNpKMo-L
g!tc{m_>*sm4OA*&O<c)iB?dJ#gH3vRIXn>6-+`CmNdN!<

delta 143
zcmZ1{ypfmJiI<m)0SIc&6ehf!$Q#P&FfrMlErmCjL6dLemOQ4--E4ChMQ(8<rKXk?
z<>!|aF#;981QC;1#W^*3Z?P67=B1}jmSWYO?89owTEqjCnmmKmm7V1lOKxI;;pCsJ
mvXj?wI52Wee$U~<s4&@)Q&9k<h=Y-XnS%)o<tCSKS^)qLizDIy

diff --git a/__pycache__/tractor.cpython-37.pyc b/__pycache__/tractor.cpython-37.pyc
index 8b78c0457cd5a311b9030ddbf6bd4ef5c21c5214..2456a6c0ecd1fd497321bb0ac58bb4bb922f5c65 100644
GIT binary patch
delta 219
zcmZ4OeAt=SiI<m)0SJum6eg5z<Q0{v-vZ>-Ff3qL$WX$V#gxrdqyywJgLy0>ATbtk
z5XqX&P^6Q>7>rQM22>jcRLhR6R)QggDVwz@EQJ|KB?nMt6S_*Ushrum3`I>TEJ%vE
gfQr|kI{|9!n#tQ_7V&B@vM{OvF__+*D(l7q0N1HA!~g&Q

delta 195
zcmX@?yxN)9iI<m)0SMX-7bXa9<Q0{vp9AF8Ff3qL$WX$V#gxrdqz2?MgLy3CATic#
zh9b2T#$bdhHlQjmpelBVDhY-Zrfk+CuM}n^H5@=S1qd}@lQ@AU6{N5rsp85OWh$D2
cun=n0l*#907V#=EvM?$DF__+5E9=Gr0D9*yE&u=k

diff --git a/plant.py b/plant.py
index afa337b..93d7450 100644
--- a/plant.py
+++ b/plant.py
@@ -11,34 +11,34 @@ class Plant:
         return self.state
     def set_state(self, state):
         self.state = state
-    # @staticmethod
-    # def get_closest_mature_plant(map1, tractor1):
-    #     x = -1
-    #     y = -1
-    #     min = definitions.WIDTH_AMOUNT + definitions.HEIGHT_AMOUNT + 1
-    #     for i in range(definitions.WIDTH_AMOUNT):
-    #         for j in range(definitions.HEIGHT_AMOUNT):
-    #             field = map1.get_fields()[i][j]
-    #             if field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() == definitions.BEETROOTS_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
-    #                 x = i
-    #                 y = j
-    #                 min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
-    #             elif field.get_plant().get_name() == "carrot" and field.get_plant().get_state() == definitions.CARROTS_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
-    #                 x = i
-    #                 y = j
-    #                 min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
-    #             elif field.get_plant().get_name() == "potato" and field.get_plant().get_state() == definitions.POTATOES_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
-    #                 x = i
-    #                 y = j
-    #                 min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
-    #             elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() == definitions.WHEAT_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
-    #                 x = i
-    #                 y = j
-    #                 min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
-    #     if x == -1 and y == -1:
-    #         return False
-    #     else:
-    #         return x, y
+    @staticmethod
+    def get_closest_mature_plant(map1, tractor1):
+        x = -1
+        y = -1
+        min = definitions.WIDTH_AMOUNT + definitions.HEIGHT_AMOUNT + 1
+        for i in range(definitions.WIDTH_AMOUNT):
+            for j in range(definitions.HEIGHT_AMOUNT):
+                field = map1.get_fields()[i][j]
+                if field.get_plant().get_name() == "beetroot" and field.get_plant().get_state() == definitions.BEETROOTS_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
+                    x = i
+                    y = j
+                    min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
+                elif field.get_plant().get_name() == "carrot" and field.get_plant().get_state() == definitions.CARROTS_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
+                    x = i
+                    y = j
+                    min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
+                elif field.get_plant().get_name() == "potato" and field.get_plant().get_state() == definitions.POTATOES_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
+                    x = i
+                    y = j
+                    min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
+                elif field.get_plant().get_name() == "wheat" and field.get_plant().get_state() == definitions.WHEAT_MAXIMUM_STATE: #and abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j) < min:
+                    x = i
+                    y = j
+                    min = abs(tractor1.get_x() - i) + abs(tractor1.get_y() - j)
+        if x == -1 and y == -1:
+            return False
+        else:
+            return x, y
     @staticmethod
     def grow_plants(map1): #metoda statyczna, która zwiększa pole state (etap rozwoju rośliny) dla danej rośliny na danym polu o 1
         for i in range(definitions.WIDTH_AMOUNT):
diff --git a/py.py b/py.py
index d58c500..bd43cdd 100644
--- a/py.py
+++ b/py.py
@@ -16,7 +16,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_NORTH, fertilizer_dict, definitions.TRACTOR_FUEL, definitions.TRACTOR_WATER_LEVEL, 0, 0)
+    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_rect = pygame.Rect(tractor1.get_x(), tractor1.get_y(), definitions.BLOCK_SIZE, definitions.BLOCK_SIZE)
     clock = pygame.time.Clock()
     run = True
@@ -27,8 +27,12 @@ def main():
                 run = False
         map1.draw_window(tractor1, tractor1_rect)
         if not move_list:
-            istate = graph.Istate(tractor1.get_direction(), 0, 0)
-            move_list = (graph.graphsearch([], [], istate, graph.succ, (4, 4)))
+            istate = graph.Istate(tractor1.get_direction(), tractor1.get_x() / definitions.BLOCK_SIZE, tractor1.get_y() / definitions.BLOCK_SIZE)
+            r1 = random.randint(1, 9)
+            r2 = random.randint(1, 9)
+            print(r1)
+            print(r2)
+            move_list = (graph.graphsearch([], [], istate, graph.succ, (r1, r2)))
             print(move_list)
         elif move_list:
             temp = move_list.pop(0)
diff --git a/tractor.py b/tractor.py
index 08173c5..ac4f8ac 100644
--- a/tractor.py
+++ b/tractor.py
@@ -174,13 +174,13 @@ class Tractor:
             return False
     @staticmethod
     def is_move_allowed_succ(node): #sprawdza czy dany ruch, który chce wykonać traktor jest możliwy, zwraca pozycje po wykonaniu ruchu, wersja node
-        if node.get_direction() == definitions.TRACTOR_DIRECTION_EAST and node.get_x() + definitions.BLOCK_SIZE < definitions.WIDTH:
+        if node.get_direction() == definitions.TRACTOR_DIRECTION_EAST and node.get_x() * definitions.BLOCK_SIZE + definitions.BLOCK_SIZE < definitions.WIDTH:
             return "x + 1"
-        elif node.get_direction() == definitions.TRACTOR_DIRECTION_NORTH and node.get_y() - definitions.BLOCK_SIZE >= 0:
+        elif node.get_direction() == definitions.TRACTOR_DIRECTION_NORTH and node.get_y() * definitions.BLOCK_SIZE - definitions.BLOCK_SIZE >= 0:
             return "y - 1"
-        elif node.get_direction() == definitions.TRACTOR_DIRECTION_SOUTH and node.get_y() + definitions.BLOCK_SIZE < definitions.HEIGHT:
+        elif node.get_direction() == definitions.TRACTOR_DIRECTION_SOUTH and node.get_y() * definitions.BLOCK_SIZE + definitions.BLOCK_SIZE < definitions.HEIGHT:
             return "y + 1"
-        elif node.get_direction() == definitions.TRACTOR_DIRECTION_WEST and node.get_x() - definitions.BLOCK_SIZE >= 0:
+        elif node.get_direction() == definitions.TRACTOR_DIRECTION_WEST and node.get_x() * definitions.BLOCK_SIZE - definitions.BLOCK_SIZE >= 0:
             return "x - 1"
         else:
             return False