eegpsr

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>) <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>;
+<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>;
 <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>) <takePrep> <NP_place>;
+<takeObjFromLoc> = <V_take> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <takePrep> <NP_place>;
 
 <takePrsnFromLoc> = <V_take> (<NP_person> | <NP_personalpron>) <takePrep> <NP_place>;
-<takeObjToObj> = <V_take> (<NP_object> | <NP_objectpron>) <deliverPrep> (<NP_object> | <NP_objectpron>);
+<takeObjToObj> = <V_take> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_object> | <NP_objectpron> | <NP_objectClass>);
 
-<deliverObjToPrsInLoc> = <V_deliver> (<NP_object> | <NP_objectpron>) <deliverPrep> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
+<deliverObjToPrsInLoc> = <V_deliver> (<NP_object> | <NP_objectpron> | <NP_objectClass>) <deliverPrep> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
 
 <V_deliver> 	= (bring | bear | carry | deliver | fetch | transport | take);
 <V_find>	= (find | (look for) | search);
@@ -48,13 +48,14 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 
 <NP_place> 	= (the <N_place>) | (a <N_place>) | (an <N_place>) | (<N_place>);
 <NP_object> 	= (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
+<NP_objectClass>=(the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
 <NP_person> 	= (a <N_names>)|( the <N_names>) | (<N_names>);
 <NP_objectpron>	= <N_objectpron>;
 <NP_personalpron> = <N_personalpron>;
 <NP_talk>	= <N_talk>;
 <NP_answer> 	= <N_answer>;
 
-
+<N_class> = food | container | (cleaning stuff) | drink | candy ;
 <N_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));
 <N_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));
 

psGrammar/tasks/gpsr/gpsr2_report.jsgf

@@ -20,11 +20,11 @@ public <sentence> = <Is_type> | <What_type> | <Where_type> | <Who_type> | <Which
 
 <Descripe_type> = (describe the object at (<room> | <place>)) | (which <attributes> is the object ((in the <room>) | ((on | at | in) <place>)));
 
-<persons> = persons | people | humans;
+<persons> = person |persons | people | humans;
 
 <attributes> = color | size;
 
-<person> = person | people | (anna | beth | carmen | jennifer | jessica | kimberly | kristina | laura | mary | sarah | alfred | charles | daniel | james | john | luis | paul | richard | robert | steve | person |(calling person) | me) | he | she ;
+<person> =(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) | he | she ;
 
 
 
@@ -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> = ( chair | (kitchen trashbin) | fridge | bed | nightstand | closet | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
+<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));
 
 <N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
 <color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);