added connected commands to egpsr, e.g. most of the gpsr grammar

psGrammar/tasks/gpsr/eegpsr23.jsgf

@@ -2,9 +2,9 @@
 grammar speechRecognition;
 
 
-public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
+public <sentence> 		= [could you | robot | tobi | tiago] [please] <command> [please] ;
 
-<command>               = <CMDcountObj> | <CMDtransferObj> | <CMDfollow> | <CMDgreetTwo>;
+<command>               = <CMDcountObj> | <CMDtransferObj> | <CMDfollow> | <CMDgreetTwo> | <cmdfndppl> | <cmdfndobj> | <cmdguide> | <cmdfollow> | <cmdfollowout> | <cmdincomplete> | <cmdman> | <complexman>;
 
 <CMDcountObj>              = (<V_count> <NP_category> (items | objects) at <NP_placement> and (inform | (report to))  <NP_me>) | (<V_count> <NP_category> (items | objects) are in <NP_placement>);
 
@@ -14,6 +14,80 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 
 <CMDgreetTwo>                 = <V_meet> <NP_name> at <NP_beacon> then <V_meet> <NP_personalpron> in <NP_roomTwo>;
 
+<cmdfndppl> 			= <tellPrsInfoInLoc> | <countPrsInRoom> | <talkInfoToGestPrsInRoom> | (<findPrsInRoom> and <answerQuestion>) | (<goToLoc> <findPrs> and (<answerQuestion> | <talkInfo>)) | (<answerToGestPrsInRoom>);
+
+<cmdfndobj> 			= <findObjInRoom> | <countObjOnPlcmt> | <tellCatPropOnPlcmt> | <tellObjPropOnPlcmt> | <findThreeObjInRoom>;
+
+<cmdguide> 			= <guideNameFromBeacToBeac> | (<meetPrsAtBeac> and <guidePronToBeacon>) | (<goToLoc> <meetName> and <guidePronToBeacon>) | <guideNameToBeacFindAtBeac>;
+
+
+<cmdfollow> 			= <followNameFromBeacToRoom> | (<meetPrsAtBeac> and <followPrsToRoom>) | (<goToLoc> <meetName> and (<followPrs> | <followPrsToRoom>));
+
+<cmdfollowout> 		= <meetPrsAtBeac> <followPrs> and (<goToLoc> | <guidePronBack>);
+
+<cmdincomplete> 		= <followName> | <deliverObjToMe> | <guideNameToBeacon> | ([<goToLoc>] <meetName> and <guidePronIncomplete>);
+
+<cmdman> 			= <bringMeObjFromPlcmt> | (<takeObjFromPlcmt> and (<deliverObjPronToMe> | <deliverObjToNameAtBeac>)) | ((<takeObjFromPlcmt> | <takeObj>) and <placeObjPronOnPlcmt>) | <deliverObjToGestPrsInRoom> | <bringMeObj> | (<goToLoc> <findObj> and (<deliverObjPronToMe> | <placeObjPronOnPlcmt>)) | <placeObjOnPlcmt> | <bringObjFromRoomToPlcmt>;
+
+<complexman> 			= <deliverObjToPlacement> | <bringMeRelObjFromPlcmt> | <bringMeShapedObjFromPlcmt>;
+
+<goToLoc> 			= <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
+
+<findObj> 			= <V_find> <NP_object>;
+<findObjInRoom> 		= <V_find> (<NP_object> | <NP_category>) <inLocPrep> <NP_room>;
+<findThreeObjInRoom>     = <V_find> <N_three> <NP_category> <inLocPrep> <NP_room>;
+
+<takeObj> 			= <V_take> <NP_object>;
+<takeObjFromPlcmt> 		= <V_take>  <NP_object> <fromLocPrep> (<NP_room> | <NP_placement>);
+
+<findPrs> 			= <V_find> (<NP_gestperson> | <NP_genderperson> | <NP_poseperson>);
+<findPrsInRoom> 		= <V_find> (<NP_gestperson> | <NP_genderperson> | <NP_poseperson>) <inLocPrep> <NP_room>;
+
+<placeObjOnPlcmt> 		= <V_place> <NP_object> <placePrep>  <NP_placement>;
+<placeObjPronOnPlcmt> 		= <V_place> <NP_objectpron> <placePrep>  <NP_placement>;
+
+<talkInfo> 			= <V_talk> <NP_talk>;
+<talkInfoToGestPrsInRoom> 	= <V_talk> <NP_talk> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
+
+<answerQuestion> 		= <V_answer> <NP_answer>;
+<answerToGestPrsInRoom> 	= <V_answer> <NP_answer> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
+
+<followPrs> 			= <V_follow> <NP_personalpron>;
+<followPrsToRoom> 		= <V_follow> <NP_personalpron> <toLocPrep> <NP_roomTwo>;
+<followName>			= <V_follow> <NP_name>;
+<followNameFromBeacToRoom> 	= <V_follow> <NP_name> <fromLocPrep> (<NP_beacon> | <NP_room>) <toLocPrep> <NP_roomTwo>;
+
+<meetName> 			= <V_meet> <NP_name>;
+<meetPrsAtBeac> 		= <V_meet> <NP_name> <atLocPrep> <NP_beacon>;
+<meetprsAtDoor>		= <V_meet> <NP_name> <atLocPrep> <NP_door>;
+ 
+<bringObjFromRoomToPlcmt>  = <V_take> <NP_object> <fromLocPrep> <NP_room> <toLocPrep> <NP_placement>;
+<bringMeObj>    		= <V_bring> <NP_me> (<NP_object> | <NP_category>);
+<bringMeObjFromPlcmt> 		= <V_bring> <NP_me> (<NP_object> | <NP_absobject>) <fromLocPrep> <NP_placement>;
+<bringMeRelObjFromPlcmt>    = <V_bring> <NP_me> <NP_relObject> <NP_object> <fromLocPrep> <NP_placement>;
+<bringMeShapedObjFromPlcmt> = <V_bring> <NP_me> <NP_objectprop> (object | <NP_category>) <fromLocPrep> <NP_placement>;
+
+
+<countObjOnPlcmt> 		= <V_count> (<NP_object> | <NP_category>) there are <placePrep> <NP_placement>;
+<countPrsInRoom> 		= <V_count> people in <NP_room> <arePrep> (<NP_posture> | <NP_genderpersonplural>);
+
+<tellPrsInfoInLoc> 		= <V_tell> me <NP_personattribute> of the person <LocPrep> (<NP_room> | <NP_beacon>);
+<tellObjPropOnPlcmt> 		= <V_tell> me ((what is) | whats | (which are)) <NP_objectprop> (object | objects) <onLocPrep> <NP_placement>;
+<tellCatPropOnPlcmt> 		= <V_tell> me ((what is) | whats | (which are)) <NP_objectprop> <NP_category> <onLocPrep> <NP_placement>;
+
+<deliverObjToMe> 		= <V_deliver> (<NP_object> | <NP_category>) <deliverPrep> <NP_me>;
+<deliverObjPronToMe> 		= <V_deliver> <NP_objectpron> <deliverPrep> <NP_me>;
+<deliverObjToGestPrsInRoom> 	= <V_deliver> (<NP_object> | <NP_category>) <deliverPrep> <NP_gestperson> <inLocPrep> <NP_roomTwo>;
+<deliverObjToNameAtBeac> 	= <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beaconTwo>;
+<deliverObjToPlacement>     = <V_take> <NP_object> <deliverPrep> <NP_placement>;
+
+<guidePronIncomplete>		= <V_guide> <NP_personalpron>;
+<guidePronBack>			= <V_guide> <NP_personalpron> back;
+<guidePronToBeacon> 		= <V_guide> <NP_personalpron> <toLocPrep> <NP_beaconTwo>;
+<guideNameToBeacon>      = <V_guide> <NP_name> <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>;
+
 <deliverPrep> 			= to;
 <placePrep> 			= on;
 <inLocPrep> 			= in;