From ecd20203cb5385573484258f74a714fb0feac745 Mon Sep 17 00:00:00 2001
From: lgraesner <laurin.graesner@uni-bielefeld.de>
Date: Thu, 18 Apr 2024 16:38:58 +0200
Subject: [PATCH] reordering

---
 psGrammar/tasks/gpsr/eegpsr23.jsgf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/psGrammar/tasks/gpsr/eegpsr23.jsgf b/psGrammar/tasks/gpsr/eegpsr23.jsgf
index 361c191..46670c2 100644
--- a/psGrammar/tasks/gpsr/eegpsr23.jsgf
+++ b/psGrammar/tasks/gpsr/eegpsr23.jsgf
@@ -177,15 +177,15 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command> [ple
 
 <N_object>                  	= (dice | (tennis ball) | baseball | (rubiks cube) | (soccer ball) | bowl | spoon | cup | fork | plate | knife | cheezit | nuts | pretzels | (peanut puffs) | 
                             pringles | sugar | (tomato soup) | tuna | corn | (strawberry jello) | (chocolate jello) | cornflakes | (coffee grounds) | spam | mustard | ketchup | sponge |
-                            (laundry cleaner) | cleanser | (sponge cloth) | (dish soap) | pear | banana | orange | apple | plum | lemon | peach | strawberry | (apple juice) | (orange juice) |
+                            (laundry cleaner) | cleanser | (sponge cloth) | (dish soap) | pear | banana | (orange juice) | (apple juice) | apple | plum | lemon | peach | strawberry | orange |
                             coke | (ice tea) | fanta | milk) ;
 <N_category>                	= (toys | dishes | snacks | food | (cleaning supplies) | fruits | drinks) ;
 <N_room>                    	= kitchen | (living room) | bedroom | office | corridor;
 <N_roomTwo> 			= kitchen | (living room) | bedroom | study;
-<N_placement>               	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
-<N_placementTwo>            	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
-<N_beacon>                  	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | (desk chair) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
-<N_beaconTwo>               	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | (desk chair) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
+<N_placement>               	= ((bedside table) | bed | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
+<N_placementTwo>            	= ((bedside table) | bed | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
+<N_beacon>                  	= ((bedside table) | bed | dresser | armchair | cabinet | (desk chair) | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
+<N_beaconTwo>               	= ((bedside table) | bed | dresser | armchair | cabinet | (desk chair) | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
 <N_name>                    	= kai | noah | unique | luca | evelyn| jayden | james | riley | harper | quinn | avery | remi | river | atlas;
 <N_taxi> 			= taxi | cab | uber;
 <N_partyfood>			= snacks | drinks;
-- 
GitLab