From 5262bc853da4e7c5e870da09e6125ec94c49a819 Mon Sep 17 00:00:00 2001
From: jpohlmeyer <jpohlmeyer@techfak.uni-bielefeld.de>
Date: Sat, 4 May 2019 09:00:36 +0200
Subject: [PATCH] Add stuff to whereisthis grammar

---
 psGrammar/tasks/whereIsThis/getLocation.jsgf | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/psGrammar/tasks/whereIsThis/getLocation.jsgf b/psGrammar/tasks/whereIsThis/getLocation.jsgf
index 4f756129..19aa9016 100644
--- a/psGrammar/tasks/whereIsThis/getLocation.jsgf
+++ b/psGrammar/tasks/whereIsThis/getLocation.jsgf
@@ -12,6 +12,22 @@ public <locationstring> = [<prefix>] <location> [<robot>];
 
 <canyouhelp> = (can you help me find [the]);
 
-<location> = ( (sofa) | (comfy chair) | (shelf) | (living room) | (kitchen) | (bin laden) | (dinner table) | (arena) );
+<location> = ( (tv) | (tv_table) | (sideboard) | (bookcase) | (left_armchair) | (right_armchair) | (coffee_table) | (couch) | (high_table) | (kitchen_table) | (dishwasher) | (kitchen_cabinet) | (desk) | (bed) | (side_table) | (cupboard) | (sofa) | (bar_table) | (living room) | (hallway) | (kitchen) | (bedroom) | (bar) | (cleaning stuff) | (snacks) | (drinks) | (food) | (care) | (container) | (fruit) | (kitchen_stuff) | (cabinet) | (white drawer) | (trash_can) | (trash_bin) | (coathanger) | <cleaning_stuff> | <snacks> | <drinks> | <food> | <fruit> | <care> | <container>);
+
+<cleaning_stuff> = ((cloth) | (dishwasher_tab));
+
+<snacks> = ((cereal_bar_chocolate) | (cereal_bar_chocolate_banana) | (cracker) | (fruit_bar_apple) | (fruit_bar_forest_fruit) | (get_it) | (nut_fruit_mix) | (peanut_bits));
+
+<drinks> = ( (apple_juice) | (iso_drink) | (orange_juice) | (red_spritzer) | (sparkling_water) | (coke) | (lemon_juice) | (water) | (milk) );
+
+<food> = ((cereal) | (bouillon) | (corn) | (noodles) | (pepper) | (salt) | (sauerkraut) |(seasoning_mix) | (tomatoes));
+
+<fruit> = ((lemon) | (orange));
+
+<care> = ((shower_gel) | (soap) | (toothpaste));
+
+<container> = ((basket) | (tray));
+
+<kitchen_stuff> = ( (bowl) | (cup) | (fork) | (knife) | (plate) | (spoon));
 
 <robot> = (tobi) | (robot) | (biron) | (pepper);
-- 
GitLab