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

psConfig/challenge/team2/configTeam2.conf

@@ -7,21 +7,21 @@ openDeviceDirectly=yes;
 
 [pocketsphinxinstance]
 name=confirm;
-jsgf=../../psGrammar/confirm/confirm.jsgf;
+jsgf=../../../psGrammar/confirm/confirm.jsgf;
 rsbscope= /speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
 name=order;
-jsgf=../../psGrammar/challenge/team2/order.jsgf;
+jsgf=../../../psGrammar/challenge/team2/order.jsgf;
 rsbscope= /speechrec/psa/order;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
 name=table;
-jsgf=../../psGrammar/challenge/team2/table.jsgf;
+jsgf=../../../psGrammar/challenge/team2/table.jsgf;
 rsbscope= /speechrec/psa/table;
 bestpath=no;
 autoload=yes;

psGrammar/challenge/team2/order.jsgf

 #JSGF V1.0;
 grammar ordering;
 public <ordering> = [tobi] <order>;
-public <table> = [at table] <number>;
 
-<order> = [please] bring [me a] <drink>;
+<order> = [please] bring [me] [a] <drink>;
 
-<drink> = (coconut_milk | tea | coke | fanta | water | orange_juice);
+<drink> = (coke | malz | lemonade | water | (ice tea) | coffee);
 
-<number> = (a | b);
 

psGrammar/challenge/team2/table.jsgf

 #JSGF V1.0;
 grammar table;
-public <table> = [tobi] <place>;
+public <table> = <place>;
 
-<place> = [[please] go to table] <number>;
+<place> = table <number>;
 
 <number> = (a | b);