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

psConfig/tasks/gpsr2/gpsr2.conf

@@ -42,7 +42,7 @@ autoload=yes;
 [pocketsphinxinstance]
 name=Objects;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/object/object.jsgf;
+jsgf=../../../psGrammar/tasks/gpsr/objects.jsgf;
 rsbscope=/speechrec/psa/object;
 bestpath=no;
 autoload=yes;
@@ -50,7 +50,7 @@ autoload=yes;
 [pocketsphinxinstance]
 name=Locations;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/location/location.jsgf;
+jsgf=../../../psGrammar/tasks/gpsr/locations.jsgf;
 rsbscope=/speechrec/psa/location;
 bestpath=no;
 autoload=yes;

psGrammar/tasks/gpsr/gpsr2.jsgf

@@ -33,7 +33,7 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 <takeObjFromLoc> = <V_take> (<NP_object> | <NP_objectpron>) <takePrep> <NP_place>;
 
 <takePrsnFromLoc> = <V_take> (<NP_person> | <NP_personalpron>) <takePrep> <NP_place>;
-<takeObjToObj> = <V_take> <NP_object> to <NP_object>;
+<takeObjToObj> = <V_take> (<NP_object> | <NP_objectpron>) <deliverPrep> (<NP_object> | <NP_objectpron>);
 
 <deliverObjToPrsInLoc> = <V_deliver> (<NP_object> | <NP_objectpron>) <deliverPrep> (<NP_person> | <NP_personalpron>) <Prep> <NP_place>;
 
@@ -55,7 +55,7 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 <NP_answer> 	= <N_answer>;
 
 
-<N_place> = (bedroom | chair | (kitchen trashbin) | fridge | bed | nightstand | closet | kitchen | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
+<N_place> = (bedroom | chair |  fridge | bed | nightstand | closet | kitchen |(kitchen trashbin) | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));
 <N_object> = (apple | avocado | bowl | (chocolate sprinkles) | cloth | (dishwashing soap) | (kinder coke) | lemon | licorice | (little bananas) | macaroni | milk | (pineapple cookies) | paprika | plate | rice | smoothie | soap | sponge | (storage box) | (strawberry cookies) | tea | (toilet paper) | tuc | wafer | water| (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box));
 
 <N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
@@ -71,6 +71,6 @@ public <sentence> = ([tobi | biron] <VP1> [([and|then] <VP2>)] [([and|then] <VP3
 
 <N_personalpron> = her | him | his | them | their;
 <N_objectpron> = it;
-<N_names> = (emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel | person |(calling person) | me);
+<N_names> = (emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel | person |(calling person) | (waving person) | me);
 <N_talk> = (your name) | (the name of your team) | (the time) | (what time is it) | (the date) | (what day is today) | (what day is tomorrow) | (the day of the month) | (the day of the week);
 <N_answer> =  (a question) | (question);

psGrammar/tasks/gpsr/locations.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <sentence> = (the <N_place> ) | <N_place> ;
+
+<N_place> = (bedroom | chair |  fridge | bed | nightstand | closet | (kitchen trashbin) | (kitchen counter) | kitchen  | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs));

psGrammar/tasks/gpsr/objectCategories/candy.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <candy> = licorice | (little bananas) | (pineapple cookies) | (strawberry cookies) | tuc | wafer; 

psGrammar/tasks/gpsr/objectCategories/cleaningStuff.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <cleaningStuff> = cloth | (dishwashing soap) | soap | sponge | (toilet paper); 

psGrammar/tasks/gpsr/objectCategories/container.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <container> = bowl | plate | (storage box); 

psGrammar/tasks/gpsr/objectCategories/drink.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <drink> = (kinder coke) | milk | smoothie | tea | water; 

psGrammar/tasks/gpsr/objectCategories/food.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <food> = apple | avocado | (chocolate sprinkles) | lemon | macaroni | paprika | rice; 

psGrammar/tasks/gpsr/objects.jsgf

+#JSGF V1.0;
+grammar speechRecognition;
+
+public <sentence> = (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
+
+<N_object> = (apple | avocado | bowl | (chocolate sprinkles) | cloth | (dishwashing soap) | (kinder coke) | lemon | licorice | (little bananas) | macaroni | milk | (pineapple cookies) | paprika | plate | rice | smoothie | soap | sponge | (storage box) | (strawberry cookies) | tea | (toilet paper) | tuc | wafer | water| (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box));
+
+<N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> );
+<color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);
+<shape> = (round | angular | edgy | little | small | big | huge);