From a4280236ba583f9e94d96fa5e331afbf556805c5 Mon Sep 17 00:00:00 2001
From: karoel2 <karoel123@gmail.com>
Date: Mon, 29 Jun 2020 04:06:11 +0200
Subject: [PATCH] hotfix

---
 .DS_Store | Bin 6148 -> 6148 bytes
 main.py   |  17 +++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index d94e3d0cdf42b85ded925c6e2d016918675b0aff..d7ca274918eec4cae80b9c4707bb771a2dd8663a 100644
GIT binary patch
literal 6148
zcmeH~ze)o^5XNUUNH9$b3oE(OO2`9<XE>`gO2k%8B1tgE9sViouF}HR2hcaLvo@_D
zK`bpSgFb|Qv%8qx#8YfUWG3u>mz~+W-+ke3vqYq-$E^xcnTU#Ltc6*0p9JT*O~jNP
znS&}mN3UI}H<LJ>sFVS5Kpgms4)C*Epe1TkmyW#Wcerrs=HeuZ8oi`}vEs(#{_tkA
zzv|~(U*^+}^KN*###AcNHa;nxP?L7iI<&_l9tADm<yX2)TW7bg7ltY4ym2xj{Jz@b
zrFG_=flCJ<O+k9-Q{F#}=UukNyUQob=AFYO%B%4?28N?cF*w@rYmDQqra7Fv%W+=2
z8gY0vBWLnzJP!42IAThu1&ZD{$I86saPlt4pzm;aH6xC^8jr*LF3ckFa|f_ya}-NP
zr56Xp0de5N0e(LOXsn^t%&2~Kpwn9bXaU1Ia9rjCXkaz8ni)j~q0CgMnX2p-Lz(Fq
z4{Tj%H8X0ald_u+Wv{I44n^s!<NSdxClwl%UK|hyd<Uk@*D|mFYx(<sf0BF?2gHGY
z<$x+g^{9$lvTN(a&GA|rpzWY>a9w6pPeEswV|~C&G4KC$AQ$ifG_;x-#Rx+F2xuFm
J69<0Pfp?v>w`>3a

delta 427
zcmZoMXfc=|#>B)qF;Q%yo}wr_0|Nsi1A_nqLn=dYQh9MfQcix-#>C}}^&lBGhD?TB
zhD3&RWLcp2iKK#@%;FLQgX@e;%q*;I>>M0i99+CyvB4Sn<-sM1C8fnqiAB*MUO-|=
zMiP`AlAoUgXD23wWu}(L3y3)9=anR8=A{;aHD{)z0+qys*JtLX<d-|;m*%AugAEFX
z$Z&9Qa&X2Ah*wve8|x?-n;F#VC{&x98|WyQ7@O7Ba&m~P8rpg$<W^Qy*VNX{06G>3
z7=c~{1AZtCqh<mbD4t9yPR>aJI+J1Y9#%Of28PLZSY_B+|HPD7$WH#pD(3=W9&$w2
zSCC;CoSdIq05cd}zAU&XFDE}Q9VpJYS&&1FWnzKLW_AvK4q#LO`QMo*^NTogfOG?$
L%Cb2^WDPR_<a=!e

diff --git a/main.py b/main.py
index 427e34e..8b0a7d7 100644
--- a/main.py
+++ b/main.py
@@ -70,7 +70,7 @@ def image_recognition():
     global WIN
     global LOSE
     t0= time.clock()
-    for _ in range(1000):
+    for _ in range(750):
 
         photo = random.choice(menu)
         prediction = model.predict(np.expand_dims(photo[0], axis=0))
@@ -87,16 +87,13 @@ def image_recognition():
                 LOSE += 1
             print(WIN, LOSE)
             break
-        waiter.order_list.pop()
-    #print(WIN, LOSSE - WIN)
-
     temp = [waiter.order_list[-1][0], waiter.order_list[-1][1]]
 
     waiter.order_list.pop()
     t1 = time.clock() - t0
-    print("Time elapsed: ", t1)
+    print("Time elapsed: ", round(t1, 2))
     if t1 < 10:
-        time.sleep(10-t1)
+        time.sleep(5-t1)
 
     return [photo[0], photo[1], temp[0], temp[1]]
 
@@ -544,14 +541,14 @@ class Agent:
                 if t[2] == 0:
                      restaurant.kitchen.remove(t)
                      waiter.food = True
-<<<<<<< HEAD
-=======
+
                      waiter.photos.append(image_recognition())
         #jesli sie zatrzymal na stoliku z jedzeniem to je daje
->>>>>>> update
+
         if restaurant.tiles[waiter.y][waiter.x].clientState == "wait" and waiter.food and not waiter.orders:
             restaurant.tiles[waiter.y][waiter.x].clientState = "eat"
             restaurant.tiles[waiter.y][waiter.x].client = 20
+            show_order(waiter.photos.pop())
             self.food = False
         self.idle = True
     def endTaskTest(self):
@@ -577,7 +574,7 @@ class Agent:
             restaurant.tiles[waiter.y][waiter.x].clientState = "eat"
             restaurant.tiles[waiter.y][waiter.x].client = 20
             self.food = False
-            show_order(waiter.photos.pop())
+            # show_order(waiter.photos.pop())
         self.idle = True
         if IDLE == "kitchen":
             self.astar(KITCHEN)