From 5f4ae284aaacc724294a10bee6c3e5bb2e5c67e0 Mon Sep 17 00:00:00 2001
From: rfeldhans <rfeldhans@techfak.uni-bielefeld.de>
Date: Fri, 5 May 2017 12:08:40 +0200
Subject: [PATCH] reworked gpsr answer grammar and dict

---
 psGrammar/dictionary/tobiDic.dic |  1 +
 psGrammar/tasks/gpsr/answer.jsgf | 39 ++++++--------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/psGrammar/dictionary/tobiDic.dic b/psGrammar/dictionary/tobiDic.dic
index 95ea2b4f..2c8805a4 100644
--- a/psGrammar/dictionary/tobiDic.dic
+++ b/psGrammar/dictionary/tobiDic.dic
@@ -131332,6 +131332,7 @@ woofter	W UW F T ER
 woogie	W UW G IY
 woogie(2)	W UH G IY
 wooing	W UW IH NG
+wookie	W UW K IY
 wool	W UH L
 woolard	W UH L ER D
 woolbright	W UH L B R AY T
diff --git a/psGrammar/tasks/gpsr/answer.jsgf b/psGrammar/tasks/gpsr/answer.jsgf
index 916e6717..594067a4 100644
--- a/psGrammar/tasks/gpsr/answer.jsgf
+++ b/psGrammar/tasks/gpsr/answer.jsgf
@@ -1,42 +1,17 @@
 #JSGF V1.0;
 grammar questions;
 
-public <question> = [(tobi | biron | robot)] (<quest_arena> | <quest_obj> | <quest_predef>);
+public <question> = [(tobi | biron | robot)] (<quest_predef>);
 
 public <quest_predef> = <predef1> | <predef2> | <predef3> | <predef4> | <predef5> | <predef6> | <predef7> | <predef8> | <predef9> | <predef10>;
-<predef1> = what city are we in | in what city are we;
+<predef1> = what city are we in | in what city are we | what is the name of the city we are in | name the city we are in;
 <predef2> = (what is | whats) (your (teams | team) name | the name of your team);
-<predef3> = name the big hairy creature in star wars;
+<predef3> = name the big hairy creature in star wars | name the wookie in star wars;
 <predef4> = who wrote the three laws of robotics;
-<predef5> = from what series do you know rosie the robot;
-<predef6> = from what series do you know the baby bam bam;
+<predef5> = from what series do you know rosie the robot | rosie the robot;
+<predef6> = from what series do you know the baby bam bam | baby bam bam;
 <predef7> = who is the main character of the matrix;
-<predef8> = name the two robocup at home standard platforms;
+<predef8> = name the two robocup at home standard platforms | home standard platform;
 <predef9> = where do you store your memories;
-<predef10> = where is your team located;
+<predef10> = where is your team located | where does your team come from;
 
-public <quest_arena> = <arena1> | <arena2> | <arena3> | <arena4>;
-<arena1> = where is the <location> ;
-<arena2> = in which room is the <location>;
-<arena3> = how many doors has the <room>;
-<arena4> = how many <location> are in the <room>;
-
-<quest_obj> = <obj1> | <obj2> | <obj3> | <obj4> | <obj5> | <obj6> | <obj7> | <obj8> | <obj9>;
-<obj1> = where can i find [a | the] (<object> | <category>);
-<obj2> = how many <category> (there are | are there);
-<obj3> = (whats | what is) the <property> of the <object>;
-<obj4> = how many (<category> | objects) are (in | on | at | around | by) the <location>;
-<obj5> = what objects are stored (in | on | at | around | by) the <location>;
-<obj6> = to which category (belong | belongs) the <object>;
-<obj7> = do [the] <object> and [the] <object> belong to the same category;
-<obj8> = (which | what) is the <adjektiv_sup> (<category> | object);
-<obj9> = between [the] <object> and [the] <object> which one is <adjektiv_compare>;
-<adjektiv_sup> = biggest | smallest;
-<adjektiv_compare> = bigger | smaller;
-
-
-<location> = bed | dining table | cabinet | bookshelf | couch table | sofa | bar | kitchen counter | desk | stove | closet | side table;
-<room> = bedroom | living room | dining room | kitchen;
-<object> = apple | bag | banana milk | basket | bread | cappucino | cereals | chocolate cookies | cloth | coffeecup | coke | cornflakes | crackers | egg | fork | spoon | knife | lemon | noodles | orange drink | paper | paprika | party cracker | pear | peas | pepper | plate | potato soup | potato | pringles | red bowl | salt | sponge | tomato pasta | towel | water | white bowl;
-<property> = color | shape | size | category | location;
-<category> = snack | food | fruit | drink | cleaning stuff | container | cutlery;
-- 
GitLab