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

psConfig/tasks/restaurant/restaurant.conf

@@ -27,3 +27,9 @@ rsbscope=/speechrec/psa/goTable;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=anotherGuest;
+jsgf=../../../psGrammar/tasks/restaurant/anotherGuest.jsgf;
+rsbscope=/speechrec/psa/anotherGuest;
+bestpath=no;
+autoload=yes;

psGrammar/tasks/restaurant/anotherGuest.jsgf

+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [<title>] (<wait> | <stop>);
+
+<title> = tobi | biron;
+
+<wait> = wait;
+<stop> = stop;

psGrammar/tasks/restaurant/goTable.jsgf

 #JSGF V1.0;
 grammar restaurant_save_command;
 
-public <restaurant> = <title> (<go> | <wait>);
-<title> = <tobititle> | <robottitle>;
+public <restaurant> = (<tobigo> | <tobiwait> | <robotgo> | <robotwait>);
+
+<tobigo> = <tobititle> <go>;
+<tobiwait> = <tobititle> <wait>;
+
+<robotgo> = <robottitle> <go>;
+<robotwait> = <robottitle> <wait>;
 
 <tobititle> = tobi | biron;
-<robottitle> = robot;
+<robottitle> = lisa | homer | sergio | amigo;
 
 <go> =  [please] (take the order) [please];
 <wait> = wait | stop;

psGrammar/tasks/restaurant/order.jsgf

@@ -6,5 +6,5 @@ public <restaurant> = ([tobi] [bring me] [one | a ] <objects> [please]);
 <objects> = (<drinks> | <combo>);
 <combo> = (<food> (and | with) <food>);
 
-<drinks> = ((coconut milk) | (beer) | (coke) | (tea));
-<food> = ((apple) | (paprika) | (pumpernickel) | (chips) | (pretzels) | (pringles) | (biscuits) | (choco syrup) | (baby sweets) | (egg));
+<drinks> = ((banana milk) | (cappuccino) | (coke) | (orange drink) | (water));
+<food> = ((apple) | (bread) | (cereals) | (pear) | (chocolate cookies) | (party cracker) | (corn flakes) | (crackers) | (lemon) | (noodles) | (pepper) | (potato soup) | (potato) | (pringles) | (salt) | (tomato pasta) | (egg));