From e7e600a65d07a7384098883264b7525250599cdc Mon Sep 17 00:00:00 2001
From: karoel2 <karoel123@gmail.com>
Date: Mon, 29 Jun 2020 02:53:43 +0200
Subject: [PATCH] display update

---
 __pycache__/choice_tree.cpython-36.pyc  | Bin 3984 -> 3990 bytes
 __pycache__/customertree.cpython-36.pyc | Bin 0 -> 1180 bytes
 __pycache__/data.cpython-36.pyc         | Bin 6597 -> 6603 bytes
 __pycache__/learning_db.cpython-36.pyc  | Bin 0 -> 4046 bytes
 main.py                                 |  88 +++++++++++++++++++-----
 5 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 __pycache__/customertree.cpython-36.pyc
 create mode 100644 __pycache__/learning_db.cpython-36.pyc

diff --git a/__pycache__/choice_tree.cpython-36.pyc b/__pycache__/choice_tree.cpython-36.pyc
index 60c9559b9399eb2d281e2eeefb9eff3d4c47a8a0..f763b4425386894667e0ed63bb8804a4ee487692 100644
GIT binary patch
delta 58
zcmbOrKTV#^n3tE!^3z7PAVyVd{m|mnqGJ8*#G?G1%#_69s>E!4m(=3ylKcYw#7zCP
N%)G>$&E<@ed;lP#6I1{I

delta 52
zcmbOxKS7?&n3tC;^Z7=$AVzsp{fzwFRQ-a?{E{O5fYO|T%o6>?OkE=j12bI%1H;X=
HjFNl+pL`Eq

diff --git a/__pycache__/customertree.cpython-36.pyc b/__pycache__/customertree.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..41e99e175c8fad057887cb5527cf4106b469f691
GIT binary patch
literal 1180
zcma)+%Wl&^6ozLK$8j!B(n4>vr8igviKZ$mqzZwkDs=;kmdyweP3)6&l5uR!I91zi
zUxEcMz$<yniY+U|iZh8bZN-Kh<;;J+V|!-)vHZ&StFM3k{<7L6<OjL;tD=63fBlsb
z5|WTg!e%37bXpf!0mp(Yo*Q12PE=wgYP2KWsLaY!U6Ni@VU?+NWi_g?+EkZiJ@T3V
z&o!QGL`~MD1jw)j3$O@};4v)0GOWOASo!ANQnrS@C$JV)*T^mXTrld0u=SkQEUh8k
z$Z6fuI?~OY`j+}gpXRh-X#?q2PMelCk#6U-WoZlPPEHprT|l}!AZ!ozhR<OAmg3Hg
z+OTTVs;5?MS+#A|j#axxh4hTH7k`=~`_QHteSygdCsAU?Q~}`F;6X4^Jh<-aAXbKW
zXQ>k7!RbfT%f}E1E#mPxUj1Hjtwmpe!cHqyT#UOZ=(MX7Dblu=xdRx7pt2$#K<37i
zv@g=k3Anz%=|lvXa|zgS`f(g)r4VNssR}MmnKwz*OsbpYo76A~Upb;$nA*>ooA7bS
zb><BePcAOS4J#$rVVts>1g^%o<Zjr@++p04qNj>@6D#Y{w5J?XHS=me0^DJsRmsq$
zIfbhf)R;@Xuf>&eO|L%h8M9Q`pp`j_;t*t4gM=VOgOq2wm1Car6U8I=-;J?KFwtp@
zH)vMr^B|3txB=FfS=o(yLwvqwHMG<gjhVH!t{aQ*Dr5CsWh}p|jP<tir$;a^vvNLJ
z=JF)Lll)H95^idm{v35aX<TDx#8oT>p2H0vb&f%g(m3gG(di4cuJi8n<>A5ML1(@v
q<J*36oq0!S*F?e_{8A8og2|(^sMC8<aB1OQRGnq|APNqxK8U{o|1X6A

literal 0
HcmV?d00001

diff --git a/__pycache__/data.cpython-36.pyc b/__pycache__/data.cpython-36.pyc
index bb3cbedcd6086ed00de201c00d6676c5a08f8715..bacdb3017296d52b1a70aa7844a2c93d9920a0da 100644
GIT binary patch
delta 58
zcmX?VeA<}Jn3tE!^3z5(9&S|={m|mnqGJ8*#G?G1%#_69s>E!4m(=3ylKcYw#7zCP
N%)G>$&4%1l_y9FL6XE~>

delta 52
zcmX?YeAJlDn3tC;^Z7<L9&UL({fzwFRQ-a?{E{O5fYO|T%o6>?OkE=j12bI%1H;Yc
H+*9}fvOEv$

diff --git a/__pycache__/learning_db.cpython-36.pyc b/__pycache__/learning_db.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5f186ea42443125a642ed23ce8e5c3d05e939ccc
GIT binary patch
literal 4046
zcmds4&2G~`5VjLLe@)UfO-d+K;##4Ss$4)IL@69VqDUYVkps~-vvI6Ac4RxPnumaw
z;KG~q8TQH>a6&yXlWn@rk5Eb~5t>iCnVtD&=9}G<ALeqI$3K64{`yGMerS>38QRZr
z1>dro1~&yd+z41_bq!+wA>uHN8!`vJi4MjR!G!ssG%LRH{d-HP`m?2!Uh?owVvtw>
zN%(s#);EEj$Jb)@mSzrolQ^ViAPv)4HXi9AmC^r6jnh*|{xb2R`cW^wi2<1_V+BS~
zxg*a?q}nW>%23wgJgT7T&1=o-JFjn6k6F1_<6#AS6BDwKgFLL_BG4&|ryQ>A&_mGz
ztU(d~$)81g9ZEx#p^T?B^p=Lc0`9BGEaSd<!6SZgxJtN}(Jo>vizwnMT-GaK4eCx&
z*(r}FsY>>x9_yGvJjy0Jk2Om}eUwY8C+EmvPx29ubdW9UQ8lTX=8&M-WDlv6rjYZ}
z9niFLGTMnjzEM5JQ+G<8C{A5Tow`4ogKC#iy_|#Yc^%&*0UKku1%wLRhD}@}t1|S;
zSae^6H{N$+qJyd&?KiSFQC(#Mvfdp~*uV*B4&o{+8mAmOtEjRRPgyFeEEOe7s!&m7
zjq~J*v_*k4;hQAk?gwpqOXzQfUaOn?(09VRdC;~U5Qzg8^qC`)uN-bMH$2zxpX)n#
zJm#+LS|YvQ3c2rko-1O9o``?qfygzT{!t@fE}YoSwlIT`vyMo%y|4iurnFi2sP9|c
z7ire(IlR%cxk%eh-e~%qb%oip2LmROC#=<Su-=O0bKb#%4g-;NSimfo)f2V09du6X
z#tY8<x^dt+tZvpAsu^V8`OLNWy*GU<I!L|eaIa>&{BS!Z5*Bv>JI9&DMZ)WcEjtuO
zlLc*Igm#w;<CtT_Xn7t86MWn4eAoOf{E{1P=TE911MUaa4)Z<71{Mrhr}~lyozUx5
znO$w!E_15;uXpx#_jaoeXFgq11CAc_PDScz*Tc)@&vg1S{DON)p9hur3|4H~ckMi5
Xx<_fDz8U=jvFot%@$0CPxzzF-Jh4`*

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index 647e97b..427e34e 100644
--- a/main.py
+++ b/main.py
@@ -13,15 +13,21 @@ from choice_tree import *
 from joblib import load
 from customertree import objects
 
-#import tensorflow as tf
-#from keras import *
+import tensorflow as tf
+from keras import *
+import matplotlib.pyplot as plt
+import cv2
 import h5py
+import time
 
 pygame.init()
 project = 0
+tickTime = 15
+
+
 
 WIN = 0
-LOSSE = 0
+LOSE = 0
 DEFINE = 0
 IMG_SIZE = 64
 COLOR_CHANNELS = 3
@@ -42,12 +48,11 @@ CATEGORIES = [
 food_model = load("models/food_model.joblib")
 drink_model = load("models/drink_model.joblib")
 
-#model = tf.keras.models.load_model('final1')
+model = tf.keras.models.load_model('final1')
 
 with h5py.File('food_10_64x3_test.hdf5', "r") as f:
     a_group_key = list(f.keys())[0]
     data = list(f[a_group_key])
-    # print(len(data))
     data = np.array(data)
     X = np.array(data).reshape(-1, 64, 64, 3)
 with open('food_10_64x3_test.txt', 'r') as f:
@@ -55,28 +60,71 @@ with open('food_10_64x3_test.txt', 'r') as f:
     temp = []
     for item in y:
         temp.append(int(item))
-# print(len(X))
-# print(len(y))
 menu = []
 for i in range(len(X)):
     menu.append([X[i], y[i]])
 random.shuffle(menu)
 
-'''
+
 def image_recognition():
-    LOSSE += 1
-    for _ in range(100):
+    global WIN
+    global LOSE
+    t0= time.clock()
+    for _ in range(1000):
+
         photo = random.choice(menu)
         prediction = model.predict(np.expand_dims(photo[0], axis=0))
         max_value = prediction[0].max()
         idx = np.where(prediction[0]==max_value)
-        if CATEGORIES[idx[0][0]] == waiter.order_list[-1]:
-            WIN += 1
+
+        if CATEGORIES[idx[0][0]] == waiter.order_list[-1][0]:
+            #print(CATEGORIES[idx[0][0]], CATEGORIES[int(photo[1])], waiter.order_list[-1][0])
+            print(f'Oczekiwano: {CATEGORIES[idx[0][0]]}')
+            print(f'Otrzymano: {CATEGORIES[int(photo[1])]}')
+            if CATEGORIES[int(photo[1])] == waiter.order_list[-1][0]:
+                WIN += 1
+            else:
+                LOSE += 1
+            print(WIN, LOSE)
             break
         waiter.order_list.pop()
     #print(WIN, LOSSE - WIN)
-'''
-tickTime = 15
+
+    temp = [waiter.order_list[-1][0], waiter.order_list[-1][1]]
+
+    waiter.order_list.pop()
+    t1 = time.clock() - t0
+    print("Time elapsed: ", t1)
+    if t1 < 10:
+        time.sleep(10-t1)
+
+    return [photo[0], photo[1], temp[0], temp[1]]
+
+def show_food(x,y,img):
+    food_img = img
+    food_img = np.rot90(food_img, k=1, axes=(0, 1))
+    food_img = cv2.cvtColor(food_img, cv2.COLOR_BGR2RGB)
+    food_img = cv2.resize(food_img, (128,128), interpolation = cv2.INTER_AREA)
+    surf = pygame.Surface((food_img.shape[0], food_img.shape[1]))
+    pygame.surfarray.blit_array(surf, food_img)
+    display.blit(surf, (x,y))
+
+def show_order(img):
+    pygame.draw.rect(display,[0,0,0],(WIDTH*32+400-225, 0, (WIDTH * 32 + 325) - (WIDTH*32+400-225), HEIGHT * 32))
+    show_food(WIDTH*32+400-225, HEIGHT*32/2-64, img[0])
+    GGGG = font.render("Klient zamówił:", False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2-81 -54))
+    GGGG = font.render(img[2], False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2-81 -34))
+    GGGG = font.render(img[3], False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2-81 -10))
+
+    GGGG = font.render("Klient otrzymał:", False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2 -54 + 129))
+    GGGG = font.render(CATEGORIES[int(img[1])], False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2 -34 + 129))
+    GGGG = font.render(img[3], False, (255,255,255))
+    display.blit(GGGG, (WIDTH*32+400-225, HEIGHT*32/2 -10 + 129))
 
 # ai settings
 S_IDLE = ("kitchen", "middle", "inplace")
@@ -91,7 +139,7 @@ WIDTH = 10
 KITCHEN = (1, 1)
 MIDDLE = (floor(WIDTH / 2), floor(HEIGHT / 2))
 
-display = pygame.display.set_mode((WIDTH * 32 + 200, HEIGHT * 32))
+display = pygame.display.set_mode((WIDTH * 32 + 325, HEIGHT * 32))
 tileFoil = pygame.image.load('tile.jpg')
 waiterAct1 = pygame.image.load('act1.png')
 waiterAct2 = pygame.image.load('act2.png')
@@ -320,6 +368,7 @@ class Agent:
         self.food = False
         self.goal = (0,0)
         self.order_list = []
+        self.photos = []
         self.order_to_kitchen = []
 
     def walk(self):
@@ -433,7 +482,7 @@ class Agent:
                     self.astar((table[0], table[1]))
                     self.idle = False
                     cl = Client()
-                    waiter.order_list.insert(0,order_food(cl))
+                    waiter.order_list.insert(0,[order_food(cl),order_drink(cl)])
                     print('klient zamawia: ' + order_food(cl) +' i '+ order_drink(cl))
                     return True
         #jesli trzyma zamowienie to idzie do kuchni
@@ -495,6 +544,11 @@ 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
@@ -523,6 +577,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())
         self.idle = True
         if IDLE == "kitchen":
             self.astar(KITCHEN)
@@ -592,7 +647,6 @@ def drawScreen():
     textsurface = font.render(str(ticks), False, (255, 255, 255))
     display.blit(textsurface, (WIDTH * 32 + 80, 332))
 
-
 restaurant = Restaurant(0, 0, 0, 0)
 waiter = Agent(1,1)
 clientTime = 10