some grammar changes

psGrammar/tasks/gpsr/commands.jsgf

@@ -8,8 +8,8 @@ public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2
 <VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
 
 <VP_trans> = <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <meetName> | <takeObj>;
-<VP_bitrans> = <placeObjOnPlcmt> | <bringMeObj> | <deliverObjToMe> | <findPrsInRoom> | <countObjOnPlcmt> | <findObjInRoom> | <findCatInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPrsInfoInLoc> | <countPrsInRoom> | <tellObjPropOnPlcmt> | <guidePrsToBeacon>; 
-<VP_tritrans> = <deliverObjToGestPrsInRoom> | <takeObjFromLocToPlcmt> | <deliverObjToNameAtBeac> | <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> | <guideNameFromBeacToBeac> | <bringMeObjFromPlcmt> | <tellCatPropOnPlcmt> | <guideNameToBeacFindAtBeac>;
+<VP_bitrans> = <placeObjOnPlcmt> | <bringMeObj> | <deliverObjToMe> | <findPrsInRoom> | <countObjOnPlcmt> | <findObjInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPrsInfoInLoc> | <countPrsInRoom> | <tellObjPropOnPlcmt> | <guidePrsToBeacon>; 
+<VP_tritrans> = <deliverObjToGestPrsInRoom> | <deliverObjToNameAtBeac> | <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> | <guideNameFromBeacToBeac> | <bringMeObjFromPlcmt> | <tellCatPropOnPlcmt> | <guideNameToBeacFindAtBeac>;
 
 
 <goToLoc> = <V_go> <toLocPrep> (<NP_room> | <NP_placement> | <NP_beacon>);
@@ -22,25 +22,23 @@ public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2
 <takeObj> = <V_take> <NP_object>;
 
 
-<takeObjFromPlcmt> = <V_take>  <NP_object> <fromLocPrep> <NP_placement>;
+<takeObjFromPlcmt> = <V_take>  <NP_object> <fromLocPrep> (<NP_room> | <NP_placement>);
 <placeObjOnPlcmt> = <V_place> (<NP_object> | <NP_objectpron>) <placePrep>  <NP_placement>;
 <bringMeObj>    = <V_bring> <NP_me> <NP_object>;
 <deliverObjToMe> = <V_deliver> (<NP_object> | <NP_objectpron>) <deliverPrep> <NP_me>;
 <findPrsInRoom> = <V_find> (<NP_gestperson> | <NP_genderperson> | <NP_poseperson>) <inLocPrep> <NP_room>;
-<findObjInRoom> = <V_find> <NP_object> <inLocPrep> <NP_room>;
-<findCatInRoom> = <V_find> <NP_category> <inLocPrep> <NP_room>;
+<findObjInRoom> = <V_find> (<NP_object> | <NP_category>) <inLocPrep> <NP_room>;
 <meetPrsAtBeac> = <V_meet> <NP_name> <atLocPrep> <NP_beacon>;
-<followPrsToRoom> = <V_follow> <NP_personalpron> <toLocPrep> <NP_room>;
-<guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beacon>;
+<followPrsToRoom> = <V_follow> <NP_personalpron> <toLocPrep> <NP_roomTwo>;
+<guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beaconTwo>;
 <countObjOnPlcmt> = <V_count> (<NP_object> | <NP_category>) there are <placePrep> <NP_placement>;
 <countPrsInRoom> = <V_count> people in <NP_room> <arePrep> (<NP_pose> | <NP_genderpersonplural>);
 <tellPrsInfoInLoc> = <V_tell> me <NP_personinfo> of the person <LocPrep> (<NP_room> | <NP_beacon>);
 <tellObjPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> object <onLocPrep> <NP_placement>;
 
 
-<deliverObjToGestPrsInRoom> = <V_deliver> <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_room>;
-<takeObjFromLocToPlcmt> = <V_take> <NP_object> <fromLocPrep> (<NP_room> | <NP_placement>) and <V_place> it on <NP_placementTwo>;
-<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beacon>;
+<deliverObjToGestPrsInRoom> = <V_deliver> <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_roomTwo>;
+<deliverObjToNameAtBeac> = <V_deliver> <NP_objectpron> <deliverPrep> <NP_name> <atLocPrep> <NP_beaconTwo>;
 <talkInfoToGestPrsInRoom> = <V_talk> <NP_talk> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
 <answerToGestPrsInRoom> = <V_answer> <NP_answer> <talkPrep> <NP_gestperson> <inLocPrep> <NP_room>;
 <followNameFromBeacToRoom> = <V_follow> <NP_name> <fromLocPrep> <NP_beacon> <toLocPrep> <NP_roomTwo>;