From e3fd19c0db9a15099c97a259ff304e7fb867a221 Mon Sep 17 00:00:00 2001
From: pvonneumanncosel <pvonneumanncosel@techfak.uni-bielefeld.de>
Date: Wed, 23 May 2018 16:52:32 +0200
Subject: [PATCH] changing eegpsr grammar

---
 psGrammar/tasks/gpsr/eegpsr2.jsgf | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/psGrammar/tasks/gpsr/eegpsr2.jsgf b/psGrammar/tasks/gpsr/eegpsr2.jsgf
index a7934879..bf542639 100644
--- a/psGrammar/tasks/gpsr/eegpsr2.jsgf
+++ b/psGrammar/tasks/gpsr/eegpsr2.jsgf
@@ -5,16 +5,18 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 
 <VP1> 		= (<VP_quintrans> | <VP_quatrans> | <VP_tritrans> | <VP_bitrans> | <VP_trans>);
 
-<VP_trans> = <countPpl> | <greetKid> | <followPerAtLoc> | <accompanyPerAtLoc> | <guidePerAtLoc>;
+<VP_trans> = <countPpl> | <greetKid>;
 
-<VP_bitrans> = <guideKidInRm> | <followNameAtLoc> | <followNameInRm> | <greetKidInRm> | <countPplDsc> | <greetNameInRm> | <greetGenDsc> | <countPplInRm> | <describePostAtLoc> | <guidePerAtLocToLoc> | <accompanyKidInRm> | <accompanyNameInRm> | <accompanyNameAtLoc> | <followKidInRm> | <accompanyPerAtLocToLoc>;
+<VP_bitrans> = <accompanyPerAtLoc> | <followPerAtLoc> | <guideKidInRm> |<guidePerAtLoc> | <followNameAtLoc> | <followNameInRm> | <greetKidInRm> | <countPplDsc> | <greetNameInRm> | <greetGenDsc> | <countPplInRm> | <accompanyKidInRm> | <accompanyNameInRm> | <accompanyNameAtLoc> | <followKidInRm>;
 
-<VP_tritrans> = <guideNameFromLoctoLoc> | <offerSmtToNameInRm> | <offerSmtToPplDsc> |<offerSmtToPplInRm> | <guideNameInRmToRm> | <greetGenColOut> | <greetGenDscInRm> | <meetNameAtLocThenFindInRm> | <countPplInRmDsc> | <countPplDscInRm> | <describePostAtLocToPAtLoc> | <followGenDscInRm> | <accompanyKidInRmToRm> | <accompanyAppGenInRm> | <accompanyNameFromLoctoLoc> | <accompanyNameInRmToRm> | <bringSmtToKidInRm> | <guideInRmToRm> | <guideAppGenInRm>;
+<VP_tritrans> = <guidePerAtLocToLoc> | <describeToMePostAtLoc> | <describePostAtLocToMe> | <guideNameFromLoctoLoc> | <offerSmtToNameInRm> | <offerSmtToPplDsc> |<offerSmtToPplInRm> | <guideNameInRmToRm> | <greetGenColOut> | <greetGenDscInRm> | <meetNameAtLocThenFindInRm> | <countPplInRmDsc> | <countPplDscInRm> | <followGenDscInRm> | <accompanyKidInRmToRm> | <accompanyAppGenInRm> | <accompanyNameFromLoctoLoc> | <accompanyNameInRmToRm> | <accompanyPerAtLocToLoc> | <bringSmtToKidInRm> | <guideInRmToRm> | <guideAppGenInRm>;
 
-<VP_quatrans> = <meetNameAtLocFindInRmLoc> | <guideGenColOutInRm> | <greetGenColOutInRm> | <bringSmtToGenDscInRm> | <followGenColOutInRm> | <guideAppGenInRmToRm> | <accompanyGenColOutInRm> | <accompanyAppGenInRmToRm> | <offerSmtToPplDscInRm>;
+<VP_quatrans> = <describePostAtLocToPAtLoc> | <meetNameAtLocFindInRmLoc> | <guideGenColOutInRm> | <greetGenColOutInRm> | <bringSmtToGenDscInRm> | <followGenColOutInRm> | <guideAppGenInRmToRm> | <accompanyGenColOutInRm> | <accompanyAppGenInRmToRm> | <offerSmtToPplDscInRm>;
 
 <VP_quintrans> = <bringSmtToGenColOutInRm> | <guideGenColOutInRmToRm> | <accompanyGenColOutInRmToRm>;
 
+
+
 <greetKidInRm>              = <V_greet> the <NP_child> in the <NP_room>;
 
 <greetGenDscInRm>           = <V_greet> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
@@ -43,9 +45,11 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 
 <countPplDsc>               = <V_count> <NP_genderagepersonplural> [are] (<NP_postureAdditional> | <NP_gestureAdditional> | wearing <NP_outfitplural> | wearing <NP_color> | dressed in <NP_color>) [there are];
 
-<describePostAtLoc>         = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) [(looks like | to me)];
+<describeToMePostAtLoc>     = <V_describe> [to] <NP_me> the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) [looks like];
+
+<describePostAtLocToMe>     = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) to <NP_me>;
 
-<describePostAtLocToPAtLoc> = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) to the person at the <NP_beaconTwo>;
+<describePostAtLocToPAtLoc> = <V_describe> [to] [me] the <NP_poseperson> (at | in) the (<NP_room> | <NP_beacon>) to the <NP_person> at the <NP_beaconTwo>;
 
 <offerSmtToPplInRm>         = <V_offer> something to <NP_offer> to all the <NP_genderagepersonplural> in the <NP_room>;
 
@@ -67,9 +71,9 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 
 <guideGenColOutInRmToRm>    = <V_guide> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
 
-<guidePerAtLocToLoc>        = <V_guide> the person at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exitTwo>);
+<guidePerAtLocToLoc>        = <V_guide> the <NP_person> at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exitTwo>);
 
-<guidePerAtLoc>             = <V_guide> the person at the <NP_beacon>;
+<guidePerAtLoc>             = <V_guide> the <NP_person> at the <NP_beacon>;
 
 <guideNameInRmToRm>         = <V_guide> [the] <NP_name> in the <NP_room> to the (<NP_beaconTwo> | <NP_roomTwo> | <NP_exitTwo>);
 
@@ -87,7 +91,7 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 
 <followGenColOutInRm>       = <V_follow> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
 
-<followPerAtLoc>            = <V_follow> the person at the <NP_beacon>;
+<followPerAtLoc>            = <V_follow> the <NP_person> at the <NP_beacon>;
 
 <followNameInRm>            = <V_follow> [the] <NP_name> in the <NP_room>;
 
@@ -99,8 +103,8 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 <accompanyAppGenInRm>        = <V_accompany> the (<NP_property> <NP_genderpersonsingular> | <NP_genderpersonsingular> <NP_gestureAdditional> | <NP_genderpersonsingular> wearing <NP_accessory>) in the <NP_room>;
 <accompanyGenColOutInRmToRm> = <V_accompany> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
 <accompanyGenColOutInRm>     = <V_accompany> the <NP_genderpersonsingular> (dressed in | wearing) [a | an] <NP_color> (<NP_outfitsingular> | <NP_outfitbottom>) in the <NP_room>;
-<accompanyPerAtLocToLoc>     = <V_accompany> the person at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exit>);
-<accompanyPerAtLoc>          = <V_accompany> the person at the <NP_beacon>;
+<accompanyPerAtLocToLoc>     = <V_accompany> the <NP_person> at the <NP_beacon> to the (<NP_beaconTwo> | <NP_exit>);
+<accompanyPerAtLoc>          = <V_accompany> the <NP_person> at the <NP_beacon>;
 <accompanyNameInRmToRm>      = <V_accompany> [the] <NP_name> (from | in) the <NP_room> to the (<NP_beacon> | <NP_roomTwo> | <NP_exit>);
 <accompanyNameInRm>          = <V_accompany> [the] <NP_name> in the <NP_room>;
 <accompanyNameFromLoctoLoc>  = <V_accompany> [the] <NP_name> from the <NP_beacon> to the (<NP_beaconTwo> | <NP_exit>);
@@ -129,6 +133,8 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 <NP_outfitsingular>       = <N_outfitsingular>;
 <NP_accessory>   	        = <N_accessory>;
 <NP_name> 		            = <N_name>;
+<NP_me> 		            = <N_me>;
+<NP_person> 		            = <N_person>;
 <NP_beacon> 		        = <N_beacon>;
 <NP_beaconTwo> 	        = <N_beaconTwo>;
 <NP_room> 		            = <N_room> ;
@@ -141,6 +147,8 @@ public <sentence> = [could you | robot | tobi] [please] <VP1>;
 
 
 <N_name> = emma | olivia | sophia | ava | isabella | mia | abigail | emily | charlotte | harper | noah | liam | mason | jacob | william | ethan | james | alexander | michael | benjamin;
+<N_me> = me;
+<N_person> = person;
 <N_beacon> 			    = (living table) | sofa | (comfy chair) | fridge | kitchen counter | sink | stove | cabinet | bar;
 <N_beaconTwo> 		    = (living table) | sofa | (comfy chair) | fridge | kitchen counter | sink | stove | cabinet | bar;
 <N_room> 		    	    = corridor | (living room) | kitchen | bath room;
-- 
GitLab