From 2951f822fb5dbdfc2e194b383c27133e6e5d01d5 Mon Sep 17 00:00:00 2001
From: pvonneumanncosel <pvonneumanncosel@techfak.uni-bielefeld.de>
Date: Mon, 12 Mar 2018 16:26:35 +0100
Subject: [PATCH] split tell object prop in location in bitrans and tritrans
 version

---
 psGrammar/tasks/gpsr/gpsr_2018.jsgf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/psGrammar/tasks/gpsr/gpsr_2018.jsgf b/psGrammar/tasks/gpsr/gpsr_2018.jsgf
index 8106a867..f05a0bc9 100644
--- a/psGrammar/tasks/gpsr/gpsr_2018.jsgf
+++ b/psGrammar/tasks/gpsr/gpsr_2018.jsgf
@@ -9,8 +9,8 @@ public <sentence> = ([please | (could you) | (robot please) | (could you please)
 <VP3> 		= (<VP_tritrans> | <VP_bitrans> | <VP_trans> );
 
 <VP_trans> = <goToLoc> | <findObj> | <talkInfo> | <answerQuestion> | <findPrs> | <followPrs> | <meetName>;
-<VP_bitrans> = <takeObjToPlcmt> | <placeObjOnPlcmt> | <bringMeObj> | <deliverObjToMe> | <findPrsInRoom> | <tellNoObjOnPlcmt> | <findObjInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPsrInfoInLoc> | <tellNoPrsInRoom> | <guidePrsToBeacon>; 
-<VP_tritrans> = <deliverObjToGestPrsInRoom> | <takeObjFromLocToPlcmt> | <deliverObjToNameAtBeac> | <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> | <guideNameFromBeacToBeac> | <bringMeObjFromPlcmt> | <tellObjPropOnPlcmt> | <guideNameToBeacFindAtBeac>;
+<VP_bitrans> = <takeObjToPlcmt> | <placeObjOnPlcmt> | <bringMeObj> | <deliverObjToMe> | <findPrsInRoom> | <tellNoObjOnPlcmt> | <findObjInRoom> | <meetPrsAtBeac> | <followPrsToRoom> | <takeObjFromPlcmt> | <tellPsrInfoInLoc> | <tellNoPrsInRoom> | <tellObjPropOnPlcmt> | <guidePrsToBeacon>; 
+<VP_tritrans> = <deliverObjToGestPrsInRoom> | <takeObjFromLocToPlcmt> | <deliverObjToNameAtBeac> | <talkInfoToGestPrsInRoom> | <answerToGestPrsInRoom> | <followNameFromBeacToRoom> | <guideNameFromBeacToBeac> | <bringMeObjFromPlcmt> | <tellCatPropOnPlcmt> | <guideNameToBeacFindAtBeac>;
 
 
 <goToLoc> = <V_goto> (<NP_room> | <NP_placement> | <NP_beacon>);
@@ -35,6 +35,7 @@ public <sentence> = ([please | (could you) | (robot please) | (could you please)
 <guidePrsToBeacon> = <V_guide> <NP_personalpron> <toLocPrep> <NP_beacon>;
 <tellPsrInfoInLoc> = <V_tell> me <NP_personinfo> of the person <LocPrep> (<NP_room> | <NP_beacon>);
 <tellNoPrsInRoom> = <V_tell> me how many people in <NP_room> <arePrep> (<NP_pose> | <NP_genderpersonplural>);
+<tellObjPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> object <onLocPrep> <NP_placement>;
 
 
 <deliverObjToGestPrsInRoom> = <V_deliver> <NP_object> <deliverPrep> <NP_gestperson> <inLocPrep> <NP_room>;
@@ -46,7 +47,7 @@ public <sentence> = ([please | (could you) | (robot please) | (could you please)
 <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 <atLocPrep> <NP_beacon>;
 <bringMeObjFromPlcmt> = <V_bring> <NP_me> <NP_object> <fromLocPrep> <NP_placement>;
-<tellObjPropOnPlcmt> = <V_tell> me <whatis> <NP_objectprop> (<NP_category> | object) <onLocPrep> <NP_placement>;
+<tellCatPropOnPlcmt> = <V_tell> me ((what is) | whats) <NP_objectprop> <NP_category> <onLocPrep> <NP_placement>;
 
 
 <V_take>    = bring | take | get | grasp | (pick up);
@@ -117,4 +118,3 @@ public <sentence> = ([please | (could you) | (robot please) | (could you please)
 <LocPrep> = in | at;
 <onLocPrep> = on;
 <arePrep> = are;
-<whatis> = (what is) | whats;
-- 
GitLab