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

psConfig/challenge/nea/nea.conf

@@ -19,3 +19,11 @@ jsgf=../../../psGrammar/challenge/nea/nea.jsgf;
 rsbscope=/speechrec/psa/speechRecognition;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=removeAddBillItem;
+jsgf=../../../psGrammar/challenge/nea/removeAddBillItem.jsgf;
+rsbscope=/speechrec/psa/bill;
+bestpath=no;
+autoload=yes;
+

psConfig/challenge/pollen/pollen.conf

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

psGrammar/challenge/nea/nea.jsgf

 #JSGF V1.0;
 grammar nea;
 
-public <nea> = [tobi|tiago] ( <go> <location> );
+public <nea> = [tobi|tiago] ( <go> [the] <location> );
 
 <go> = (go to);
 

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));
+
+<drink> = (coke|malz|lemonade|water|ice tea|coffee);

psGrammar/challenge/pollen/challenge.jsgf

 #JSGF V1.0;
 grammar pollen;
-public <orderstring> = [<robot>] (<receiveorderstring> | <tablestring>);
+public <orderstring> = [<robot>] <receiveorderstring>;
 
 <receiveorderstring> = bring [me] [a] <drink>;
-<tablestring> = table <table>;
-<table> = (a | b)
 
-<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/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

 #JSGF V1.0;
 grammar setUpBill;
-public <setUpBillString> = [<robot>] (<setUpBill>|<correctDrinks>);
+public <setUpBillString> = [<robot>] (<setUpBill>|<correctDrinks>|<additionalDrink>);
 
 <setUpBill> = set up [the] bill [please];
 
@@ -8,8 +8,12 @@ public <setUpBillString> = [<robot>] (<setUpBill>|<correctDrinks>);
 
 <drinks> = <drink> <drink> [and] <drink>;
 
-<additionalDrink> = [i] [also] (drank|had) [a] <drink>;
+<additionalDrink> = [i] [also] (<drank>|<had>) [a] <drink>;
 
-<drink> = (water | milk | smoothie | tea);
+<had> = had;
+
+<drank> = drank;
+
+<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 <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>]
+
+<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 )