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

psConfig/challenge/pollen/pollen.conf

@@ -8,7 +8,7 @@ alsadevice=sysdefault;
 
 [pocketsphinxinstance]
 name=confirm;
-jsgf=../../../psGrammar/confirm/confirm.jsgf;
+jsgf=../../../psGrammar/challenge/pollen/confirm.jsgf;
 rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;

psConfig/challenge/team2/configTeam2.conf

@@ -27,8 +27,15 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=table;
-jsgf=../../psGrammar/challenge/team2/task5.jsgf;
+name=bill;
+jsgf=../../../psGrammar/challenge/team2/bill.jsgf;
+rsbscope= /speechrec/psa/bill;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=task5;
+jsgf=../../../psGrammar/challenge/team2/task5.jsgf;
 rsbscope= /speechrec/psa/task5;
 bestpath=no;
 autoload=yes;

psGrammar/challenge/pollen/challenge.jsgf

 #JSGF V1.0;
 grammar pollen;
-public <orderstring> = [<robot>] <receiveorderstring>;
+public <orderstring> = [<robot>] [please] <receiveorderstring> [please];
 
-<receiveorderstring> = bring [me] [a] <drink>;
+<receiveorderstring> = [bring] [me] [a] <drink>;
 
 <drink> = (coke | malz | lemonade | water | ice tea | coffee);
 

psGrammar/challenge/pollen/confirm.jsgf

+#JSGF V1.0;
+grammar ToBI_confirm;
+public <confirm> = <confirm_yes> | <confirm_no>;
+
+<confirm_yes> = [<robot>] <yes_words>;
+<confirm_no> = [<robot>] <no_words>; 
+
+<yes_words> = (yes) | (confirmed);
+<no_words> = (no);
+<robot> = (tobi) | (robot) | (biron) | (pepper);

psGrammar/challenge/pollen/newGuest.jsgf

@@ -2,7 +2,7 @@
 grammar newGuest;
 public <newGuestString> = [<robot>] [please] <bringme> [please];
 
-<bringme> = bring [me] [to] <location>;
+<bringme> = [bring] [me] [to] <location>;
 
 <location> = (<registerloc> | <bathroomloc> | <tableloc>);
 

psGrammar/challenge/pollen/setUpBill.jsgf

@@ -2,13 +2,13 @@
 grammar setUpBill;
 public <setUpBillString> = [<robot>] (<setUpBill>|<correctDrinks>|<additionalDrink>);
 
-<setUpBill> = set up [the] bill [please];
+<setUpBill> = [please] [set] [up] [the] bill [please];
 
-<correctDrinks> = [the] drinks [are] <drinks>;
+<correctDrinks> = [the] [drinks] [are] <drinks>;
 
 <drinks> = <drink> <drink> [and] <drink>;
 
-<additionalDrink> = [i] [also] (<drank>|<had>) [a] <drink>;
+<additionalDrink> = [i] [also] [<drank>|<had>] [a] <drink>;
 
 <had> = had;
 

psGrammar/challenge/team2/bill.jsgf

 #JSGF V1.0;
 grammar bill;
-public <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]
-public <thatscorrect> = ( yes | [yes] you got that ( right | correct ) | [yes] that is ( right | correct ) )
-public <correction> = No I ordered <drink> [and] [<drink>] [and] [<drink>]
+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 | icetea | coffee )
-<drinkold> = [ a | one ] ( coconut milk | tea | coke | fanta | water | orangedrink )
+<drink> = [ a | one | two | three ] [ bottle of | bottles of | cup of | cups of | can of | cans of] ( coke | malz | lemonade | water | ice tea | coffee );

psGrammar/challenge/team2/task5.jsfg

-#JSGF V1.0;
-grammar task5;
-
-public <command> = [yes] <robot> [please] <command1> [please];
-
-<command1> = (<toBathroom> | <toCashRegister> | <toTableA> | <toTableB> | <toTableC> ) ;
-<robot> = (tiago | tobi);
-
-<toBathroom> = ([bring me] [to] [the] <bathroom> | I want to go to the <bathroom> | where is the <bathroom> |where [can] [do] I find the <bathroom>);
-<bathroom> = (bathroom | toilet);
-
-<toCashRegister> = ([bring me] [to] [the] <cashRegister> | I want to go to the <cashRegister> | where is the <cashRegister> | where [can] [do] I find the <cashRegister>);
-<cashRegister> = (cashier | [cash] register);
-
-<toTableA> = ([bring me] [to] table A | I want to go to table A | where is table A | where [can] [do] I find table A);
-<toTableB> = ([bring me] [to] table B | I want to go to table B | where is table B | where [can] [do] I find table B);
-<toTableC> = ([bring me] [to] table C | I want to go to table C | where is table C | where [can] [do] I find table C);
-
-

psGrammar/challenge/team2/task5.jsgf

+#JSGF V1.0;
+grammar task5;
+
+public <command> =  [please] <verb> <location> [please];
+
+<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> ;
+<bathroom> = (bathroom | toilet);
+<cashRegister> = (cashier | [cash] register);
+
+<table> = a | b | c ;
+