diff --git a/psGrammar/tasks/gpsr/gpsr23alternate.jsgf b/psGrammar/tasks/gpsr/gpsr23alternate.jsgf index b045a592ad5cdbc2ea4356c82ac6a40ed90148c6..be6daf4d5eedbf8e3842ea42731874f94674eaa5 100644 --- a/psGrammar/tasks/gpsr/gpsr23alternate.jsgf +++ b/psGrammar/tasks/gpsr/gpsr23alternate.jsgf @@ -61,7 +61,7 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <tellObjPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> object <onLocPrep> <NP_placement>; <tellCatPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> <NP_category> <onLocPrep> <NP_placement>; -<deliverObjToMe> = <V_deliver> <NP_object> <deliverPrep> <NP_me>; +<deliverObjToMe> = <V_deliver> (<NP_object> | <NP_category>) <deliverPrep> <NP_me>; <deliverObjPronToMe> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_me>; <deliverObjToGestPrsInRoom> = <V_deliver> [<NP_objectpron>] <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_roomTwo>; <deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beaconTwo>; @@ -119,33 +119,25 @@ public <sentence> = [could you | robot | tobi] [please] <command>; <NP_personattribute> = (the <N_personattribute>); <NP_posture> = <N_posture>; -<N_objectpron> = it; -<N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest; -<N_me> = me; -<N_gestperson> = (person waving) | (person (raising | rising) [their] (left|right) arm) | (person pointing to the (left|right)) | (person calling); -<N_poseperson> = (person sitting) | (person standing) | (person lying down); -<N_genderperson> = man | woman | boy | girl | (male person) | (female person); +<N_objectpron> = it; +<N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest; +<N_me> = me; +<N_gestperson> = (person waving) | (person (raising | rising) [their] (left|right) arm) | (person pointing to the (left|right)) | (person calling); +<N_poseperson> = (person sitting) | (person standing) | (person lying down); +<N_genderperson> = man | woman | boy | girl | (male person) | (female person); <N_genderpersonplural> = men | women | boys | girls | male | female; -<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (a joke); -<N_answer> = (a question); -<N_personalpron> = them | her | him; +<N_talk> = (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (a joke); +<N_answer> = (a question); +<N_personalpron> = them | her | him; <N_personattribute> = name | gender | pose; -<N_posture> = sitting | standing | lying down; - -<N_object_old> = basket | cereals | cloth | (coconut milk) | coke | cornflakes | noodles | orange (juice | drink) | peas | plate | pringles | red bowl | salt | soap | sponge | (tomato paste) | water; -<N_object> = (chocolate milk) | milk | cola | (soap box) | (choco krispies) | bowl | plate | fork | knife | spoon | cup | lemon | banana | peach | pear; -<N_category_old> = care | drink | (cleaning stuff) | container | food | snack | cutlery; -<N_category> = fruits | cutlery | drinks | snacks | (pantry items); -<N_room_old> = corridor | (living room) | kitchen | (bath room); -<N_room> = kitchen | (living room) | hallway | bathroom | office; -<N_roomTwo> = corridor | (living room) | kitchen | (bath room); -<N_placement_old> = (living table) | (kitchen counter) | sink | stove | cabinet | bar; -<N_placementTwo_old> = (living table) | (kitchen counter) | sink | stove | cabinet | bar; -<N_placement> = (kitchen table) | desk | (side board) | (side table) | sink | (kitchen counter) | cabinet | workstation; -<N_placementTwo> = (kitchen table) | desk | (side board) | (side table) | sink | (kitchen counter) | cabinet | workstation; -<N_beacon_old> = (living table) | sink | bar | sofa | fridge | (comfy chair); -<N_beaconTwo_old> = (living table) | sink | bar | sofa | fridge | (comfy chair); -<N_beacon> = fridge | sink | dishwasher | (easy chair) | (arm chair) | (kitchen table) | workstation; -<N_beaconTwo> = fridge | sink | dishwasher | (easy chair) | (arm chair) | (kitchen table) | workstation; -<N_name_old> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin; -<N_name> = alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william; \ No newline at end of file +<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); +<N_roomTwo> = kitchen | (living room) | bedroom | (dining room); +<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_name> = alex | charlie | elizabeth | francis | jennifer | linda | mary | patricia | james | john | michael | robert | robin | skyler | william;