Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/robocup-speechrec

psGrammar/tasks/cocktail_party/drinks.jsgf

@@ -3,10 +3,7 @@ grammar ToBI_object;
 public <statement> = [<verb>] [me] [<article>] <drinks> [please];
 
 
-
-<drinks> = cacao | coke | malz | mixdrink | orange juice | water | peppermint tea;
+<drinks> = coke | orange drink | coconut_milk | water;
 
 <verb> = bring | carry | retrieve | fetch | get | give;
 <article> = the | an | some | a | this;
-
-

psGrammar/tasks/cocktail_party/drinks_magdebums2018.jsgf

+#JSGF V1.0;
+grammar ToBI_object;
+public <statement> = [<verb>] [me] [<article>] <drinks> [please];
+
+
+
+<drinks> = cacao | coke | malz | mixdrink | orange juice | water | peppermint tea;
+
+<verb> = bring | carry | retrieve | fetch | get | give;
+<article> = the | an | some | a | this;
+
+