diff --git a/psGrammar/tasks/whereIsThis/getLocation.jsgf b/psGrammar/tasks/whereIsThis/getLocation.jsgf index 4f756129b38499db332a0b696a8b2a0b117dbadb..19aa90163df2eee9b27a84e103565b512eacd9fa 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);