gpsr grammar

psGrammar/tasks/gpsr/gpsr2.jsgf

@@ -24,18 +24,18 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 
 
 <guideToLoc> = <V_guide> (<NP_person> | <NP_personalpron>) <deliverPrep> <NP_place>;
-<deliverObjToLoc> = <V_deliver> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> <NP_place>;
-<deliverObjToPrs> = <V_deliver> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_person> | <NP_personalpron>);
-<deliverObjToObj> = <V_deliver> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_object> | <NP_objectClass> | <NP_objectpron>);
-<findObjInLoc> = <V_find> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <Prep> <NP_place>;
+<deliverObjToLoc> = <V_deliver> (<NP_object> | <NP_objectpron> ) <deliverPrep> <NP_place>;
+<deliverObjToPrs> = <V_deliver> (<NP_object> | <NP_objectpron> ) <deliverPrep> (<NP_person> | <NP_personalpron>);
+<deliverObjToObj> = <V_deliver> (<NP_object> | <NP_objectpron> ) <deliverPrep> (<NP_object> | <NP_objectpron>);
+<findObjInLoc> = <V_find> (<NP_object> | <NP_objectpron> ) <Prep> <NP_place>;
 <findPrsInLoc> = <V_find> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
 <followPrsToLoc> = <V_follow> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
-<takeObjFromLoc> = <V_take> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <takePrep> <NP_place>;
+<takeObjFromLoc> = <V_take> (<NP_object> | <NP_objectpron> ) <takePrep> <NP_place>;
 
 <takePrsnFromLoc> = <V_take> (<NP_person> | <NP_personalpron>) <takePrep> <NP_place>;
-<takeObjToObj> = <V_take> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_object> | <NP_objectpron> | <NP_objectClass>);
+<takeObjToObj> = <V_take> (<NP_object> | <NP_objectpron> ) <deliverPrep> (<NP_object> | <NP_objectpron> );
 
-<deliverObjToPrsInLoc> = <V_deliver> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
+<deliverObjToPrsInLoc> = <V_deliver> (<NP_object> | <NP_objectpron> ) <deliverPrep> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
 
 <V_deliver> 	= (bring | bear | carry | deliver | fetch | transport | take);
 <V_find>	= (find | (look for) | search);
@@ -66,12 +66,12 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 
 
 <Prep> = from | at | (which is in) | (who is in) | in | to | into;
-<deliverPrep> = to;
+<deliverPrep> = to | at | in | into;
 <takePrep> = from | (which is in);
 
 
-<N_personalpron> = her | him | his | them | their;
-<N_objectpron> = it;
-<N_names> = (emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel | person |(calling person) | (waving person) | me);
+<N_personalpron> = her | him | his | them | their | it;
+<N_objectpron> = her | him | his | them | their | it;
+<N_names> = (emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel | person |(calling person) |(calling person) | (waving person) | me);
 <N_talk> = (your name) | (the name of your team) | (the time) | (what time is it) | (the date) | (what day is today) | (what day is tomorrow) | (the day of the month) | (the day of the week);
 <N_answer> =  (a question) | (question);

psGrammar/tasks/gpsr/gpsr2_report.jsgf

@@ -18,9 +18,9 @@ public <sentence> = <Is_type> | <What_type> | <Where_type> | <Who_type> | <Which
 
 <Count_type> =  (how many <persons> are in [the] <room>);
 
-<Descripe_type> = (describe the object at (<room> | <place>)) | (which <attributes> is the object ((in the <room>) | ((on | at | in) <place>)));
+<Descripe_type> = (describe the object at [the](<place> | <room> )) | (which <attributes> is the object ((in the <room>) | ((on | at | in) <place>)));
 
-<persons> = person |persons | people | humans;
+<persons> = person | persons | people | humans;
 
 <attributes> = color | size;
 
@@ -37,7 +37,7 @@ public <sentence> = <Is_type> | <What_type> | <Where_type> | <Who_type> | <Which
 <object> = (apple | avocado | bowl | (chocolate sprinkles) | cloth | (dishwashing soap) | (kinder coke) | lemon | licorice | (little bananas) | macaroni | milk | (pineapple cookies) | paprika | plate | rice | smoothie | soap | sponge | (storage box) | (strawberry cookies) | tea | (toilet paper) | tuc | wafer | water| (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box));
 <type> = type | kind ;
 
-<place> = (bedroom | chair |  fridge | bed | nightstand | closet | kitchen |(kitchen trashbin) | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
+<place> = ( chair |  fridge | bed | nightstand | closet  |(kitchen trashbin) | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
 
 <N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
 <color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);