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;
@@ -26,3 +26,10 @@ jsgf=../../../psGrammar/challenge/pollen/setUpBill.jsgf;
 rsbscope=/speechrec/psa/pollenbill;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=newGuest;
+jsgf=../../../psGrammar/challenge/pollen/newGuest.jsgf;
+rsbscope=/speechrec/psa/pollenNewGuest;
+bestpath=no;
+autoload=yes;

psConfig/challenge/team2/configTeam2.conf

@@ -7,21 +7,35 @@ 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;
+
+[pocketsphinxinstance]
+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/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> <order>);
+
+<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> | <tablestring>);
+public <orderstring> = [<robot>] [please] <receiveorderstring> [please];
 
-<receiveorderstring> = bring [me] [a] <drink>;
-<tablestring> = table <table>;
-<table> = (a | b);
+<receiveorderstring> = [bring] [me] [a] <drink>;
 
-<drink> = (tea | coke | fanta | water);
-<number> = (one | two | three | four | five | six | seven | eight | nine | zero);
+<drink> = (coke | malz | lemonade | water | ice tea | coffee);
 
-public <confirm> = <confirm_yes> | <confirm_no>;
-
-public <confirm_yes> = <robot> <yes_words>;
-public <confirm_no> = <robot> <no_words>; 
-
-<yes_words> = (yes) | (confirmed);
-<no_words> = (no);
 <robot> = (tobi) | (robot) | (biron) | (pepper) | (tiago) | (floka) | (meka);

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

+#JSGF V1.0;
+grammar newGuest;
+public <newGuestString> = [<robot>] [please] <bringme> [please];
+
+<bringme> = [bring] [me] [to] <location>;
+
+<location> = (<registerloc> | <bathroomloc> | <tableloc>);
+
+<registerloc> = [the] <register>;
+
+<register> = cash register;
+
+<bathroomloc> = [the] <bathroom>;
+
+<bathroom> = bathroom;
+
+<tableloc> = [<empty>] <table>;
+
+<empty> = [an] empty;
+
+<table> =  [a] table;
+
+<robot> = (floka | meka | robot | tobi | tiago);

psGrammar/challenge/pollen/setUpBill.jsgf

@@ -2,16 +2,18 @@
 grammar setUpBill;
 public <setUpBillString> = [<robot>] (<setUpBill>|<correctDrinks>|<additionalDrink>);
 
-<additionalDrink> = <drink>
+<setUpBill> = [please] [set] [up] [the] bill [please];
 
-<setUpBill> = 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;
+
+<drank> = drank;
 
-<drink> = (water | milk | smoothie | tea);
+<drink> = (coke | malz | lemonade | water | (ice tea) | coffee);
 
 <robot> = (floka | meka | robot | tobi | tiago);

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) [(bottle | cup | can) of] )) | ((two | three) [(bottles | cups | cans) of]) ] ( coke | malz | lemonade | water | (ice tea) | coffee ));

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);
 

psGrammar/challenge/team2/task5.jsgf

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