From 9cd93b8047380c65efae95e63347e895032d1bb8 Mon Sep 17 00:00:00 2001
From: Arkadiusz <arek.jurga8@gmail.com>
Date: Sat, 20 Apr 2019 22:21:22 +0100
Subject: [PATCH] DFS w miare dziala, a kelner chodzi ver2

---
 .idea/workspace.xml               |  99 +++++++++++++++---------------
 __pycache__/waiter.cpython-37.pyc | Bin 5822 -> 5933 bytes
 game.py                           |   2 +-
 waiter.py                         |  12 ++--
 4 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index db12a95..882c8a5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="152ea650-8e02-4ed6-aa8c-04d44b275be4" 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$/game.py" beforeDir="false" afterPath="$PROJECT_DIR$/game.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/waiter.py" beforeDir="false" afterPath="$PROJECT_DIR$/waiter.py" afterDir="false" />
     </list>
@@ -16,17 +17,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/order.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
+            <state>
               <caret line="6" selection-start-line="6" selection-end-line="6" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/game.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="203">
-              <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
+            <state relative-caret-position="1475">
+              <caret line="59" column="26" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="26" />
               <folding>
                 <element signature="e#0#18#0" expanded="true" />
               </folding>
@@ -37,8 +38,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/gridElement.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
-              <caret line="14" column="59" lean-forward="true" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
+            <state>
+              <caret line="14" column="59" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
             </state>
           </provider>
         </entry>
@@ -46,7 +47,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/table.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
+            <state>
               <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
             </state>
           </provider>
@@ -55,7 +56,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pool.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
+            <state>
               <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
@@ -67,17 +68,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/orderTable.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
+            <state>
               <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/waiter.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1022">
-              <caret line="246" column="42" lean-forward="true" selection-start-line="246" selection-start-column="42" selection-end-line="246" selection-end-column="42" />
+            <state relative-caret-position="402">
+              <caret line="249" column="18" lean-forward="true" selection-start-line="249" selection-start-column="18" selection-end-line="249" selection-end-column="18" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -113,8 +114,8 @@
         <option value="$PROJECT_DIR$/table.py" />
         <option value="$PROJECT_DIR$/orderTable.py" />
         <option value="$PROJECT_DIR$/pool.py" />
-        <option value="$PROJECT_DIR$/waiter.py" />
         <option value="$PROJECT_DIR$/game.py" />
+        <option value="$PROJECT_DIR$/waiter.py" />
       </list>
     </option>
   </component>
@@ -132,6 +133,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -148,7 +150,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -383,9 +384,30 @@
     <entry file="file://$PROJECT_DIR$/Images/tlo.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/order.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gridElement.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="14" column="59" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/table.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pool.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
+        <state>
           <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
           <folding>
             <element signature="e#0#13#0" expanded="true" />
@@ -393,53 +415,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gridElement.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="59" lean-forward="true" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/orderTable.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
+        <state>
           <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/table.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/order.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/waiter.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1022">
-          <caret line="246" column="42" lean-forward="true" selection-start-line="246" selection-start-column="42" selection-end-line="246" selection-end-column="42" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/game.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
+        <state relative-caret-position="1475">
+          <caret line="59" column="26" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="26" />
           <folding>
             <element signature="e#0#18#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/waiter.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="402">
+          <caret line="249" column="18" lean-forward="true" selection-start-line="249" selection-start-column="18" selection-end-line="249" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/waiter.cpython-37.pyc b/__pycache__/waiter.cpython-37.pyc
index 025c24d19529e6d36e6029f7762be20c76d2d313..e13034934b712503094ae14f90e124ba5121978f 100644
GIT binary patch
delta 440
zcmZXQze~eF6vyAY{AijcV%sEAJ6Oa;P^qA^Qh$MngVv=8qFj{Lh&An?5)iC7IaCkC
zMM=TcK{5(Xf(~}+*g?dxe}$JgdXKyJzVCaV2Y0XIPZN4U*Hz%_?CNFn{aVlD^ITA%
z=s@W&V+pw?4ml7?0>Tndfr=MEMO$nLCFyx}gJ3LpB=?ABP!KN>M_60Q1V7Rq;#9C4
zJ4c)g+R6fAF-WTfafexn9+m^tZY4ZscgasI1a|5W2kU|-(Rc<Li11fYd7m`VePCbd
zY=S#97U{PeBRd&N63LzizV1N<S|JD(;>Rh8>S!F5_$}i0vw0&oR`2(dR1M8~s*?7N
z7KDgzhIoj2LW@6>!a9s5m}e9dd*S~8e9w$ptYd8D#CrL_?n*VswySQ6JKY#9*Q(C;
zNmtx;%2k#(XVpdC@9<q)W2ffykcNGz@%Vo#sG`a~%w1e$O>01Q1x`t9#Tr)RXu4Zq
ON7jNW^R|KtYUCHtE@MOh

delta 352
zcmZ3hw@;VXiI<m)0SHdFZI6kV$SbL#0pz4Gq%h_%M1g3g9L8LxC?-Y*cZL+^6qXi-
z6qZ!xX67iCjbWiojBK0NFwJFT6xr;>(#FWBy!j$)10$pH<{<VaMn<Q}7g;4YzvIwh
zWDMRc&BesXm^fLE`xRrxW=@`Itc>N87YLqV6xy6Cl+UPB!<xdD%`}0rsIP`$0e1~U
z7Q;eDMg}0ww16{(4a{auVF#<&Fj+=KT9XOPz64awi>8_hs+tw7;>+X=5d{gLG69e>
zkbyPK3z->#J_}~h<eI!iB!o#*aI&yy{N%}^_FPUtzh4C6VxP%(L`@~R7<qsYljN9e
nAeIL7-(N9twjySrdX~vs#FUs>i-acM6LaNY0g7-i@-P7aJLyo)

diff --git a/game.py b/game.py
index 9f69043..62863d1 100644
--- a/game.py
+++ b/game.py
@@ -47,7 +47,7 @@ class Game(object):
                 if i == self.x-1:
                     self.grid.append(list(self.row))
                     self.row.clear()
-        #self.waiter.dfsFind(self, self.waiter.lastStep, 1)
+        self.waiter.dfsFind(self, self.waiter.lastStep, 1)
         while True:
 
             for event in pygame.event.get():
diff --git a/waiter.py b/waiter.py
index bd26fc3..7bda2d2 100644
--- a/waiter.py
+++ b/waiter.py
@@ -1,4 +1,5 @@
 import pygame
+import time
 from pygame.math import Vector2
 
 class Waiter(object):
@@ -231,17 +232,20 @@ class Waiter(object):
         steps = []
         steps.append(self.checkPoss(self.game, self.currentOperation))
         step = steps[-1]
-        if step == "Left":
+        print(step[-1])
+        if step[-1] == "Left":
             self.moveLeft(self.game)
             self.currentOperation.append("Left")
-        if step == "Right":
+        if step[-1] == "Right":
             self.moveRight(self.game)
             self.currentOperation.append("Right")
-        if step == "Up":
+        if step[-1] == "Up":
             self.moveUp(self.game)
             self.currentOperation.append("Up")
-        if step == "Down":
+        if step[-1] == "Down":
             self.moveDown(self.game)
             self.currentOperation.append("Down")
         game.draw()
+        time.sleep(.500)
+        pygame.display.flip()
         self.dfsFind(self.game, self.currentOperation, idTable)