From 36b7a8e03fca20d56f32c8542de543bd669a9cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jakub=20D=C4=99bski?= <piodeb1@st.amu.edu.pl>
Date: Sun, 28 Jun 2020 21:22:42 +0200
Subject: [PATCH] client order

---
 __pycache__/choice_tree.cpython-36.pyc | Bin 3985 -> 3984 bytes
 __pycache__/data.cpython-36.pyc        | Bin 6598 -> 6597 bytes
 main.py                                |  15 +++++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/__pycache__/choice_tree.cpython-36.pyc b/__pycache__/choice_tree.cpython-36.pyc
index 2544fc137550e8c321510c207bb654a4319bc55c..60c9559b9399eb2d281e2eeefb9eff3d4c47a8a0 100644
GIT binary patch
delta 53
zcmbOzKS7?|n3tC;^ZAdB?17B(rurHAxvBaEnfWC}`T?am1(_xKiJ7`a76xXz1_p+k
ID;OpD0LoJkO#lD@

delta 54
zcmbOrKT)3Dn3tEUYWlN{?1795X8NJUsYS*5*@;E@IhiSm#Z`&f`Yx%(*(Lb}`iYrF
Jo68v``2gdQ5(@wT

diff --git a/__pycache__/data.cpython-36.pyc b/__pycache__/data.cpython-36.pyc
index 3c8ca9505eb11a4dda451411c10a7fae96a73765..bb3cbedcd6086ed00de201c00d6676c5a08f8715 100644
GIT binary patch
delta 53
zcmX?ReAJlTn3tC;^ZAdB?A+Y)diojpxvBaEnfWC}`T?am1(_xKiJ7`a76xXz1_p+k
Jjku@q0RY{l5ZeF%

delta 54
zcmX?Ve9V~Ln3tEUYWlN{?A+W6`ud^8sYS*5*@;E@IhiSm#Z`&f`Yx%(*(Lb}`iYrF
Kn+>_A@Bsk#G7^~p

diff --git a/main.py b/main.py
index 5241dee..91f2b8c 100644
--- a/main.py
+++ b/main.py
@@ -39,8 +39,8 @@ CATEGORIES = [
 "waffles"
 ]
 
-#food_model = load("models/food_model.joblib")
-#drink_model = load("models/drink_model.joblib")
+food_model = load("models/food_model.joblib")
+drink_model = load("models/drink_model.joblib")
 
 #model = tf.keras.models.load_model('final1')
 
@@ -136,7 +136,7 @@ class Client:
         return (self.gender + "  Age: " + str(self.age) +"  "+ self.outfit+
                 "  $"+ str(self.cash)+ "  Vege: "+ self.vege)
 
-'''
+
 def order_drink(clt):
     frame = []
     if clt.gender == "Man":
@@ -168,8 +168,8 @@ def order_drink(clt):
     drink_index = drink_predict[0]
 
     return  objects[-1][drink_index]
-'''
-'''
+
+
 def order_food(clt):
     frame = []
     if clt.gender == "Man":
@@ -201,7 +201,7 @@ def order_food(clt):
     food_index = food_predict[0]
 
     return objects[-2][food_index]
-'''
+
 
 
 ###
@@ -430,6 +430,9 @@ class Agent:
                 if restaurant.tiles[table[1]][table[0]].clientState == "order":
                     self.astar((table[0], table[1]))
                     self.idle = False
+                    cl = Client()
+                    waiter.order_list.insert(0,order_food(cl))
+                    print('klient zamawia: ' + order_food(cl) +' i '+ order_drink(cl))
                     return True
         #jesli trzyma zamowienie to idzie do kuchni
         if self.orders: