From 846bb61cddb25f5659c1b13c63d6ac6245b38996 Mon Sep 17 00:00:00 2001
From: lgraesner <laurin.graesner@uni-bielefeld.de>
Date: Thu, 18 Apr 2024 09:54:51 +0200
Subject: [PATCH] removed 'fanata'

---
 psGrammar/tasks/gpsr/eegpsr23.jsgf |   2 +-
 psGrammar/tasks/gpsr/eegpsr24.jsgf | 165 +++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 psGrammar/tasks/gpsr/eegpsr24.jsgf

diff --git a/psGrammar/tasks/gpsr/eegpsr23.jsgf b/psGrammar/tasks/gpsr/eegpsr23.jsgf
index 30218465..79d22168 100644
--- a/psGrammar/tasks/gpsr/eegpsr23.jsgf
+++ b/psGrammar/tasks/gpsr/eegpsr23.jsgf
@@ -177,7 +177,7 @@ 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) |
-                            coke | (ice tea) | fanata | milk) ;
+                            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;
diff --git a/psGrammar/tasks/gpsr/eegpsr24.jsgf b/psGrammar/tasks/gpsr/eegpsr24.jsgf
new file mode 100644
index 00000000..dffc02eb
--- /dev/null
+++ b/psGrammar/tasks/gpsr/eegpsr24.jsgf
@@ -0,0 +1,165 @@
+#JSGF V1.0;
+grammar speechRecognition;
+
+
+public <sentence> 	= [could you | robot | tobi | tiago] [please] <start_command> [please] ;
+
+<commands>          = 
+
+<verb_take>         = (take | get | grasp | fetch) ;
+<verb_place>        = (put | place) ;
+<verb_deliver>      = (bring | give | deliver) ;
+<verb_bring>        = (bring | give) ;
+<verb_go>           = (go | navigate) ;
+<verb_find>         = (find | locate | (look for)) ;
+<verb_talk>         = (tell | say) ;
+<verb_answer>       = (answer) ;
+<verb_meet>         = (meet) ;
+<verb_tell>         = (tell) ;
+<verb_greet>        = (greet | salute | (say hello to) | (introduce yourself to)) ;
+<verb_remember>     = (meet | contact | (get to know) | (get acquainted with)) ;
+<verb_count>        = (tell me how many) ;
+<verb_describe>     = ((tell me how) | describe) ;
+<verb_offer>        = (offer) ;
+<verb_follow>       = (follow) ;
+<verb_guide>        = (guide | escort | take | lead) ;
+<verb_accompany>    = (accompany) ;
+
+<prep_deliver>      = (to) ;
+<prep_place>        = (on) ;
+<prep_inLoc>        = (in) ;
+<prep_fromLoc>      = (from) ;
+<prep_toLoc>        = (to) ;
+<prep_atLoc>        = (at) ;
+<prep_talk>         = (to) ;
+<prep_loc>          = (in | at) ;
+<prep_onLoc>        = (on) ;
+<prep_are>          = (are) ;
+<prep_ofPrs>        = (of) ;
+
+<article>           = (an | a) ;
+
+<talk>              = ((something about yourself) | (the time) | (what day is today) | (what day is tomorrow) | (your teams name) | 
+                        (your teams country) | (your teams affiliation) | (the day of the week) | (the day of the month)) ;
+
+<question>          = (question | quiz) ;
+
+<color>             = (blue | yellow | black | white | red | orange | gray) ;
+
+<cloth>             = ((t shirt) | shirt | blouse | sweater | coat | jacket) ;
+
+<clothes>           = ((t shirts) | shirts | blouses | sweaters | coats | jackets) ;
+
+<color_cloth>       = (<color> <cloth>) ;
+
+<location_placement> = (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
+
+<location_no_placement> = ((desk chair) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
+
+<location>              = (<location_placement> | <location_no_placement>) ;
+
+<room>                  = (bedroom | (living room) | corridor | office | kitchen)
+
+<inRoom_atLoc>          = ((in the <room>) | (at the <location>)) ;
+
+<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) |
+                            coke | (ice tea) | fanta | milk) ;
+<object_categories>       = (toys | dishes | snacks | food | (cleaning supplies) | fruits | drinks) ;
+
+<object_category>       = (toy | dish | snack | food | (cleaning supply) | fruit | drink) ;
+
+<person_info>      = (name | pose | gesture) ;
+
+<object_comparison> = (biggest)
+
+<person_command>   = (<goToLoc> | <findPrsInRoom> | <meetPrsAtBeac> | <countPrsInRoom> | <tellPrsInfoInLoc> |
+                        <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> |
+                        <guideNameFromBeacToBeac> | <guidePobject_categoryrsFromBeacToBeac> | <guideClothPrsFromBeacToBeac> |
+                        <greetClothDscInRm> | <greetNameInRm> | <meetNameAtLocThenFindInRm> | <countClothPrsInRoom> |
+                        <countClothPrsInRoom> | <tellPrsInfoAtLocToPrsAtLoc> | <followPrsAtLoc>) ;
+
+<object_command>   = (<goToLoc> | <takeObjFromPlcmt> | <findObjInRoom> | <countObjOnPlcmt> | <tellObjPropOnPlcmt> | <bringMeObjFromPlcmt> | <tellCatPropOnPlcmt>) ;
+
+<start_command> = (<person_command> | <object_command>) ;
+
+<followup_command_at_location>  = (<findPrs> | <meetName> | <findObj>) ;
+
+<followup_command_object_taken> = (<placeObjOnPlcmt> | <deliverObjToMe> | <deliverObjToPrsInRoom> | <deliverObjToNameAtBeac>) ;
+
+<followup_command_object_found> = <takeObj> ;
+
+<followup_command_person_found> = (<talkInfo> | <answerQuestion> | <followPrs> | <followPrsToRoom> | <guidePrsToBeacon>) ;
+
+<goToLoc> = (<verb_go> <prep_toLoc> the <room> then <followup_command_at_location>) ;
+
+<takeObjFromPlcmt> = (<verb_take> <article> <object_category> <prep_fromLoc> the <location_placement> and <followup_command_object_taken>) ;
+
+<findPrsInRoom> = (<verb_find> <article> <prep_inLoc> the <room> and <followup_command_person_found>) ;
+
+<findObjInRoom> = (<verb_find> <art> <object_category> <inLocPrep> the <room> then <followup_command_object_found>) ;
+
+<meetPrsAtBeac> = (<verb_meet> <name> <inLocPrep> the <room> and <followup_command_person_found>) ;
+
+<countObjOnPlcmt> = (<verb_count> <plurCat> there are <prep_onLoc> the <location_placement>) ;
+
+<countPrsInRoom> = (<verb_count> <gestPersPlur_posePersPlur> are <inLocPrep> the <room>) ;
+
+<tellPrsInfoInLoc> = (<verb_tell> me the <persInfo> of the person <inRoom_atLoc>) ;
+
+<tellObjPropOnPlcmt> = (<verb_tell> me what is the <objComp> object <prep_onLoc> the <location_placement>) ;
+
+<talkInfoToGestPrsInRoom> = (<verb_talk> <talk> <prep_talk> the <gestPers> <inLocPrep> the <room>) ;
+
+<answerToGestPrsInRoom> = (<verb_answer> the <question> <prep_ofPrs> the <gestPers> <inLocPrep> the <room>) ;
+
+<followNameFromBeacToRoom> = (<verb_foinLocPrepllow> <name> <fromLocPrep> the <loc> <toLocPrep> the <room>) ;
+
+<guideNameFromBeacToBeac> = (<verb_guide> <name> <fromLocPrep> the <loc> <toLocPrep> the <loc_room>) ;
+
+<guidePrsFromBeacToBeac> = (<verb_guide> the <gestPers_posePers> <fromLocPrep> the <loc> <toLocPrep> the <loc_room>) ;
+
+<guideClothPrsFromBeacToBeac> = (<verb_guide> the person wearing a <colorClothe> <fromLocPrep> the <loc> <toLocPrep> the <loc_room>) ;
+
+<bringMeObjFromPlcmt> = (<verb_bring> me <art> <obj> <fromLocPrep> the <location_placement>) ;
+
+<tellCatPropOnPlcmt> = (<verb_tell> me what is the <objComp> <singCat> <prep_onLoc> the <location_placement>) ;
+
+<greetClothDscInRm> = (<verb_greet> the person wearing <art> <colorClothe> <inLocPrep> the <room> and <followup_command_person_found>) ;
+
+<greetNameInRm> = (<verb_greet> <name> <inLocPrep> the <room> and <followup_command_person_found>) ;
+
+<meetNameAtLocThenFindInRm> = (<verb_meet> <name> <atLocPrep> the <loc> then <verb_find> them <inLocPrep> the <room>) ;
+
+<countClothPrsInRoom> = (<verb_count> people <inLocPrep> the <room> are wearing <colorClothes>) ;
+
+<tellPrsInfoAtLocToPrsAtLoc> = (<verb_tell> the <persInfo> of the person <atLocPrep> the <loc> to the person <atLocPrep> the <loc2>) ;
+
+<followPrsAtLoc> = (<verb_follow> the <gestPers_posePers> <inRoom_atLoc>) ;
+
+<findObj> = (<verb_find> <art> <object_category> and <followup_command_object_found>) ;
+
+<findPrs> = (<verb_find> the <gestPers_posePers> and <followup_command_person_found>) ;
+
+<meetName> = (<verb_meet> <name> and <followup_command_person_found>) ;
+
+<placeObjOnPlcmt> = (<verb_place> it <prep_onLoc> the <location_placement2>) ;
+
+<deliverObjToMe> = (<verb_deliver> it to me) ;
+
+<deliverObjToPrsInRoom> = (<verb_deliver> it <deliverPrep> the <gestPers_posePers> <inLocPrep> the <room>) ;
+
+<deliverObjToNameAtBeac> = (<verb_deliver> it <deliverPrep> <name> <inLocPrep> the <room>) ;
+
+<talkInfo> = (<verb_talk> <talk>) ;
+
+<answerQuestion> = (<verb_answer> a <question>) ;
+
+<followPrs> = (<verb_follow> them) ;
+
+<followPrsToRoom> = (<verb_follow> them <toLocPrep> the <loc2_room2>) ;
+
+<guidePrsToBeacon> = (<verb_guide> them <toLocPrep> the <loc2_room2>) ;
+
+<takeObj> = (<takeVerb> it and <followup_command_object_taken>) ;
\ No newline at end of file
-- 
GitLab