minor changes

psGrammar/tasks/gpsr/commands.jsgf

@@ -8,7 +8,7 @@ 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> | <tellNoObjOnPlcmt> | <findObjInRoom> | <findCatInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPrsInfoInLoc> | <tellNoPrsInRoom> | <tellObjPropOnPlcmt> | <guidePrsToBeacon>; 
+<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>;
 
 
@@ -32,9 +32,9 @@ public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2
 <meetPrsAtBeac> = <V_meet> <NP_name> <atLocPrep> <NP_beacon>;
 <followPrsToRoom> = <V_follow> <NP_personalpron> <toLocPrep> <NP_room>;
 <guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beacon>;
-<tellNoObjOnPlcmt> = <V_count> (<NP_object> | <NP_category>) there are <placePrep> <NP_placement>;
+<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>);
-<tellNoPrsInRoom> = <V_count> people in <NP_room> <arePrep> (<NP_pose> | <NP_genderpersonplural>);
 <tellObjPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> object <onLocPrep> <NP_placement>;