eegpsr change brackets

psGrammar/tasks/gpsr/eegpsr2.jsgf

@@ -24,11 +24,11 @@ public <sentence> 		= [could you | robot | tobi] [please] <VP1>;
 <greetGenColOut>            	= <V_greet> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>);
 <greetNameInRm>             	= <V_greet> <NP_name> in the <NP_room>;
 
-<meetNameAtLocThenFindInRm> 	= <V_remember> <NP_name> at the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo>;
-<meetNameAtLocFindInRmLoc>  	= <V_remember> <NP_name> at the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo> <NP_beaconTwo>;
+<meetNameAtLocThenFindInRm> 	= <V_remember> <NP_name> (in | at) the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo>;
+<meetNameAtLocFindInRmLoc>  	= <V_remember> <NP_name> (at | in) the (<NP_room> | <NP_beacon>) then (greet | find) (it | him | her) in the <NP_roomTwo> <NP_beaconTwo>;
 
 <countPpl>                  	= <V_count> <NP_genderagepersonplural> there are;
-<countPplDsc>               	= <V_count> <NP_genderagepersonplural> [are] (<NP_postureAdditional> | <NP_gestureAdditional> | (wearing | wear | dressed in) (<NP_outfitplural> |<NP_color>));
+<countPplDsc>               	= <V_count> <NP_genderagepersonplural> [are] (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wear <NP_outfitplural> | dressed in <NP_outfitplural> | wearing <NP_color> | wear <NP_color> | dressed in <NP_color>);
 
 <countPplInRm>              	= <V_count> <NP_genderagepersonplural> [there are] in the <NP_room>;