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

psConfig/challenge/nea/nea.conf

@@ -21,9 +21,9 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=removeAddBillItem;
-jsgf=../../../psGrammar/challenge/nea/removeAddBillItem.jsgf;
-rsbscope=/speechrec/psa/bill;
+name=takeOrder;
+jsgf=../../../psGrammar/challenge/nea/takeOrder.jsgf;
+rsbscope=/speechrec/psa/order;
 bestpath=no;
 autoload=yes;
 

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;

psGrammar/challenge/nea/takeOrder.jsgf

+#JSGF V1.0;
+grammar nea;
+
+public <nea> = [tobi|tiago] ( <pre>  <ord> );
+
+<pre> = (i want | i would like to have);
+<ord> = (<order> | <order> <addOrder>);
+<order> = (<drink> | <number> <drink>);
+<addOrder> = (<and> <drink> | <and> <drink> <addOrder> | <and> <number> <drink> | <and> <number> <drink> <addOrder>);
+
+<drink> = (coke|malz|lemonade|water|ice tea|coffee);
+<number> = (one|two|three|four|five|six|seven|eight|nine);
+<and> = (and);

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>;
 
 <drinks> = <drink> <drink> [and] <drink>;
 
-<additionalDrink> = [i] [also] (<drank>|<had>) [a] <drink>;
+<additionalDrink> = [i] [also] [<drank>|<had>] [a] <drink>;
 
 <had> = had;
 

psGrammar/challenge/team2/task5.jsgf

 #JSGF V1.0;
 grammar task5;
 
-public <command> = [yes] <robot> [please] <command1> [please];
+public <command> =  [please] <verb> <location> [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);
+<verb> = bring [me] [to] | take me [to] | where is | i want [to go to] | where [(can|do) i] [find] ;
 
-<toCashRegister> = ([bring me] [to] [the] <cashRegister> | i want to go to the <cashRegister> | where is the <cashRegister> | where [can] [do] i find the <cashRegister>);
+<location> = [the] <bathroom> | table <table> | [the] <cashRegister> ;
+<bathroom> = (bathroom | toilet);
 <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);
-
+<table> = a | b | c ;