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

psConfig/challenge/nea/nea.conf

@@ -20,6 +20,13 @@ rsbscope=/speechrec/psa/speechRecognition;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=takeOrder;
+jsgf=../../../psGrammar/challenge/nea/takeOrder.jsgf;
+rsbscope=/speechrec/psa/order;
+bestpath=no;
+autoload=yes;
+
 [pocketsphinxinstance]
 name=removeAddBillItem;
 jsgf=../../../psGrammar/challenge/nea/removeAddBillItem.jsgf;

psGrammar/challenge/nea/removeAddBillItem.jsgf

 #JSGF V1.0;
 grammar removeAddBillItem;
 
-public <removeAddBillItem> = ([the] <drink> [is missing] [(on|in) the (bill|list)]|[the] <drink> [(is|was) wrong]|remove [the] <drink> [from the (bill|list)| add [the] <drink> to the (bill|list));
+public <removeAddBillItem> = (<add>|<remove>);
 
+<add> = (<addA> <addB>);
+<addA> = [the] <drink> [<verb> missing] [<preposition> the <bill>];
+<addB> = [please] add [the] <drink> [to the <bill>];
+<remove> = (<removeA>|<removeB>);
+<removeA> = [the] <drink> [<verb> wrong];
+<removeB> = [please] remove [the] <drink> [from the <bill>];
+<bill> = (bill|list);
+<verb> = (is|was);
+<preposition> = (on|in);
 <drink> = (coke|malz|lemonade|water|ice tea|coffee);

psGrammar/challenge/nea/takeOrder.jsgf

+#JSGF V1.0;
+grammar nea;
+
+public <nea> = [tobi|tiago] ( <pre>  <ord> );
+
+<pre> = (i want [a]| i would like to have [a] | bring me);
+<ord> = <drink>;
+
+<drink> = (coke|malz|lemonade|water|ice tea|coffee);

psGrammar/challenge/team2/bill.jsgf

 #JSGF V1.0;
 grammar bill;
 public <command> = ( <setupbill> | <thatscorrect> | <correction> );
-<setupbill> = [tiago] [please] (set up the ( bill | check ) | could i have the ( bill | check ) | i ( would like | want ) to pay | can i pay | bill ) [now] [please];
-<thatscorrect> = ( yes | [yes] you got that ( right | correct ) | [yes] that is ( right | correct ) );
-<correction> = [ [no] i ordered | there are ] <drink> [ [and] <drink>] [ [and] <drink>];
 
-<drink> = [ a | one | two | three ] [ bottle of | bottles of | cup of | cups of | can of | cans of] ( coke | malz | lemonade | water | ice tea | coffee );
+<setupbill> = (([tiago] [please]) (((set up the) ( bill | check )) | ((could i have the) ( bill | check )) | (i ( (would like) | want ) to pay) | (can i pay) | bill) [now] [please]);
+<thatscorrect> = ( yes | ([yes] (you got that) ( right | correct )) | ([yes] (that is) ( right | correct )) );
+<correction> = ([[no] ((i ordered) | (there are))] <drink> [[and] <drink>] [[and] <drink>]);
+
+<drink> = ([ (((a | one) [(bottle | cup | can) of] )) | ((two | three) [(bottles | cups | cans) of]) ] ( coke | malz | lemonade | water | (ice tea) | coffee ));

psGrammar/challenge/team2/task5.jsgf

 #JSGF V1.0;
 grammar task5;
 
-public <command> =  [please] <verb> <location> [please];
+public <sentence> = [<robot>] [please] <command> <location>;
 
-<robot> = (tiago | tobi);
-
-<verb> = bring [me] [to] | take me [to] | where is | i want [to go to] | where [(can|do) i] [find] ;
-
-<location> = [the] <bathroom> | table <table> | [the] <cashRegister> ;
+<robot> = (tiago|tobi);
+<command> = (((bring | take) me to) | (where (is | (can i find))) | (i want to go to));
+<location> = (the <bathroom> | <table> | the <cashRegister>);
 <bathroom> = (bathroom | toilet);
-<cashRegister> = (cashier | [cash] register);
-
-<table> = a | b | c ;
-
+<cashRegister> = (cashier | ([cash] register));
+<table> = (<tableA> | <tableB> | <tableC>);
+<tableA> = (table a);
+<tableB> = (table b);
+<tableC> = ((table c) | ([an] empty table));