From 083e4e267341f30e66df30c95cdfea96fc29f558 Mon Sep 17 00:00:00 2001 From: lgraesner <lgraesner@techfak.uni-bielefeld.de> Date: Wed, 14 Jun 2023 14:25:39 +0200 Subject: [PATCH] adjusted party host grammar --- psGrammar/tasks/gpsr/gpsr23.jsgf | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/psGrammar/tasks/gpsr/gpsr23.jsgf b/psGrammar/tasks/gpsr/gpsr23.jsgf index cd5ef14d..88db7859 100644 --- a/psGrammar/tasks/gpsr/gpsr23.jsgf +++ b/psGrammar/tasks/gpsr/gpsr23.jsgf @@ -6,7 +6,7 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <command> = (<cmdfndppl> | <cmdfndobj> | <cmdguide> | <cmdfollow> | <cmdfollowout> | <cmdincomplete> | <cmdman> | <complexman> | <cmdpartyhost>); -<cmdfndppl> = <tellPrsInfoInLoc> | <countPrsInRoom>; +<cmdfndppl> = <tellPrsInfoInLoc> | <countPrsInRoom> | <talkInfoToGestPrsInRoom> | (<findPrsInRoom> and <answerQuestion>) | (<goToLoc> <findPrs> and <answerQuestion>); <cmdfndobj> = <findObjInRoom> | <countObjOnPlcmt> | <tellCatPropOnPlcmt> | <tellObjPropOnPlcmt>; @@ -23,7 +23,7 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <complexman> = skyler; -<cmdpartyhost> = <serveDrinks> | (<meetPrsAtBeac> and <introduce>) | (<meetPrsAtBeac> and <requestleave>) | (<meetPrsAtBeac> and <guidePrsToTaxi>); +<cmdpartyhost> = <serveDrinks> | (<meetPrsAtBeac>| <meetprsAtDoor> and <introduce>) | (<meetPrsAtBeac> and <requestleave>) | (<meetPrsAtBeac> and <guidePrsToTaxi>); <goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>); @@ -52,7 +52,7 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <meetName> = <V_meet> <NP_name>; <meetPrsAtBeac> = <V_meet> <NP_name> <atLocPrep> <NP_beacon>; - +<meetprsAtDoor> = <V_meet> <NP_name> <atLocPrep> <NP_door>; <bringMeObj> = <V_bring> <NP_me> <NP_object>; <bringMeObjFromPlcmt> = <V_bring> <NP_me> <NP_object> <fromLocPrep> <NP_placement>; @@ -69,13 +69,13 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <deliverObjToGestPrsInRoom> = <V_deliver> [<NP_objectpron>] <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_roomTwo>; <deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beaconTwo>; -<guidePrsIncomplete> = <V_guide> <NP_name>; +<guidePrsIncomplete> = <V_guide> <NP_personalpron>; <guidePrsBack> = <V_guide> <NP_personalpron> back; <guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beaconTwo>; <guideNameFromBeacToBeac> = <V_guide> <NP_name> <fromLocPrep> <NP_beacon> <toLocPrep> <NP_beaconTwo>; <guideNameToBeacFindAtBeac> = <V_guide> <NP_name> <toLocPrep> <NP_beaconTwo> you (may | can | will) find (them | him | her) <atLocPrep> <NP_beacon>; -<serveDrinks> = <V_serve> <NP_partyfood> to ((everyone | everybody) | (all the <NP_agegenderpersonplural>)) in the room; +<serveDrinks> = <V_serve> <NP_partyfood> to ((everyone | everybody) | (all the <NP_agegenderpersonplural>)) in the <N_room>; <introduce> = <V_introduce> <NP_personalpron> to <NP_agegenderpersonplural> | (<NP_name> <LocPrep> <NP_beaconTwo>); <requestleave> = <V_ask> <NP_personalpron> to <V_leave>; <guidePrsToTaxi> = <V_guide> <NP_personalpron> <toLocPrep> <NP_taxi>; @@ -135,6 +135,7 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <NP_posture> = <N_posture>; <NP_taxi> = (the <N_taxi>); <NP_partyfood> = <N_partyfood>; +<NP_door> = (the <N_door>); <N_objectpron> = it; <N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest; @@ -150,7 +151,6 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <N_personattribute> = name | gender | pose; <N_posture> = sitting | standing | lying down; - <N_object> = bleach | (dishwasher tab) | (tray) | (basket) | (bag) | (fork) | (knife) | spoon | plate | bowl | cup | milk | coke | milo | banana | pear | orange | peach | mustard | spam | sugar | pringles | crackers | cornflakes; <N_category> = (cleaning supplies) | containers | cutlery | drinks | fruits | (pantry items) | snacks; <N_room> = kitchen | (living room) | bedroom | (dining room); @@ -160,5 +160,9 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <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_name> = alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william; -<N_taxi> = taxi; +<N_taxi> = taxi | cab | uber; <N_partyfood> = snacks | drinks; +<N_door> = ( front | back | main | rear ) (entrance | door); +<N_garbage> = litter | garbage | trash | waste | debris | junk; +<N_luggage> = bag | baggage | valise | suitcase | trolley; + -- GitLab