From 586133d7d01d6946deaca2fe4ffd799ecdbe6bae Mon Sep 17 00:00:00 2001
From: lgraesner <lgraesner@techfak-uni-bielefeld.de>
Date: Wed, 5 Jul 2023 09:51:41 +0200
Subject: [PATCH] added remaining items to dict and created locations

---
 psGrammar/dictionary/tobiDic.dic |  4 +++-
 psGrammar/tasks/gpsr/gpsr23.jsgf | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/psGrammar/dictionary/tobiDic.dic b/psGrammar/dictionary/tobiDic.dic
index 78c0606a..29c79378 100644
--- a/psGrammar/dictionary/tobiDic.dic
+++ b/psGrammar/dictionary/tobiDic.dic
@@ -20441,6 +20441,7 @@ cheerleading	CH IH R L IY D IH NG
 cheers	CH IH R Z
 cheery	CH IH R IY
 cheese	CH IY Z
+cheezit	CH IY Z IH T S
 cheeseburger	CH IY Z B ER G ER
 cheeseburgers	CH IY Z B ER G ER Z
 cheesecake	CH IY Z K EY K
@@ -22417,6 +22418,7 @@ coasts(2)	K OW S S
 coasts(3)	K OW S
 coat	K OW T
 coathanger	K OW T HH AE NG ER
+coatrack K OW T R AE K
 coat's	K OW T S
 coate	K OW EY T
 coated	K OW T AH D
@@ -103401,6 +103403,7 @@ rubicon	R UW B IH K AO N
 rubie	R UW B IY
 rubies	R UW B IY Z
 rubik	R UW B IH K
+rubiks	R UW B IH K S
 rubik's	R UW B IH K S
 rubin	R UW B IH N
 rubin's	R UW B IH N Z
@@ -120892,7 +120895,6 @@ tobias	T AH B AY AH S
 tobiason	T AH B AY AH S AH N
 tobi    T OW B IH
 tobi(2)	T OW B IY
-tobi(3) T OW B
 tobin	T OW B IH N
 tobler	T OW B AH L ER
 tobler(2)	T OW B L ER
diff --git a/psGrammar/tasks/gpsr/gpsr23.jsgf b/psGrammar/tasks/gpsr/gpsr23.jsgf
index 6908b13b..2af62409 100644
--- a/psGrammar/tasks/gpsr/gpsr23.jsgf
+++ b/psGrammar/tasks/gpsr/gpsr23.jsgf
@@ -171,14 +171,14 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <N_posture> 			= sitting | standing | lying down;
 <N_three>           = three;
 
-<N_object>                  	= (tray) | (basket) | (bag) | sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffe grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
+<N_object>                  	= (tray) | (basket) | (bag) | sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffee grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
 <N_category>                	= containers | (cleaning supplies) | drinks | food | fruits | toys | snacks | dishes;
 <N_room>                    	= kitchen | (living room) | bedroom | study;
 <N_roomTwo> 			= kitchen | (living room) | bedroom | study;
-<N_placement>               	= (small cabinet) | (side table) | (ikea table);
-<N_placementTwo>            	= (small cabinet) | (side table) | (ikea table);
-<N_beacon>                  	= (seat one) | (seat two) | (seat three) | (seat four) | (seat five) | (seat six) | (small cabinet) | (side table) | (ikea table) | exit | entrance;
-<N_beaconTwo>               	= (seat one) | (seat two) | (seat three) | (seat four) | (seat five) | (seat six) | (small cabinet) | (side table) | (ikea table) | exit | entrance;
+<N_placement>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf);
+<N_placementTwo>            	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf);
+<N_beacon>                  	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
+<N_beaconTwo>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
 <N_name>                    	= alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william;
 <N_taxi> 			= taxi | cab | uber;
 <N_partyfood>			= snacks | drinks;
-- 
GitLab