From 92b382f259ce45d4f4084f39b0f92b2ee173f34f Mon Sep 17 00:00:00 2001
From: rfeldhans <rfeldhans@techfak.uni-bielefeld.de>
Date: Thu, 4 May 2017 09:57:27 +0200
Subject: [PATCH] added stuff from first day of magdeburg

---
 psConfig/tasks/gpsr/gpsr.conf            |  8 ++++
 psGrammar/dictionary/tobiDic.dic         |  1 +
 psGrammar/tasks/gpsr/answer.jsgf         | 42 +++++++++++++++++++++
 psGrammar/tasks/speechrec/questions.jsgf | 47 +++++++++---------------
 4 files changed, 69 insertions(+), 29 deletions(-)
 create mode 100644 psGrammar/tasks/gpsr/answer.jsgf

diff --git a/psConfig/tasks/gpsr/gpsr.conf b/psConfig/tasks/gpsr/gpsr.conf
index bf18e260..f6478bfc 100644
--- a/psConfig/tasks/gpsr/gpsr.conf
+++ b/psConfig/tasks/gpsr/gpsr.conf
@@ -21,3 +21,11 @@ jsgf=../../../psGrammar/confirm/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+dict=../../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../../psGrammar/tasks/gpsr/answer.jsgf;
+rsbscope=/speechrec/psa/answer;
+bestpath=no;
+autoload=yes;
diff --git a/psGrammar/dictionary/tobiDic.dic b/psGrammar/dictionary/tobiDic.dic
index 4e59b312..530541fd 100644
--- a/psGrammar/dictionary/tobiDic.dic
+++ b/psGrammar/dictionary/tobiDic.dic
@@ -18058,6 +18058,7 @@ capping	K AE P IH NG
 cappo	K AE P OW
 capps	K AE P S
 cappuccino	K AE P UW CH IY N OW
+cappuccino(2)	K AH P UW CH IY N OW
 cappuccio	K AA P UW CH IY OW
 cappy	K AE P IY
 cappy's	K AE P IY Z
diff --git a/psGrammar/tasks/gpsr/answer.jsgf b/psGrammar/tasks/gpsr/answer.jsgf
new file mode 100644
index 00000000..115d6ad7
--- /dev/null
+++ b/psGrammar/tasks/gpsr/answer.jsgf
@@ -0,0 +1,42 @@
+#JSGF V1.0;
+grammar questions;
+
+public <question> = [(tobi | biron | robot)] (<quest_crowd> | <quest_arena> | <quest_obj> | <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;
+<predef2> = what is your teams name | what is the name of your team;
+<predef3> = name the big hairy creature 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;
+<predef7> = who is the main character of the matrix;
+<predef8> = name the two robocup at home standard platforms;
+<predef9> = where do you store your memories;
+<predef10> = where is your team located;
+
+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 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 is the <adjektiv_sup> (<category> | object);
+<obj9> = between [the] <object> and [the] <object> which one is <adjektiv_compare>;
+<adjektiv_sup> = heaviest | lightest | biggest | smallest;
+<adjektiv_compare> = heavier | lighter | 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 | cappuccino | cereals | chocolate cookies | cloth | coffee cup | coke | corn flakes | 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;
diff --git a/psGrammar/tasks/speechrec/questions.jsgf b/psGrammar/tasks/speechrec/questions.jsgf
index 09d65edf..9ee17c4c 100644
--- a/psGrammar/tasks/speechrec/questions.jsgf
+++ b/psGrammar/tasks/speechrec/questions.jsgf
@@ -1,30 +1,19 @@
 #JSGF V1.0;
 grammar questions;
 
-public <question> = [(tobi | biron | robot)] (<quest_crowd> | <quest_arena> | <quest_obj> | <quest_predef>) [(tobi | biron | robot)];
-
-public <quest_predef> = <predef1> | <predef2> | <predef3> | <predef4> | <predef5> | <predef6> | <predef7> | <predef8> | <predef9> | <predef10> | <predef11> | <predef12> | <predef13> | <predef14> | <predef15> | <predef16> | <predef17> | <predef18> | <predef19> | <predef20> | <predef21>;
-<predef1> = what day is today | what day is it;
-<predef2> = what is your name;
-<predef3> = what is your teams name | what is the name of your team;
-<predef4> = what time is it;
-<predef5> = in which year was [the] (robocup | robocup at home) founded;
-<predef6> = what was the last question;
-<predef7> = who invented the c programming language;
-<predef8> = when was invented the c programming language | when was the c programming language invented;
-<predef9> = when was invented the b programming language | when was the b programming language invented;
-<predef10> = where does the term computer bug come from;
-<predef11> = who invented the first compiler;
-<predef12> = which robot is used in the open platform league;
-<predef13> = which robot is used in the domestic standard platform league;
-<predef14> = which robot is used in the social standard platform league;
-<predef15> = how many people live in [the] japan;
-<predef16> = what are the colors of the japanese flag;
-<predef17> = what is the highest point in japan;
-<predef18> = what is a sakura;
-<predef19> = who is the emperor of japan;
-<predef20> = do you have dreams;
-<predef21> = in which city will next years robocup be hosted;
+public <question> = [(tobi | biron | robot)] (<quest_crowd> | <quest_arena> | <quest_obj> | <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;
+<predef2> = what is your teams name | what is the name of your team;
+<predef3> = name the big hairy creature 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;
+<predef7> = who is the main character of the matrix;
+<predef8> = name the two robocup at home standard platforms;
+<predef9> = where do you store your memories;
+<predef10> = where is your team located;
 
 public <quest_arena> = <arena1> | <arena2> | <arena3> | <arena4>;
 <arena1> = where is the <location> ;
@@ -63,9 +52,9 @@ public <quest_crowd> = <crowd1> | <crowd2> | <crowd3> | <crowd4> | <crowd5> | <c
 
 
 
-<location> = bed | bedside | living shelf | tv stand | living table | center table | bar | drawer | desk | cupboard | sink | side shelf | bookcase | dining table | fridge | counter | cabinet;
-<room> = bedroom | living room | office | kitchen | corridor | bathroom;
-<object> = chips | senbei | pringles | peanuts | chocolate bar | manju | mints | chocolate egg | noodles | apple | paprika | watermelon | sushi | tea | beer | coke | sake | shampoo | soap | cloth | sponge | bowl | tray | plate;
-<property> = color | shape | size | type | weight | category | location;
-<category> = snacks | candies | food | drinks | toiletries | containers;
+<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 | cappuccino | cereals | chocolate cookies | cloth | coffee cup | coke | corn flakes | 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;
 <gesture> = waving | raising left arm | raising right arm | pointing left | pointing right;
-- 
GitLab